2001-02-04 11:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus-art.el (gnus-article-make-menu-bar): Make
	gnus-article-post-menu.

	* gnus-xmas.el (gnus-xmas-article-menu-add): Add post menu.

	* gnus-sum.el (gnus-summary-make-menu-bar): Use t if XEmacs.

	* gnus-group.el (gnus-group-make-menu-bar): Ditto.

	* message.el (message-mode-menu): Ditto.

	* gnus-art.el (defvar): eval-when-compile.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2ce6ab..bfbb280 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2001-02-04 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (gnus-article-make-menu-bar): Make
+       gnus-article-post-menu.
+
+       * gnus-xmas.el (gnus-xmas-article-menu-add): Add post menu.
+
+       * gnus-sum.el (gnus-summary-make-menu-bar): Use t if XEmacs.
+
+       * gnus-group.el (gnus-group-make-menu-bar): Ditto.
+       
+       * message.el (message-mode-menu): Ditto.
+       
+       * gnus-art.el (defvar): eval-when-compile.
+
 2001-02-02 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-agent.el (gnus-agentize): Fix doc.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index acd2258..dac0610 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2461,8 +2461,9 @@ This format is defined by the `gnus-article-time-format' variable."
                                 gnus-newsgroup-name 'highlight-words t)))
             gnus-emphasis-alist)))))
 
-(defvar gnus-summary-article-menu)
-(defvar gnus-summary-post-menu)
+(eval-when-compile
+  (defvar gnus-summary-article-menu)
+  (defvar gnus-summary-post-menu))
 
 ;;; Saving functions.
 
@@ -2914,6 +2915,8 @@ If variable `gnus-use-long-file-name' is non-nil, it is
 (eval-when-compile
   (defvar gnus-article-commands-menu))
 
