Merge pull request #827 from deepfire/lexically-yours

Enable lexical binding in every source lisp file

Author: gracjan

ghc-core.el

@@ -1,4 +1,4 @@
-;;; ghc-core.el --- Syntax highlighting module for GHC Core
+;;; ghc-core.el --- Syntax highlighting module for GHC Core -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2010  Johan Tibell
 

ghci-script-mode.el

@@ -1,4 +1,4 @@
-;;; ghci-script-mode.el --- GHCi scripts major mode
+;;; ghci-script-mode.el --- GHCi scripts major mode -*- lexical-binding: t -*-
 
 ;; Copyright (c) 2014 Chris Done. All rights reserved.
 

haskell-align-imports.el

@@ -1,4 +1,4 @@
-;;; haskell-align-imports.el --- Align the import lines in a Haskell file
+;;; haskell-align-imports.el --- Align the import lines in a Haskell file -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2010  Chris Done
 

haskell-bot.el

@@ -1,4 +1,4 @@
-;;; haskell-bot.el --- A Lambdabot interaction mode
+;;; haskell-bot.el --- A Lambdabot interaction mode -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 2001  Chris Webb

haskell-cabal.el

@@ -1,4 +1,4 @@
-;;; haskell-cabal.el --- Support for Cabal packages
+;;; haskell-cabal.el --- Support for Cabal packages -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2007, 2008  Stefan Monnier
 
@@ -459,8 +459,7 @@ resultung buffer-content"
             (,beg (plist-get ,section :beginning))
             (,end (plist-get  ,section :end))
             (,start-col (plist-get  ,section :data-start-column))
-            (,section-data (buffer-substring ,beg ,end))
-            (section-name (plist-get ,section :name )))
+            (,section-data (buffer-substring ,beg ,end)))
        (save-excursion
          (prog1
              (with-temp-buffer
@@ -534,8 +533,7 @@ resultung buffer-content"
   "Strip indentation from each line, execute FORMS and reinstate indentation
    so that the indentation of the FIRST LINE matches"
   (let ((old-l1-indent (make-symbol "new-l1-indent"))
-        (new-l1-indent (make-symbol "old-l1-indent"))
-        (res nil))
+        (new-l1-indent (make-symbol "old-l1-indent")))
     `(let ( (,old-l1-indent (save-excursion
                               (goto-char (point-min))
                               (current-indentation))))
@@ -672,9 +670,9 @@ resultung buffer-content"
   (let ((downcase-name (downcase name)))
     (haskell-cabal-find-subsection-by
      section
-     '(lambda (subsection)
+     `(lambda (subsection)
         (string= (downcase (haskell-cabal-section-name subsection))
-                 downcase-name)))))
+                 ,downcase-name)))))
 
 (defun haskell-cabal-goto-subsection (name)
   (let ((subsection (haskell-cabal-find-subsection (haskell-cabal-section) name)))
@@ -807,7 +805,6 @@ Source names from main-is and c-sources sections are left untouched
         (if (null candidates)
             (let* ((src-dir (haskell-cabal-join-paths base-dir (or (car src-dirs) "")))
                    (newfile (haskell-cabal-join-paths src-dir filename))
-                   (subdir (file-name-directory newfile))
                    (do-create-p (y-or-n-p (format "Create file %s ?" newfile))))
               (when do-create-p
                 (find-file-other-window newfile )))

haskell-checkers.el

@@ -1,4 +1,4 @@
-;;; haskell-checkers.el --- Emacs interface to haskell lint and style checkers
+;;; haskell-checkers.el --- Emacs interface to haskell lint and style checkers -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2009-2011  Alex Ott, Liam O'Reilly
 ;;
@@ -128,13 +128,13 @@
           (when (re-search-forward new-old-code eline t)
             (replace-match new-code nil t)))))))
 
-(defun haskell-lint-finish-hook (buf msg)
+(defun haskell-lint-finish-hook (_buf _msg)
   "Function, that is executed at the end of HLint or scan execution"
   (if haskell-checkers-replace-with-suggestions
       (haskell-lint-replace-suggestions)
     (next-error 1 t)))
 
-(defun haskell-scan-finish-hook (buf msg)
+(defun haskell-scan-finish-hook (_buf _msg)
   "Function, that is executed at the end of haskell-scan execution"
   (next-error 1 t))
 

haskell-collapse.el

@@ -1,4 +1,4 @@
-;;; haskell-collapse.el --- Collapse expressions
+;;; haskell-collapse.el --- Collapse expressions -*- lexical-binding: t -*-
 
 ;; Copyright (c) 2014 Chris Done. All rights reserved.
 

haskell-commands.el

@@ -1,4 +1,4 @@
-;;; haskell-commands.el --- Commands that can be run on the process
+;;; haskell-commands.el --- Commands that can be run on the process -*- lexical-binding: t -*-
 
 ;;; Commentary:
 
@@ -343,7 +343,7 @@ should be inserted."
           expr))))))
 
 ;;;###autoload
