Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c301de..701627e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-19  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-sum.el (gnus-summary-make-menu-bar): Add "View as different
+       encoding" submenu.
+
+2002-03-19  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-group.el (gnus-group-process-prefix): Make sure there is a mark.
+
 2002-03-19  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-sum.el (gnus-sum-thread-tree-root) 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 4533b5b..26b5d23 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1758,7 +1758,7 @@ Take into consideration N (the prefix) and the list of marked groups."
          (setq n (1- n))
          (gnus-group-next-group way)))
       (nreverse groups)))
-   ((gnus-region-active-p)
+   ((and (gnus-region-active-p) (mark))
     ;; Work on the region between point and mark.
     (let ((max (max (point) (mark)))
          groups)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 56ec9b1..36d4305 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1976,7 +1976,31 @@ increase the score of each group you read."
              ["Show X-Face" gnus-article-display-x-face t]
              ["Show picons in From" gnus-treat-from-picon t]
              ["Show picons in mail headers" gnus-treat-mail-picon t]
-             ["Show picons in news headers" gnus-treat-newsgroups-picon t])
+             ["Show picons in news headers" gnus-treat-newsgroups-picon t]
+             ("View as different encoding"
+              ,@(let (out)
+                  (if (fboundp 'coding-system-list)
+                      (mapcar (lambda (el)
+                                (let ((cs (symbol-name el)))
+                                  (unless (or (string-match "dos$" cs)
+                                              (string-match "mac$" cs)
+                                              (string-match "unix$" cs))
+                                    (push el out))))
+                              (coding-system-list))
+                    ;;(setq out (mapcar 'car mm-mime-mule-charset-alist))
+                    )
+                  (setq out (sort out (lambda (a b)
+                                        (string< (symbol-name a)
+                                                 (symbol-name b)))))
+                  (mapcar (lambda (cs)
+                            `[,(symbol-name cs)
+                              (lambda ()
+                                (interactive)
+                                (let ((gnus-summary-show-article-charset-alist
+                                       '((1 . ,cs))))
+                                  (gnus-summary-show-article 1)))
+                              t])
+                          out))))
             ("Washing"
              ("Remove Blanks"
               ["Leading" gnus-article-strip-leading-blank-lines t]