* lisp/gnus/nnmh.el (nnmh-newsgroup-articles): Declare var

Reported by Barry Fishman <barry@ecubist.org>.

Along the way, I checked other variables which are similarly let-bound
to nil and then read with any intervening assignment, which found
another similar case of missing `defvar`s plus a bit of dead code.

* lisp/gnus/gnus-kill.el (gnus-apply-kill-file-internal):
Remove constant nil var `beg`.
* lisp/gnus/gnus-search.el (gnus-search-query-parse-kv):
Remove constant nil var `return`.
* lisp/gnus/gnus-start.el (gnus-ask-server-for-new-groups):
Remove constant nil var `group`.
(gnus-killed-assoc, gnus-marked-assoc, gnus-newsrc-assoc): Declare vars.
* lisp/gnus/gnus-sum.el (gnus-compute-read-articles):
Remove constant nil var `first`.
* lisp/gnus/nnbabyl.el (nnbabyl-request-accept-article):
Remove constant nil var `beg`.
* lisp/gnus/nnfolder.el (nnfolder-possibly-change-group):
Remove constant nil var `inf`.
* lisp/gnus/nnrss.el (nnrss-request-article):
Remove constant nil var `err`.

diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el
index b0e6cb59d52607a090b9a4a2ba28c19ac8039ae7..f73627a6480edf45435b1c34d4c2ac08af21c712 100644 (file)
--- a/lisp/gnus/gnus-kill.el
+++ b/lisp/gnus/gnus-kill.el
@@ -337,7 +337,7 @@ Returns the number of articles marked as read."
                           (gnus-newsgroup-kill-file gnus-newsgroup-name)))
         (unreads (length gnus-newsgroup-unreads))
         (gnus-summary-inhibit-highlight t)