-(defun haskell-mode-jump-to-def-or-tag (&optional next-p)
+(defun haskell-mode-jump-to-def-or-tag (&optional _next-p)
   ;; FIXME NEXT-P arg is not used
   "Jump to the definition.
 Jump to definition of identifier at point by consulting GHCi, or
@@ -513,7 +513,7 @@ Requires the :loc-at command from GHCi."
                              'face 'compilation-error)))))))
 
 ;;;###autoload
-(defun haskell-process-cd (&optional not-interactive)
+(defun haskell-process-cd (&optional _not-interactive)
   ;; FIXME optional arg is not used
   "Change directory."
   (interactive)
@@ -585,7 +585,7 @@ Query PROCESS to `:cd` to directory DIR."
              (if (string-match "^[A-Za-z_]" (cdr state))
                  (format ":info %s" (cdr state))
                (format ":info (%s)" (cdr state)))))
-      :complete (lambda (state response)
+      :complete (lambda (_state response)
                   (unless (or (string-match "^Top level" response)
                               (string-match "^<interactive>" response))
                     (haskell-mode-message-line response)))))))
@@ -603,7 +603,7 @@ Query PROCESS to `:cd` to directory DIR."
              (if (string-match "^[A-Za-z_]" (cdr state))
                  (format ":type %s" (cdr state))
                (format ":type (%s)" (cdr state)))))
-      :complete (lambda (state response)
+      :complete (lambda (_state response)
                   (unless (or (string-match "^Top level" response)
                               (string-match "^<interactive>" response))
                     (haskell-mode-message-line response)))))))
@@ -719,7 +719,7 @@ function `xref-find-definitions' after new table was generated."
                         (haskell-process-session (car state)))
                        "find . -name '*.hs' -print0 -or -name '*.lhs' -print0 -or -name '*.hsc' -print0"
                        "xargs -0 hasktags -e -x"))))
-      :complete (lambda (state response)
+      :complete (lambda (state _response)
                   (when (cdr state)
                     (let ((session-tags
                           (haskell-session-tags-filename
@@ -802,9 +802,9 @@ output.  If CMD fails the buffer remains unchanged."
                   (while (string-match "\\`\n+\\|^\\s-+\\|\\s-+$\\|\n+\\'" str)
                     (setq str (replace-match "" t t str)))
                   str))
-         (errout (lambda (fmt &rest args)
-                   (let* ((warning-fill-prefix "    "))
-                     (display-warning cmd (apply 'format fmt args) :warning))))
+         (_errout (lambda (fmt &rest args)
+		    (let* ((warning-fill-prefix "    "))
+		      (display-warning cmd (apply 'format fmt args) :warning))))
          (filename (buffer-file-name (current-buffer)))
          (cmd-prefix (replace-regexp-in-string " .*" "" cmd))
          (tmp-file (make-temp-file cmd-prefix))
@@ -813,9 +813,9 @@ output.  If CMD fails the buffer remains unchanged."
                                      haskell-session)
                                 (haskell-session-cabal-dir haskell-session)
                               default-directory))
-         (errcode (with-temp-file tmp-file
-                    (call-process cmd filename
-                                  (list (current-buffer) err-file) nil)))
+         (_errcode (with-temp-file tmp-file
+		     (call-process cmd filename
+				   (list (current-buffer) err-file) nil)))
          (stderr-output
           (with-temp-buffer
             (insert-file-contents err-file)

haskell-compat.el

@@ -1,4 +1,4 @@
-;;; haskell-compat.el --- legacy/compatibility backports for haskell-mode
+;;; haskell-compat.el --- legacy/compatibility backports for haskell-mode -*- lexical-binding: t -*-
 ;;
 ;; Filename: haskell-compat.el
 ;; Description: legacy/compatibility backports for haskell-mode

haskell-compile.el

@@ -1,4 +1,4 @@
-;;; haskell-compile.el --- Haskell/GHC compilation sub-mode
+;;; haskell-compile.el --- Haskell/GHC compilation sub-mode -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2013  Herbert Valerio Riedel