diff lisp/gnus/gnus-art.el @ 35957:a35d9c07d074

2001-02-07 ShengHuo ZHU <zsh@cs.rochester.edu> * message.el (message-make-forward-subject): Argument decoded. (message-forward): Use it when digest. * gnus-uu.el (gnus-uu-grab-articles): Shoot down original article buffer. * gnus-sum.el (gnus-summary-make-menu-bar): Don't share menu bar in Emacs. * gnus-art.el (gnus-article-make-menu-bar): Make gnus-article-post-menu.
author ShengHuo ZHU <zsh@cs.rochester.edu>
date Wed, 07 Feb 2001 22:08:26 +0000
parents 53eebdb81828
children a26d9b55abb6
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el	Wed Feb 07 16:30:51 2001 +0000
+++ b/lisp/gnus/gnus-art.el	Wed Feb 07 22:08:26 2001 +0000
@@ -2289,8 +2289,9 @@
 				 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.
 
@@ -2662,6 +2663,8 @@
 (substitute-key-definition
  'undefined 'gnus-article-read-summary-keys gnus-article-mode-map)
 
+(defvar gnus-article-post-menu nil)
+
 (defun gnus-article-make-menu-bar ()
   (gnus-turn-off-edit-menu 'article)
   (unless (boundp 'gnus-article-article-menu)
@@ -2692,8 +2695,15 @@
     ;; Note "Commands" menu is defined in gnus-sum.el for consistency
 
     (when (boundp 'gnus-summary-post-menu)
+      (cond 
+       ((not (keymapp gnus-summary-post-menu))
+ 	(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)))
 
@@ -2716,13 +2726,13 @@
 \\[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)