From ae2b783ff77305c9e0bef64297d9eb337e4f29e7 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 6 Feb 2001 13:35:36 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog     |   11 +++++++++++
 lisp/gnus-art.el   |    5 +----
 lisp/gnus-start.el |   24 ++++++++++++++----------
 lisp/gnus-sum.el   |   14 +++++++++++---
 lisp/gnus-xmas.el  |    2 +-
 5 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3f47e9..9c32d25 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2001-02-04 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-sum.el (gnus-summary-mark-as-processable): Understand
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8b6459d..9c72266 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3173,10 +3173,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-start.el b/lisp/gnus-start.el
index 3bddae8..c8204ce 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2775,16 +2775,20 @@ The backup file \".newsrc.eld_\" will be created before re-reading."
 	    (skip-chars-forward " \t")
 	    ;; ...  which leads to this line being effectively ignored.
 	    (when (symbolp group)
-	      (let ((str (buffer-substring
-			  (point) (progn (end-of-line) (point))))
-		    (coding
-		     (and (or (featurep 'xemacs)
-			      (and (boundp 'enable-multibyte-characters)
-				   enable-multibyte-characters))
-			  (fboundp 'gnus-mule-get-coding-system)
-			  (gnus-mule-get-coding-system (symbol-name group)))))
-		(when coding
-		  (setq str (decode-coding-string str (car coding))))
+	      (let* ((str (buffer-substring
+			   (point) (progn (end-of-line) (point))))
+		     (name (symbol-name group))
+		     (charset
+		      (or (gnus-group-name-charset method name)
+			  (let ((alist gnus-group-charset-alist)
+				elem charset)
+			    (while (setq elem (pop alist))
+			      (when (and name (string-match (car elem) name))
+				(setq alist nil
+				      charset (cadr elem))))
+			    charset))))
+		(when (and str charset (featurep 'mule))
+		  (setq str (decode-coding-string str charset)))
 		(set group str)))
 	    (forward-line 1))))
       (gnus-message 5 "Reading descriptions file...done")
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 9abe8f5..e49cb16 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1372,6 +1372,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
 
@@ -1868,9 +1870,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 2bcde76..41bf95c 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -332,7 +332,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
-- 
1.7.10.4