2000-12-20 02:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

[gnus] / lisp / gnus-art.el

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index bb3c0fb..816c32a 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3517,15 +3517,14 @@ In no internal viewer is available, use an external viewer."
     (setq b (point))
     (gnus-eval-format
      gnus-mime-button-line-format gnus-mime-button-line-format-alist
-     (append
-      (if (>= (string-to-number emacs-version) 21)
-         nil ;; XEmacs doesn't care
-       (list 'local-map gnus-mime-button-map))
-      `(keymap ,gnus-mime-button-map
-              gnus-callback gnus-mm-display-part
-              gnus-part ,gnus-tmp-id
-              article-type annotation
-              gnus-data ,handle)))
+     `(keymap ,gnus-mime-button-map
+             ,@(if (>= (string-to-number emacs-version) 21)
+                   nil 
+                 (list 'local-map gnus-mime-button-map))
+             gnus-callback gnus-mm-display-part
+             gnus-part ,gnus-tmp-id
+             article-type annotation
+             gnus-data ,handle))
     (setq e (point))
     (widget-convert-button
      'link b e
@@ -3760,22 +3759,21 @@ In no internal viewer is available, use an external viewer."
           (progn
             (insert (format "%d.  " id))
             (point))
-          (append
-           (if (>= (string-to-number emacs-version) 21)
-               nil ;; XEmacs doesn't care
-             (list 'local-map gnus-mime-button-map))
-           `(gnus-callback
-             (lambda (handles)
-               (unless ,(not ibegend)
-                 (setq gnus-article-mime-handle-alist
-                       ',gnus-article-mime-handle-alist))
-               (gnus-mime-display-alternative
-                ',ihandles ',not-pref ',begend ,id))
-             ,gnus-mouse-face-prop ,gnus-article-mouse-face
-             face ,gnus-article-button-face
-             keymap ,gnus-mime-button-map
-             gnus-part ,id
-             gnus-data ,handle)))
+          `(gnus-callback
+            (lambda (handles)
+              (unless ,(not ibegend)
+                (setq gnus-article-mime-handle-alist
+                      ',gnus-article-mime-handle-alist))
+              (gnus-mime-display-alternative
+               ',ihandles ',not-pref ',begend ,id))
+            ,@(if (>= (string-to-number emacs-version) 21)
+                  nil ;; XEmacs doesn't care
+                (list 'local-map gnus-mime-button-map))
+            ,gnus-mouse-face-prop ,gnus-article-mouse-face
+            face ,gnus-article-button-face
+            keymap ,gnus-mime-button-map
+            gnus-part ,id
+            gnus-data ,handle))
          (widget-convert-button 'link from (point)
                                 :action 'gnus-widget-press-button
                                 :button-keymap gnus-widget-button-keymap)
@@ -3788,22 +3786,21 @@ In no internal viewer is available, use an external viewer."
                               (if (equal handle preferred) ?* ? )
                               (mm-handle-media-type handle)))
               (point))
-            (append
-             (if (>= (string-to-number emacs-version) 21)
-                 nil ;; XEmacs doesn't care
-               (list 'local-map gnus-mime-button-map))
-             `(gnus-callback
-               (lambda (handles)
+            `(gnus-callback
+              (lambda (handles)
                 (unless ,(not ibegend)
                   (setq gnus-article-mime-handle-alist
                         ',gnus-article-mime-handle-alist))
                 (gnus-mime-display-alternative
                  ',ihandles ',handle ',begend ,id))
-               ,gnus-mouse-face-prop ,gnus-article-mouse-face
-               face ,gnus-article-button-face
-               keymap ,gnus-mime-button-map
-               gnus-part ,id
-               gnus-data ,handle)))
+              ,@(if (>= (string-to-number emacs-version) 21)
+                    nil ;; XEmacs doesn't care
+                  (list 'local-map gnus-mime-button-map))
+              ,gnus-mouse-face-prop ,gnus-article-mouse-face
+              face ,gnus-article-button-face
+              keymap ,gnus-mime-button-map
+              gnus-part ,id
+              gnus-data ,handle))
            (widget-convert-button 'link from (point)
                                   :action 'gnus-widget-press-button
                                   :button-keymap gnus-widget-button-keymap)
@@ -5290,15 +5287,14 @@ For example:
     (gnus-eval-format
      gnus-mime-security-button-line-format 
      gnus-mime-security-button-line-format-alist
-     (append
-      (if (>= (string-to-number emacs-version) 21)
-         nil ;; XEmacs doesn't care
-       (list 'local-map gnus-mime-security-button-map))
-      `(keymap ,gnus-mime-security-button-map
-              gnus-callback gnus-mime-security-press-button
-              gnus-line-format ,gnus-mime-security-button-line-format 
-              article-type annotation
-              gnus-data ,handle)))
+     `(keymap ,gnus-mime-security-button-map
+             ,@(if (>= (string-to-number emacs-version) 21)
+                   nil ;; XEmacs doesn't care
+                 (list 'local-map gnus-mime-security-button-map))
+             gnus-callback gnus-mime-security-press-button
+             gnus-line-format ,gnus-mime-security-button-line-format 
+             article-type annotation
+             gnus-data ,handle))
     (setq e (point))
     (widget-convert-button
      'link b e