-        beg)
+        ) ;; beg
     (setq gnus-newsgroup-kill-headers nil)
     ;; If there are any previously scored articles, we remove these
     ;; from the `gnus-newsgroup-headers' list that the score functions
@@ -381,7 +381,7 @@ Returns the number of articles marked as read."
 
       (gnus-set-mode-line 'summary)
 
-      (if beg
+      (if nil ;; beg
          (let ((nunreads (- unreads (length gnus-newsgroup-unreads))))
            (or (eq nunreads 0)
                (gnus-message 6 "Marked %d articles as read" nunreads))

diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el
index 339bff9d67a06c5dee78adb32ec1bc7c13446bcd..61a1d6752438cc97ba2fa43bca241173c8da7f78 100644 (file)
--- a/lisp/gnus/gnus-search.el
+++ b/lisp/gnus/gnus-search.el
@@ -549,7 +549,7 @@ structure.
 
 In the simplest case, they are simply consed together.  String
 KEY is converted to a symbol."
-  (let (return)
+  (let () ;; return
     (cond
      ((member key gnus-search-date-keys)
       (when (string= "after" key)
@@ -559,7 +559,7 @@ KEY is converted to a symbol."
       (setq value (gnus-search-query-parse-mark value)))
      ((string= "message-id" key)
       (setq key "id")))
-    (or return
+    (or nil ;; return
        (cons (intern key) value))))
 
 (defun gnus-search-query-parse-date (value &optional rel-date)

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index a6b362e08347efedf6864612040406253849700d..44e97d54846215789421c933f0fb0402f0d3ac6a 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1172,7 +1172,7 @@ for new groups, and subscribe the new groups as zombies."
                               gnus-check-new-newsgroups)
                          gnus-secondary-select-methods))))
         (groups 0)
-        group new-newsgroups got-new method hashtb
+        new-newsgroups got-new method hashtb ;; group
         gnus-override-subscribe-method)
     (unless gnus-killed-hashtb
       (gnus-make-hashtable-from-killed))
@@ -1203,14 +1203,14 @@ for new groups, and subscribe the new groups as zombies."
               (cond
                ((eq do-sub 'subscribe)
                 (cl-incf groups)
-                (puthash g-name group gnus-killed-hashtb)
+                (puthash g-name nil gnus-killed-hashtb) ;; group
                 (gnus-call-subscribe-functions
                  gnus-subscribe-options-newsgroup-method g-name))
                ((eq do-sub 'ignore)
                 nil)
                (t
                 (cl-incf groups)
-                (puthash g-name group gnus-killed-hashtb)
+                (puthash g-name nil gnus-killed-hashtb) ;; group
                 (if gnus-subscribe-hierarchical-interactive
                     (push g-name new-newsgroups)
                   (gnus-call-subscribe-functions
@@ -2378,6 +2378,11 @@ If FORCE is non-nil, the .newsrc file is read."
             (unless (gnus-yes-or-no-p (concat errmsg "; continue? "))
               (error "%s" errmsg)))))))))
 
+;; IIUC these 3 vars were used in older .newsrc files.
+(defvar gnus-killed-assoc)
+(defvar gnus-marked-assoc)
+(defvar gnus-newsrc-assoc)
+
 (defun gnus-read-newsrc-el-file (file)
   (let ((ding-file (concat file "d")))
     (when (file-exists-p ding-file)

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index bf58cf419a219ab268ef2bba55a8890d22ba8541..97da55035392c3808c3b51c65e847cf705297774 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -6354,9 +6354,9 @@ The resulting hash table is returned, or nil if no Xrefs were found."
       ;; First peel off all invalid article numbers.
       (when active
        (let ((ids articles)
-             id first)
+             id) ;; first
          (while (setq id (pop ids))
-           (when (and first (> id (cdr active)))
+           (when nil ;; (and first (> id (cdr active)))
              ;; We'll end up in this situation in one particular
              ;; obscure situation.  If you re-scan a group and get
              ;; a new article that is cross-posted to a different

diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el
index 3e6f9e88eeab32bb275445bc9b63b6f1de4ab890..5f486f4970352e169c8c64edf0535e4ab6502232 100644 (file)
--- a/lisp/gnus/nnbabyl.el
+++ b/lisp/gnus/nnbabyl.el
@@ -323,7 +323,7 @@
   (nnbabyl-possibly-change-newsgroup group server)
   (nnmail-check-syntax)
   (let ((buf (current-buffer))
-       result beg)
+       result) ;; beg
     (and
      (nnmail-activate 'nnbabyl)
      (save-excursion
@@ -331,7 +331,7 @@
        (search-forward "\n\n" nil t)
        (forward-line -1)
        (save-excursion
-        (while (re-search-backward "^X-Gnus-Newsgroup: " beg t)
+        (while (re-search-backward "^X-Gnus-Newsgroup: " nil t) ;; beg
           (delete-region (point) (progn (forward-line 1) (point)))))
        (when nnmail-cache-accepted-message-ids
         (nnmail-cache-insert (nnmail-fetch-field "message-id")

diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 1dd784d5a5b471e85dd8775daccfca12dc69390c..2de5b83a7b2b7a33016748e0968d884c557a0d4d 100644 (file)
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -706,7 +706,7 @@ deleted.  Point is left where the deleted region was."
       (if dont-check
          (setq nnfolder-current-group group
                nnfolder-current-buffer nil)
-       (let (inf file)
+       (let (file) ;; inf
          ;; If we have to change groups, see if we don't already have
          ;; the folder in memory.  If we do, verify the modtime and
          ;; destroy the folder if needed so we can rescan it.
@@ -718,7 +718,7 @@ deleted.  Point is left where the deleted region was."
          ;; touched the file since last time.
          (when (and nnfolder-current-buffer
                     (not (gnus-buffer-live-p nnfolder-current-buffer)))
-           (setq nnfolder-buffer-alist (delq inf nnfolder-buffer-alist)
+           (setq nnfolder-buffer-alist (delq nil nnfolder-buffer-alist) ;; inf
                  nnfolder-current-buffer nil))
 
          (setq nnfolder-current-group group)

diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index 231583fae831b7e949ef070f98bdf717d5089c5d..0923b8eff34460cd2745d541dbf6c55530d142d3 100644 (file)
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -503,6 +503,8 @@ as unread by Gnus.")
       (setcdr active (1+ (cdr active))))
     (cdr active)))
 
+(defvar nnmh-newsgroup-articles)
+
 (defun nnmh-update-gnus-unreads (group)
   ;; Go through the .nnmh-articles file and compare with the actual
   ;; articles in this folder.  The articles that are "new" will be

diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index aa7c8e584a5e598249fcc1fc7f4e99004b903acf..36b7af0e34512d08e0c65fffb588b18ba24d39d2 100644 (file)
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -200,7 +200,7 @@ for decoding when the cdr that the data specify is not available.")
   (nnrss-possibly-change-group group server)
   (let ((e (assq article nnrss-group-data))
        (nntp-server-buffer (or buffer nntp-server-buffer))
-       err) ;; post
+       ) ;; err post
     (when e
       (with-current-buffer nntp-server-buffer
        (erase-buffer)
@@ -302,8 +302,7 @@ for decoding when the cdr that the data specify is not available.")
        (when nnrss-content-function
          (funcall nnrss-content-function e group article))))
     (cond
-     (err
-      (nnheader-report 'nnrss err))
+     ;; (err (nnheader-report 'nnrss err))
      ((not e)
       (nnheader-report 'nnrss "no such id: %d" article))
      (t