[Emacs-diffs] trunk r114343: Address some "unused lexical variable" warnings

[Glenn Morris]

------------------------------------------------------------
revno: 114343
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 21:48:00 -0400
message:
  Address some "unused lexical variable" warnings
  
  * lisp/dframe.el (x-sensitive-text-pointer-shape, x-pointer-shape): Declare.
  
  * lisp/eshell/esh-io.el (x-select-enable-clipboard): Declare.
  
  * lisp/erc/erc-button.el (erc-button-add-buttons):
  * lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments):
  * lisp/eshell/em-hist.el (eshell/history, eshell-isearch-backward):
  * lisp/eshell/em-pred.el (eshell-parse-modifiers, eshell-pred-file-time):
  Remove unused local variables.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/dframe.el                 dframe.el-20091113204419-o5vbwnq5f7feedwu-3871
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc-button.el         
ercbutton.el-20091113204419-o5vbwnq5f7feedwu-4314
  lisp/eshell/em-cmpl.el         emcmpl.el-20091113204419-o5vbwnq5f7feedwu-1854
  lisp/eshell/em-hist.el         emhist.el-20091113204419-o5vbwnq5f7feedwu-1857
  lisp/eshell/em-pred.el         empred.el-20091113204419-o5vbwnq5f7feedwu-1859
  lisp/eshell/esh-io.el          eshio.el-20091113204419-o5vbwnq5f7feedwu-1870

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-18 01:42:43 +0000
+++ b/lisp/ChangeLog    2013-09-18 01:48:00 +0000
@@ -1,5 +1,14 @@
 2013-09-18  Glenn Morris  <address@hidden>
 
+       * dframe.el (x-sensitive-text-pointer-shape, x-pointer-shape): Declare.
+
+       * eshell/em-cmpl.el (eshell-complete-parse-arguments):
+       * eshell/em-hist.el (eshell/history, eshell-isearch-backward):
+       * eshell/em-pred.el (eshell-parse-modifiers, eshell-pred-file-time):
+       Remove unused local variables.
+
+       * eshell/esh-io.el (x-select-enable-clipboard): Declare.
+
        * textmodes/two-column.el: Make 2C-split work for --without-x.
        (scroll-bar-columns): Autoload.
        (top-level): Require fringe when compiling.

=== modified file 'lisp/dframe.el'
--- a/lisp/dframe.el    2013-09-12 05:32:57 +0000
+++ b/lisp/dframe.el    2013-09-18 01:48:00 +0000
@@ -243,6 +243,9 @@
   "Return non-nil if FRAME is currently available."
   (and frame (frame-live-p frame) (frame-visible-p frame)))
 
+(defvar x-sensitive-text-pointer-shape)
+(defvar x-pointer-shape)
+
 (defun dframe-frame-mode (arg frame-var cache-var buffer-var frame-name
                              local-mode-fn
                              &optional

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2013-09-14 23:33:19 +0000
+++ b/lisp/erc/ChangeLog        2013-09-18 01:48:00 +0000
@@ -1,3 +1,7 @@
+2013-09-18  Glenn Morris  <address@hidden>
+
+       * erc-button.el (erc-button-add-buttons): Remove unused local vars.
+
 2013-09-14  Vivek Dasmohapatra  <address@hidden>
 
        * erc.el (erc-update-mode-line-buffer):

=== modified file 'lisp/erc/erc-button.el'
--- a/lisp/erc/erc-button.el    2013-08-22 04:06:45 +0000
+++ b/lisp/erc/erc-button.el    2013-09-18 01:48:00 +0000
@@ -267,7 +267,7 @@
             (inhibit-point-motion-hooks t)
             (inhibit-field-text-motion t)
             (alist erc-button-alist)
-            entry regexp data)
+            regexp)
         (erc-button-remove-old-buttons)
         (dolist (entry alist)
           (if (equal (car entry) (quote (quote nicknames)))

=== modified file 'lisp/eshell/em-cmpl.el'
--- a/lisp/eshell/em-cmpl.el    2013-09-12 20:38:35 +0000
+++ b/lisp/eshell/em-cmpl.el    2013-09-18 01:48:00 +0000
@@ -370,7 +370,7 @@
     (cl-assert (= (length args) (length posns)))
     (let ((a args)
          (i 0)
-         l final)
+         l)
       (while a
        (if (and (consp (car a))
                 (eq (caar a) 'eshell-operator))

=== modified file 'lisp/eshell/em-hist.el'
--- a/lisp/eshell/em-hist.el    2013-09-12 20:15:53 +0000
+++ b/lisp/eshell/em-hist.el    2013-09-18 01:48:00 +0000
@@ -330,7 +330,7 @@
    (and (or (not (ring-p eshell-history-ring))
           (ring-empty-p eshell-history-ring))
        (error "No history"))
-   (let (length command file)
+   (let (length file)
      (when (and args (string-match "^[0-9]+$" (car args)))
        (setq length (min (eshell-convert (car args))
                         (ring-length eshell-history-ring))
@@ -346,8 +346,7 @@
       (write-history (eshell-write-history file))
       (append-history (eshell-write-history file t))
       (t
-       (let* ((history nil)
-             (index (1- (or length (ring-length eshell-history-ring))))
+       (let* ((index (1- (or length (ring-length eshell-history-ring))))
              (ref (- (ring-length eshell-history-ring) index)))
         ;; We have to build up a list ourselves from the ring vector.
         (while (>= index 0)
@@ -945,7 +944,7 @@
 (defun eshell-isearch-backward (&optional invert)
   "Do incremental regexp search backward through past commands."
   (interactive)
-  (let ((inhibit-read-only t) end)
+  (let ((inhibit-read-only t))
     (eshell-prepare-for-search)
     (goto-char (point-max))
     (set-marker eshell-last-output-end (point))

=== modified file 'lisp/eshell/em-pred.el'
--- a/lisp/eshell/em-pred.el    2013-09-12 20:15:53 +0000
+++ b/lisp/eshell/em-pred.el    2013-09-18 01:48:00 +0000
@@ -306,7 +306,7 @@
 functions.  PRED-FUNCS take a filename and return t if the test
 succeeds; MOD-FUNCS take any string and preform a modification,
 returning the resultant string."
-  (let (result negate follow preds mods)
+  (let (negate follow preds mods)
     (condition-case nil
        (while (not (eobp))
          (let ((char (char-after)))
@@ -399,7 +399,7 @@
 (defun eshell-pred-file-time (mod-char mod-type attr-index)
   "Return a predicate to test whether a file matches a certain time."
   (let* ((quantum 86400)
-        qual amount when open close end)
+        qual when open close end)
     (when (memq (char-after) '(?M ?w ?h ?m ?s))
       (setq quantum (char-after))
       (cond

=== modified file 'lisp/eshell/esh-io.el'
--- a/lisp/eshell/esh-io.el     2013-09-17 15:19:12 +0000
+++ b/lisp/eshell/esh-io.el     2013-09-18 01:48:00 +0000
@@ -118,6 +118,8 @@
   :type 'integer
   :group 'eshell-io)
 
+(defvar x-select-enable-clipboard)     ; term/common-win
+
 (defcustom eshell-virtual-targets
   '(("/dev/eshell" eshell-interactive-print nil)
     ("/dev/kill" (lambda (mode)