* lisp/gnus: Misc simplifications found during conversion to lexical

* lisp/gnus/nnoo.el (noo-import-1, nnoo-define-skeleton-1): Use `dolist`.
(noo-map-functions, nnoo-define-basics): Directly emit the code rather than
going through an intermediate function; this also avoids the use of `eval`.
(noo-map-functions-1, nnoo-define-basics-1): Delete functions,
folded into their corresponding macro.

* lisp/gnus/gmm-utils.el (gmm-tool-bar-from-list): Demote `eval` to
`symbol-value`.

* lisp/gnus/gnus-art.el (gnus-button-handle-describe-key): Avoid `eval`
since `kbd` is a function nowadays.
(gnus-treat-part-number): Rename from `part-number`.
(gnus-treat-total-parts): Rename from `total-parts`.
(gnus-treat-article, gnus-treat-predicate): Adjust accordingly.

* lisp/gnus/gnus-cache.el (gnus-agent-load-alist): Use `declare-function`.

* lisp/gnus/gnus-group.el (gnus-cache-active-hashtb): Use `defvar`.
(gnus-group-iterate): Make it a normal function since lexical scoping
avoids the risk of name capture anyway.
(gnus-group-delete-articles): Actually use the `oldp` arg.

* lisp/gnus/gnus-html.el (gnus-html-wash-images): Fix debug message so
it's emitted after the `url` var it prints is actually initialized.
And avoid `setq` while we're at it.

* lisp/gnus/gnus-msg.el (gnus-group-mail, gnus-group-news)
(gnus-summary-mail-other-window, gnus-summary-news-other-window):
Merge `let`s using `let*`.

* lisp/gnus/gnus-spec.el (gnus-update-format-specifications):
Tighten the scope of `buffer`, and tighten a regexp.
(gnus-parse-simple-format): Reduce code duplication.

* lisp/gnus/gnus-start.el (gnus-child-mode): Don't `defvar` it since we
never use that variable and accordingly don't define it as a minor mode.

* lisp/gnus/gnus-util.el (gnus-byte-compile): Simplify so it obeys
`gnus-use-byte-compile` not just on the first call.
(iswitchb-minibuffer-setup): Declare.

* lisp/gnus/mail-source.el (mail-source-bind-1)
(mail-source-bind-common-1): Use `mapcar`.
(mail-source-set-common-1): Use `dolist`.
(display-time-event-handler): Declare.

* lisp/gnus/mml-smime.el (mml-smime-epg-verify): Reduce code duplication.

* lisp/gnus/mml.el (mml-parse-1): Reduce code duplication.

* lisp/gnus/mml2015.el (mml2015-epg-verify): Reduce code duplication.

* lisp/gnus/nnmail.el (nnmail-get-split-group): Tighten regexp.
(nnmail-split-it): Reduce code duplication.

* lisp/gnus/nnweb.el (nnweb-request-article): Avoid `setq`.

* lisp/gnus/spam.el (BBDB): Use the `noerror` arg of `require`, and
define all the functions for BBDB regardless if the require succeeded.
(spam-exists-in-BBDB-p): Don't inline, not worth it.

1 files changed, 58 insertions, 58 deletions

diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 855d085c3a9..6a0cc0b47dc 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -151,7 +151,7 @@ fit these criteria."
 
 (defun gnus-html-wash-images ()
   "Run through current buffer and replace img tags by images."
-  (let (tag parameters string start end images url alt-text
+  (let (tag parameters string start end images
 	    inhibit-images blocked-images)
     (if (buffer-live-p gnus-summary-buffer)
 	(with-current-buffer gnus-summary-buffer
@@ -169,65 +169,65 @@ fit these criteria."
 	(delete-region (match-beginning 0) (match-end 0)))
       (setq end (point))
       (when (string-match "src=\"\\([^\"]+\\)" parameters)
-	(gnus-message 8 "gnus-html-wash-tags: fetching image URL %s" url)
-	(setq url (gnus-html-encode-url (match-string 1 parameters))
-	      alt-text (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)"
-					   parameters)
-			 (xml-substitute-special (match-string 2 parameters))))
-	(add-text-properties
-	 start end
-	 (list 'image-url url
-	       'image-displayer `(lambda (url start end)
-				   (gnus-html-display-image url start end
-							    ,alt-text))
-	       'help-echo alt-text
-	       'button t
-	       'keymap gnus-html-image-map
-	       'gnus-image (list url start end alt-text)))
-	(if (string-match "\\`cid:" url)
-	    ;; URLs with cid: have their content stashed in other
-	    ;; parts of the MIME structure, so just insert them
-	    ;; immediately.
-	    (let* ((handle (mm-get-content-id (substring url (match-end 0))))
-		   (image (when (and handle
-				     (not inhibit-images))
-			    (gnus-create-image
-			     (mm-with-part handle (buffer-string))
-			     nil t))))
-	      (if image
-		  (gnus-add-image
-		   'cid
-		   (gnus-put-image
-		    (gnus-rescale-image
-		     image (gnus-html-maximum-image-size))
-		    (gnus-string-or (prog1
-					(buffer-substring start end)
-				      (delete-region start end))
-				    "*")
-		    'cid))
+	(let ((url (gnus-html-encode-url (match-string 1 parameters)))
+	      (alt-text (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)"
+					    parameters)
+			  (xml-substitute-special (match-string 2 parameters)))))
+	  (gnus-message 8 "gnus-html-wash-tags: fetching image URL %s" url)
+	  (add-text-properties
+	   start end
+	   (list 'image-url url
+		 'image-displayer `(lambda (url start end)
+				     (gnus-html-display-image url start end
+							      ,alt-text))
+		 'help-echo alt-text
+		 'button t
+		 'keymap gnus-html-image-map
+		 'gnus-image (list url start end alt-text)))
+	  (if (string-match "\\`cid:" url)
+	      ;; URLs with cid: have their content stashed in other
+	      ;; parts of the MIME structure, so just insert them
+	      ;; immediately.
+	      (let* ((handle (mm-get-content-id (substring url (match-end 0))))
+		     (image (when (and handle
+				       (not inhibit-images))
+			      (gnus-create-image
+			       (mm-with-part handle (buffer-string))
+			       nil t))))
+		(if image
+		    (gnus-add-image
+		     'cid
+		     (gnus-put-image
+		      (gnus-rescale-image
+		       image (gnus-html-maximum-image-size))
+		      (gnus-string-or (prog1
+					  (buffer-substring start end)
+					(delete-region start end))
+				      "*")
+		      'cid))
+		  (make-text-button start end
+				    'help-echo url
+				    'keymap gnus-html-image-map)))
+	    ;; Normal, external URL.
+	    (if (or inhibit-images
+		    (gnus-html-image-url-blocked-p url blocked-images))
 		(make-text-button start end
 				  'help-echo url
-				  'keymap gnus-html-image-map)))
-	  ;; Normal, external URL.
-	  (if (or inhibit-images
-		  (gnus-html-image-url-blocked-p url blocked-images))
-	      (make-text-button start end
-				'help-echo url
-				'keymap gnus-html-image-map)
-	    ;; Non-blocked url
-	    (let ((width
-		   (when (string-match "width=\"?\\([0-9]+\\)" parameters)
-		     (string-to-number (match-string 1 parameters))))
-		  (height
-		   (when (string-match "height=\"?\\([0-9]+\\)" parameters)
-		     (string-to-number (match-string 1 parameters)))))
-	      ;; Don't fetch images that are really small.  They're
-	      ;; probably tracking pictures.
-	      (when (and (or (null height)
-			     (> height 4))
-			 (or (null width)
-			     (> width 4)))
-		(gnus-html-display-image url start end alt-text)))))))))
+				  'keymap gnus-html-image-map)
+	      ;; Non-blocked url
+	      (let ((width
+		     (when (string-match "width=\"?\\([0-9]+\\)" parameters)
+		       (string-to-number (match-string 1 parameters))))
+		    (height
+		     (when (string-match "height=\"?\\([0-9]+\\)" parameters)
+		       (string-to-number (match-string 1 parameters)))))
+		;; Don't fetch images that are really small.  They're
+		;; probably tracking pictures.
+		(when (and (or (null height)
+			       (> height 4))
+			   (or (null width)
+			       (> width 4)))
+		  (gnus-html-display-image url start end alt-text))))))))))
 
 (defun gnus-html-display-image (url start end &optional alt-text)
   "Display image at URL on text from START to END.