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

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

	* gnus-sum.el (gnus-summary-make-menu-bar): Don't share menu bar
	in Emacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cc0642..4b52e2f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2001-02-06 02:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * gnus-xmas.el (gnus-xmas-article-menu-add): Add
+       gnus-article-commands-menu.
+
+       * gnus-sum.el (gnus-summary-make-menu-bar): Don't share menu bar
+       in Emacs.
+
        * gnus-start.el (gnus-read-descriptions-file): Use
        gnus-group-name-charset and gnus-group-charset-alist.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index f2a67d3..d591193 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2957,10 +2957,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
       (define-key gnus-article-mode-map [menu-bar post]
        (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)))
+    (gnus-run-hooks 'gnus-article-menu-hook)))
 
 ;; Fixme: do something for the Emacs tool bar in Article mode a la
 ;; Summary.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 20da8f9..11e0083 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1349,6 +1349,8 @@ increase the score of each group you read."
 
 (put 'gnus-summary-mode 'mode-class 'special)
 
+(defvar gnus-article-commands-menu)
+
 (when t
   ;; Non-orthogonal keys
 
@@ -1862,9 +1864,15 @@ increase the score of each group you read."
        gnus-summary-article-menu gnus-summary-mode-map ""
        (cons "Article" innards))
 
-      (easy-menu-define
-       gnus-article-commands-menu gnus-article-mode-map ""
-       (cons "Commands" innards)))
+      (if (not (keymapp gnus-summary-article-menu))
+         (easy-menu-define
+           gnus-article-commands-menu gnus-article-mode-map ""
+           (cons "Commands" innards))
+       ;; in Emacs, don't share menu.
+       (setq gnus-article-commands-menu 
+             (copy-keymap gnus-summary-article-menu))
+       (define-key gnus-article-mode-map [menu-bar commands]
+         (cons "Commands" gnus-article-commands-menu))))
 
     (easy-menu-define
      gnus-summary-thread-menu gnus-summary-mode-map ""

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 2d62b78..007de23 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -331,7 +331,7 @@ 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-post-menu))
+    gnus-article-post-menu gnus-article-commands-menu))
 
 (defun gnus-xmas-score-menu-add ()
   (gnus-xmas-menu-add score