+(defvar gnus-article-post-menu nil)
+
 (defun gnus-article-make-menu-bar ()
   (gnus-turn-off-edit-menu 'article)
   (unless (boundp 'gnus-article-article-menu)
@@ -2942,17 +2945,22 @@ If variable `gnus-use-long-file-name' is non-nil, it is
        ["Decode HZ" gnus-article-decode-HZ t]))
 
     ;; Note "Commands" menu is defined in gnus-sum.el for consistency
-
+    
     (when (boundp 'gnus-summary-post-menu)
+      (cond 
+       ((featurep 'xemacs)
+       (setq gnus-article-post-menu gnus-summary-post-menu))
+       ((not gnus-article-post-menu)
+       ;; Don't share post menu.
+       (setq gnus-article-post-menu
+             (copy-keymap gnus-summary-post-menu))))
       (define-key gnus-article-mode-map [menu-bar post]
-       (cons "Post" gnus-summary-post-menu)))
+       (cons "Post" gnus-article-post-menu)))
 
     (gnus-run-hooks 'gnus-article-menu-hook))
   ;; Add the menu.
   (when (boundp 'gnus-article-commands-menu)
-    (easy-menu-add gnus-article-commands-menu gnus-article-mode-map))
-  (when (boundp 'gnus-summary-post-menu)
-    (easy-menu-add gnus-summary-post-menu gnus-article-mode-map)))
+    (easy-menu-add gnus-article-commands-menu gnus-article-mode-map)))
 
 ;; Fixme: do something for the Emacs tool bar in Article mode a la
 ;; Summary.
@@ -2973,13 +2981,13 @@ commands:
 \\[gnus-article-describe-briefly]\t Describe the current mode briefly
 \\[gnus-info-find-node]\t Go to the Gnus info node"
   (interactive)
-  (when (gnus-visual-p 'article-menu 'menu)
-    (gnus-article-make-menu-bar))
   (gnus-simplify-mode-line)
   (setq mode-name "Article")
   (setq major-mode 'gnus-article-mode)
   (make-local-variable 'minor-mode-alist)
   (use-local-map gnus-article-mode-map)
+  (when (gnus-visual-p 'article-menu 'menu)
+    (gnus-article-make-menu-bar))
   (gnus-update-format-specifications nil 'article-mode)
   (set (make-local-variable 'page-delimiter) gnus-page-delimiter)
   (make-local-variable 'gnus-page-broken)

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 9946375..0c56fdf 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -855,7 +855,7 @@ 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
-       ,@(if (featurep 'xemacs) nil
+       ,@(if (featurep 'xemacs) '(t)
            '(:help "Get newly arrived articles"))
        ]
        ["Activate all groups" gnus-activate-all-groups t]
@@ -874,7 +874,7 @@ in the minibuffer prompt."
        ["Toggle topics" gnus-topic-mode t]
        ["Send a bug report" gnus-bug t]
        ["Exit from Gnus" gnus-group-exit
-       ,@(if (featurep 'xemacs) nil
+       ,@(if (featurep 'xemacs) '(t)
            '(:help "Quit reading news"))]
        ["Exit without saving" gnus-group-quit t]))
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 0d6539e..911d447 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1786,7 +1786,7 @@ 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
-              ,@(if (featurep 'xemacs) nil
+              ,@(if (featurep 'xemacs) '(t)
                   '(:help "\"Caesar rotate\" article by 13"))]
               ["Unix pipe" gnus-summary-pipe-message t]
               ["Add buttons" gnus-article-add-buttons t]
@@ -1799,10 +1799,10 @@ increase the score of each group you read."
              ["HZ" gnus-article-decode-HZ t])
              ("Output"
               ["Save in default format" gnus-summary-save-article
-              ,@(if (featurep 'xemacs) nil
+              ,@(if (featurep 'xemacs) '(t)
                   '(:help "Save article using default method"))]
               ["Save in file" gnus-summary-save-article-file
-              ,@(if (featurep 'xemacs) nil
+              ,@(if (featurep 'xemacs) '(t)
                   '(: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]
@@ -1835,7 +1835,7 @@ increase the score of each group you read."
                 'request-expire-articles gnus-newsgroup-name)])
              ("Extract"
               ["Uudecode" gnus-uu-decode-uu
-              ,@(if (featurep 'xemacs) nil
+              ,@(if (featurep 'xemacs) '(t)
                   '(:help "Decode uuencoded article(s)"))]
               ["Uudecode and save" gnus-uu-decode-uu-and-save t]
               ["Unshar" gnus-uu-decode-unshar t]
@@ -1888,23 +1888,23 @@ increase the score of each group you read."
      gnus-summary-post-menu gnus-summary-mode-map ""
      `("Post"
        ["Post an article" gnus-summary-post-news
-       ,@(if (featurep 'xemacs) nil
+       ,@(if (featurep 'xemacs) '(t)
            '(:help "Post an article"))]
        ["Followup" gnus-summary-followup
-       ,@(if (featurep 'xemacs) nil
+       ,@(if (featurep 'xemacs) '(t)
            '(:help "Post followup to this article"))]
        ["Followup and yank" gnus-summary-followup-with-original
-       ,@(if (featurep 'xemacs) nil
+       ,@(if (featurep 'xemacs) '(t)
            '(:help "Post followup to this article, quoting its contents"))]
        ["Supersede article" gnus-summary-supersede-article t]
        ["Cancel article" gnus-summary-cancel-article
-       ,@(if (featurep 'xemacs) nil
+       ,@(if (featurep 'xemacs) '(t)
            '(: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
-       ,@(if (featurep 'xemacs) nil
+       ,@(if (featurep 'xemacs) '(t)
            '(:help "Mail a reply, quoting this article"))]
        ["Mail forward" gnus-summary-mail-forward t]
        ["Post forward" gnus-summary-post-forward t]
@@ -1914,7 +1914,7 @@ 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
-       ,@(if (featurep 'xemacs) nil
+       ,@(if (featurep 'xemacs) '(t)
            '(:help "Post a uuencoded article"))]
        ["Followup via news" gnus-summary-followup-to-mail t]
        ["Followup via news and yank"
@@ -1933,7 +1933,7 @@ increase the score of each group you read."
         gnus-summary-kill-same-subject-and-select t]
        ["Mark same subject" gnus-summary-kill-same-subject t]
        ["Catchup" gnus-summary-catchup
-        ,@(if (featurep 'xemacs) nil
+        ,@(if (featurep 'xemacs) '(t)
             '(: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]
@@ -1985,10 +1985,10 @@ increase the score of each group you read."
         ["Save" gnus-summary-save-process-mark t]))
        ("Scroll article"
        ["Page forward" gnus-summary-next-page
-        ,@(if (featurep 'xemacs) nil
+        ,@(if (featurep 'xemacs) '(t)
             '(:help "Show next page of article"))]
        ["Page backward" gnus-summary-prev-page
-        ,@(if (featurep 'xemacs) nil
+        ,@(if (featurep 'xemacs) '(t)
             '(:help "Show previous page of article"))]
        ["Line forward" gnus-summary-scroll-up t])
        ("Move"
@@ -2041,12 +2041,12 @@ increase the score of each group you read."
        ["Send a bug report" gnus-bug t]
        ("Exit"
        ["Catchup and exit" gnus-summary-catchup-and-exit
-        ,@(if (featurep 'xemacs) nil
+        ,@(if (featurep 'xemacs) '(t)
             '(: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
-        ,@(if (featurep 'xemacs) nil
+        ,@(if (featurep 'xemacs) '(t)
             '(: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]

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index cf272cc..2d62b78 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -330,7 +330,8 @@ call it with the value of the `gnus-data' text property."
 
 (defun gnus-xmas-article-menu-add ()
   (gnus-xmas-menu-add article
-    gnus-article-article-menu gnus-article-treatment-menu))
+    gnus-article-article-menu gnus-article-treatment-menu
+    gnus-article-post-menu))
 
 (defun gnus-xmas-score-menu-add ()
   (gnus-xmas-menu-add score

diff --git a/lisp/message.el b/lisp/message.el
index 4f2c7f1..9fadc64 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1465,20 +1465,20 @@ 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
-    ,@(if (featurep 'xemacs) nil
+    ,@(if (featurep 'xemacs) '(t)
        '(:help "Spellcheck this message"))]
    ["Attach file as MIME" mml-attach-file
-    ,@(if (featurep 'xemacs) nil
+    ,@(if (featurep 'xemacs) '(t)
        '(:help "Attach a file at point"))]
    "----"
    ["Send Message" message-send-and-exit
-    ,@(if (featurep 'xemacs) nil
+    ,@(if (featurep 'xemacs) '(t)
        '(:help "Send this message"))]
    ["Abort Message" message-dont-send
-    ,@(if (featurep 'xemacs) nil
+    ,@(if (featurep 'xemacs) '(t)
        '(:help "File this draft message and exit"))]
    ["Kill Message" message-kill-buffer
-    ,@(if (featurep 'xemacs) nil
+    ,@(if (featurep 'xemacs) '(t)
        '(:help "Delete this message without sending"))]))
 
 (easy-menu-define