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

	* gnus-group.el, gnus-sum.el, message.el: Add :help unless Emacs.
	* gnus-art.el (gnus-insert-mime-button): Simplify.
	(gnus-mime-display-alternative): Ditto.
	(gnus-insert-mime-security-button): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd14ec1..ee61216 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-20 02:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-group.el, gnus-sum.el, message.el: Add :help unless Emacs.
+       * gnus-art.el (gnus-insert-mime-button): Simplify.
+       (gnus-mime-display-alternative): Ditto.
+       (gnus-insert-mime-security-button): Ditto.
+
 2000-12-20 01:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-util.el (gnus-add-text-properties-when): In XEmacs,

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

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 3de0cf6..71726e5 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -699,29 +699,29 @@ in the minibuffer prompt."
 
     (easy-menu-define
      gnus-group-reading-menu gnus-group-mode-map ""
-     '("Group"
+     `("Group"
        ["Read" gnus-group-read-group (gnus-group-group-name)]
        ["Select" gnus-group-select-group (gnus-group-group-name)]
        ["See old articles" (gnus-group-select-group 'all)
        :keys "C-u SPC" :active (gnus-group-group-name)]
        ["Catch up" gnus-group-catchup-current :active (gnus-group-group-name)
-       ;;:help "Mark unread articles in the current group as read"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Mark unread articles in the current group as read"))]
        ["Catch up all articles" gnus-group-catchup-current-all
        (gnus-group-group-name)]
        ["Check for new articles" gnus-group-get-new-news-this-group
        :active (gnus-group-group-name)
-       ;;:help "Check for new messages in current group"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Check for new messages in current group"))]
        ["Toggle subscription" gnus-group-unsubscribe-current-group
        (gnus-group-group-name)]
        ["Kill" gnus-group-kill-group :active (gnus-group-group-name)
-       ;;:help "Kill (remove) current group"
-       ]
+       ,@(if (featurep 'xemacs) nil
+             '(:help "Kill (remove) current group"))]
        ["Yank" gnus-group-yank-group gnus-list-of-killed-groups]
        ["Describe" gnus-group-describe-group :active (gnus-group-group-name)
-       ;;:help "Display description of the current group"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Display description of the current group"))]
        ["Fetch FAQ" gnus-group-fetch-faq (gnus-group-group-name)]
        ;; Actually one should check, if any of the marked groups gives t for
        ;; (gnus-check-backend-function 'request-expire-articles ...)
@@ -837,7 +837,7 @@ in the minibuffer prompt."
 
     (easy-menu-define
      gnus-group-misc-menu gnus-group-mode-map ""
-     '("Misc"
+     `("Misc"
        ("SOUP"
        ["Pack replies" nnsoup-pack-replies (fboundp 'nnsoup-request-group)]
        ["Send replies" gnus-soup-send-replies
@@ -848,7 +848,8 @@ in the minibuffer prompt."
        ["Send a mail" gnus-group-mail t]
        ["Post an article..." gnus-group-post-news t]
        ["Check for new news" gnus-group-get-new-news
-       ;;:help "Get newly arrived articles"
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Get newly arrived articles"))
        ]
        ["Activate all groups" gnus-activate-all-groups t]
        ["Restart Gnus" gnus-group-restart t]
@@ -866,8 +867,8 @@ in the minibuffer prompt."
        ["Toggle topics" gnus-topic-mode t]
        ["Send a bug report" gnus-bug t]
        ["Exit from Gnus" gnus-group-exit
-       ;;:help "Quit reading news"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Quit reading news"))]
        ["Exit without saving" gnus-group-quit t]))
 
     (gnus-run-hooks 'gnus-group-menu-hook)))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 08e56ba..28cbdb4 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1724,7 +1724,7 @@ increase the score of each group you read."
     ;; Define both the Article menu in the summary buffer and the equivalent
     ;; Commands menu in the article buffer here for consistency.
     (let ((innards
-           '(("Hide"
+           `(("Hide"
               ["All" gnus-article-hide t]
               ["Headers" gnus-article-hide-headers t]
               ["Signature" gnus-article-hide-signature t]
@@ -1773,8 +1773,8 @@ increase the score of each group you read."
               ["Quoted-Printable" gnus-article-de-quoted-unreadable t]
               ["Base64" gnus-article-de-base64-unreadable t]
               ["Rot 13" gnus-summary-caesar-message
-              ;;:help "\"Caesar rotate\" article by 13"
-              ]
+              ,@(if (featurep 'xemacs) nil
+                  '(:help "\"Caesar rotate\" article by 13"))]
               ["Unix pipe" gnus-summary-pipe-message t]
               ["Add buttons" gnus-article-add-buttons t]
               ["Add buttons to head" gnus-article-add-buttons-to-head t]
@@ -1786,11 +1786,11 @@ increase the score of each group you read."
              ["HZ" gnus-article-decode-HZ t])
              ("Output"
               ["Save in default format" gnus-summary-save-article
-              ;;:help "Save article using default method"
-              ]
+              ,@(if (featurep 'xemacs) nil
+                  '(:help "Save article using default method"))]
               ["Save in file" gnus-summary-save-article-file
-              ;;:help "Save article in file"
-              ]
+              ,@(if (featurep 'xemacs) nil
+                  '(:help "Save article in file"))]
               ["Save in Unix mail format" gnus-summary-save-article-mail t]
               ["Save in MH folder" gnus-summary-save-article-folder t]
               ["Save in VM folder" gnus-summary-save-article-vm t]
@@ -1822,8 +1822,8 @@ increase the score of each group you read."
                 'request-expire-articles gnus-newsgroup-name)])
              ("Extract"
               ["Uudecode" gnus-uu-decode-uu
-              ;;:help "Decode uuencoded article(s)"
-              ]
+              ,@(if (featurep 'xemacs) nil
+                  '(:help "Decode uuencoded article(s)"))]
               ["Uudecode and save" gnus-uu-decode-uu-and-save t]
               ["Unshar" gnus-uu-decode-unshar t]
               ["Unshar and save" gnus-uu-decode-unshar-and-save t]
@@ -1873,26 +1873,26 @@ increase the score of each group you read."
 
     (easy-menu-define
      gnus-summary-post-menu gnus-summary-mode-map ""
-     '("Post"
+     `("Post"
        ["Post an article" gnus-summary-post-news
-       ;;:help "Post an article"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Post an article"))]
        ["Followup" gnus-summary-followup
-       ;;:help "Post followup to this article"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Post followup to this article"))]
        ["Followup and yank" gnus-summary-followup-with-original
-       ;;:help "Post followup to this article, quoting its contents"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Post followup to this article, quoting its contents"))]
        ["Supersede article" gnus-summary-supersede-article t]
        ["Cancel article" gnus-summary-cancel-article
-       ;;:help "Cancel an article you posted"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Cancel an article you posted"))]
        ["Reply" gnus-summary-reply t]
        ["Reply and yank" gnus-summary-reply-with-original t]
        ["Wide reply" gnus-summary-wide-reply t]
        ["Wide reply and yank" gnus-summary-wide-reply-with-original
-       ;;:help "Mail a reply, quoting this article"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Mail a reply, quoting this article"))]
        ["Mail forward" gnus-summary-mail-forward t]
        ["Post forward" gnus-summary-post-forward t]
        ["Digest and mail" gnus-uu-digest-mail-forward t]
@@ -1901,8 +1901,8 @@ increase the score of each group you read."
        ["Send bounced mail" gnus-summary-resend-bounced-mail t]
        ["Send a mail" gnus-summary-mail-other-window t]
        ["Uuencode and post" gnus-uu-post-news
-       ;;:help "Post a uuencoded article"
-       ]
+       ,@(if (featurep 'xemacs) nil
+           '(:help "Post a uuencoded article"))]
        ["Followup via news" gnus-summary-followup-to-mail t]
        ["Followup via news and yank"
        gnus-summary-followup-to-mail-with-original t]
@@ -1913,15 +1913,15 @@ increase the score of each group you read."
 
     (easy-menu-define
      gnus-summary-misc-menu gnus-summary-mode-map ""
-     '("Misc"
+     `("Misc"
        ("Mark Read"
        ["Mark as read" gnus-summary-mark-as-read-forward t]
        ["Mark same subject and select"
         gnus-summary-kill-same-subject-and-select t]
        ["Mark same subject" gnus-summary-kill-same-subject t]
        ["Catchup" gnus-summary-catchup
-        ;;:help "Mark unread articles in this group as read"
-        ]
+        ,@(if (featurep 'xemacs) nil
+            '(:help "Mark unread articles in this group as read"))]
        ["Catchup all" gnus-summary-catchup-all t]
        ["Catchup to here" gnus-summary-catchup-to-here t]
        ["Catchup region" gnus-summary-mark-region-as-read t]
@@ -1972,11 +1972,11 @@ increase the score of each group you read."
         ["Save" gnus-summary-save-process-mark t]))
        ("Scroll article"
        ["Page forward" gnus-summary-next-page
-        ;;:help "Show next page of article"
-        ]
+        ,@(if (featurep 'xemacs) nil
+            '(:help "Show next page of article"))]
        ["Page backward" gnus-summary-prev-page
-        ;;:help "Show previous page of article"
-        ]
+        ,@(if (featurep 'xemacs) nil
+            '(:help "Show previous page of article"))]
        ["Line forward" gnus-summary-scroll-up t])
        ("Move"
        ["Next unread article" gnus-summary-next-unread-article t]
@@ -2028,13 +2028,13 @@ increase the score of each group you read."
        ["Send a bug report" gnus-bug t]
        ("Exit"
        ["Catchup and exit" gnus-summary-catchup-and-exit
-        ;;:help "Mark unread articles in this group as read, then exit"
-        ]
+        ,@(if (featurep 'xemacs) nil
+            '(:help "Mark unread articles in this group as read, then exit"))]
        ["Catchup all and exit" gnus-summary-catchup-all-and-exit t]
        ["Catchup and goto next" gnus-summary-catchup-and-goto-next-group t]
        ["Exit group" gnus-summary-exit
-        ;;:help "Exit current group, return to group selection mode"
-        ]
+        ,@(if (featurep 'xemacs) nil
+            '(:help "Exit current group, return to group selection mode"))]
        ["Exit group without updating" gnus-summary-exit-no-update t]
        ["Exit and goto next group" gnus-summary-next-group t]
        ["Exit and goto prev group" gnus-summary-prev-group t]

diff --git a/lisp/message.el b/lisp/message.el
index 1eedffa..71dba43 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1411,7 +1411,7 @@ Point is left at the beginning of the narrowed-to region."
 
 (easy-menu-define
  message-mode-menu message-mode-map "Message Menu."
- '("Message"
+ `("Message"
    ["Sort Headers" message-sort-headers t]
    ["Yank Original" message-yank-original t]
    ["Fill Yanked Message" message-fill-yanked-message t]
@@ -1424,21 +1424,21 @@ Point is left at the beginning of the narrowed-to region."
    ["Newline and Reformat" message-newline-and-reformat t]
    ["Rename buffer" message-rename-buffer t]
    ["Spellcheck" ispell-message
-    ;;:help "Spellcheck this message"
-    ]
+    ,@(if (featurep 'xemacs) nil
+       '(:help "Spellcheck this message"))]
    ["Attach file as MIME" mml-attach-file
-    ;;:help "Attach a file at point"
-    ]
+    ,@(if (featurep 'xemacs) nil
+       '(:help "Attach a file at point"))]
    "----"
    ["Send Message" message-send-and-exit
-    ;;:help "Send this message"
-    ]
+    ,@(if (featurep 'xemacs) nil
+       '(:help "Send this message"))]
    ["Abort Message" message-dont-send
-    ;;:help "File this draft message and exit"
-    ]
+    ,@(if (featurep 'xemacs) nil
+       '(:help "File this draft message and exit"))]
    ["Kill Message" message-kill-buffer
-    ;;:help "Delete this message without sending"
-    ]))
+    ,@(if (featurep 'xemacs) nil
+       '(:help "Delete this message without sending"))]))
 
 (easy-menu-define
  message-mode-field-menu message-mode-map ""