Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89b951f..d3f47e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,45 @@
+2001-02-04 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-sum.el (gnus-summary-mark-as-processable): Understand
+       active region.
+
+       * gnus-start.el (gnus-group-change-level): Remove from both
+       gnus-zombie-list and gnus-killed-list.
+
+2001-02-04 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-start.el (gnus-subscribe-options-newsgroup-method): Add
+       gnus-subscribe-topics.
+
+       * gnus-cus.el (gnus-extra-topic-parameters): Fix doc.
+
+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.
+
+2001-02-02  Karl Kleinpaste <karl@charcoal.com>
+
+       * mml.el (mml-preview): Bind `q'.
+
+2001-02-02 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-util.el (mm-mime-mule-charset-alist): non-Mule case.
+
 2001-01-31  Dave Love  <fx@gnu.org>
 
        * mm-util.el (mm-mime-mule-charset-alist)

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 3c1da2f..7eb4fe9 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -365,9 +365,9 @@ last form in your `.gnus.el' file:
 
 \(gnus-agentize)
 
-This will modify the `gnus-before-startup-hook', `gnus-post-method',
-and `message-send-mail-function' variables, and install the Gnus
-agent minor mode in all Gnus buffers."
+This will modify the `gnus-setup-news-hook', and
+`message-send-mail-function' variables, and install the Gnus agent
+minor mode in all Gnus buffers."
   (interactive)
   (gnus-open-agent)
   (add-hook 'gnus-setup-news-hook 'gnus-agent-queue-setup)

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 2cd1726..8b6459d 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2660,8 +2660,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.
 
@@ -3133,6 +3134,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)
@@ -3158,17 +3161,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 
+       ((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))
   ;; 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.
@@ -3189,8 +3197,6 @@ 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)
@@ -3198,6 +3204,8 @@ commands:
   (unless (assq 'gnus-show-mime minor-mode-alist)
     (push (list 'gnus-show-mime " MIME") 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-cus.el b/lisp/gnus-cus.el
index 4d3aa94..444ff9a 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -274,7 +274,8 @@ DOC is a documentation string for the parameter.")
 
 (defconst gnus-extra-topic-parameters
   '((subscribe (regexp :tag "Subscribe") "\
-If `gnus-subscribe-newsgroup-method' is set to
+If `gnus-subscribe-newsgroup-method' or 
+`gnus-subscribe-options-newsgroup-method' is set to
 `gnus-subscribe-topics', new groups that matches this regexp will
 automatically be subscribed to this topic")) 
   "Alist of topic parameters that are not also group parameters.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 6a4cfca..e1a3af4 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -863,7 +863,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]
@@ -882,7 +882,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-start.el b/lisp/gnus-start.el
index 3501554..3bddae8 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -287,6 +287,7 @@ the subscription method in this variable."
                (function-item gnus-subscribe-interactively)
                (function-item gnus-subscribe-killed)
                (function-item gnus-subscribe-zombies)
+               (function-item gnus-subscribe-topics)
                function))
 
 (defcustom gnus-subscribe-hierarchical-interactive nil
@@ -1240,9 +1241,9 @@ for new groups, and subscribe the new groups as zombies."
       ;; it from the newsrc hash table and assoc.
       (cond
        ((>= oldlevel gnus-level-zombie)
-       (if (= oldlevel gnus-level-zombie)
-           (setq gnus-zombie-list (delete group gnus-zombie-list))
-         (setq gnus-killed-list (delete group gnus-killed-list))))
+       ;; oldlevel could be wrong.
+       (setq gnus-zombie-list (delete group gnus-zombie-list))
+       (setq gnus-killed-list (delete group gnus-killed-list)))
        (t
        (when (and (>= level gnus-level-zombie)
                   entry)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index f4c294b..9abe8f5 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1791,7 +1791,7 @@ increase the score of each group you read."
               ["CR" gnus-article-remove-cr t]
               ["Show X-Face" gnus-article-display-x-face 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]
@@ -1805,10 +1805,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]
@@ -1841,7 +1841,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]
@@ -1894,23 +1894,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]
@@ -1920,7 +1920,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"
@@ -1939,7 +1939,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]
@@ -1991,10 +1991,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"
@@ -2047,12 +2047,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]
@@ -8398,28 +8398,31 @@ If optional argument UNMARK is negative, mark articles as unread instead."
 If N is negative, mark backward instead.  If UNMARK is non-nil, remove
 the process mark instead.  The difference between N and the actual
 number of articles marked is returned."
-  (interactive "p")
-  (let ((backward (< n 0))
-       (n (abs n)))
-    (while (and
-           (> n 0)
-           (if unmark
+  (interactive "P")
+  (if (and (null n) (gnus-region-active-p))
+      (gnus-uu-mark-region (region-beginning) (region-end) unmark)
+    (setq n (prefix-numeric-value n))
+    (let ((backward (< n 0))
+         (n (abs n)))
+      (while (and
+             (> n 0)
+             (if unmark
                (gnus-summary-remove-process-mark
                 (gnus-summary-article-number))
-             (gnus-summary-set-process-mark (gnus-summary-article-number)))
-           (zerop (gnus-summary-next-subject (if backward -1 1) nil t)))
-      (setq n (1- n)))
-    (when (/= 0 n)
-      (gnus-message 7 "No more articles"))
-    (gnus-summary-recenter)
-    (gnus-summary-position-point)
-    n))
+               (gnus-summary-set-process-mark (gnus-summary-article-number)))
+             (zerop (gnus-summary-next-subject (if backward -1 1) nil t)))
+       (setq n (1- n)))
+      (when (/= 0 n)
+       (gnus-message 7 "No more articles"))
+      (gnus-summary-recenter)
+      (gnus-summary-position-point)
+      n)))
 
 (defun gnus-summary-unmark-as-processable (n)
   "Remove the process mark from the next N articles.
 If N is negative, unmark backward instead.  The difference between N and
 the actual number of articles unmarked is returned."
-  (interactive "p")
+  (interactive "P")
   (gnus-summary-mark-as-processable n t))
 
 (defun gnus-summary-unmark-all-processable ()

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 2356458..2bcde76 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -331,7 +331,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 8f7315d..20a1ba6 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1846,20 +1846,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" mime-edit-insert-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

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 6d1e2fd..8f9df0c 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -73,7 +73,9 @@
                    chinese-cns11643-3 chinese-cns11643-4
                    chinese-cns11643-5 chinese-cns11643-6
                    chinese-cns11643-7)
-    ,(if (or (charsetp 'unicode-a)
+    ,(if (or (not (fboundp 'charsetp)) ;; non-Mule case
+            (not (fboundp 'coding-system-p))
+            (charsetp 'unicode-a)
             (not (coding-system-p 'mule-utf-8)))
         '(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e)
        ;; If we have utf-8 we're in Mule 5+.

diff --git a/lisp/mml.el b/lisp/mml.el
index 87f2ec3..c5d85cb 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -891,6 +891,7 @@ If RAW, don't highlight the article."
          (gnus-article-prepare-display))))
     (fundamental-mode)
     (setq buffer-read-only t)
+    (local-set-key "q" (lambda () (interactive) (kill-buffer nil)))
     (goto-char (point-min))))
 
 (defun mml-validate ()

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 409159c..824c5f7 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-02  David Masterson <dmasters@Rational.Com>
+
+       * gnus.texi (The Server is Down): Add link to Group Levels.
+
 2001-01-24  Simon Josefsson  <sj@extundo.com>
 
        * gnus.texi (Mail Source Specifiers): Add IMAP :program, fix POP

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 7ebfb0b..6880a43 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1119,7 +1119,7 @@ Gnus \e$B$O!"?.Mj$G$-$k%W%m%0%i%`$N0l$D$H$7$F!"%5!<%P!<$H@\B3$G$-$J$$$H$-$O\e(B
 \e$B$r;H$&$3$H$,$G$-$^$9!#5^$$$G$$$k$H$-$K$b$T$C$?$j$G$7$g$&!#$3$NL?Na$OK\Mh\e(B
 \e$B$N%5!<%P!<$K$O@\B3$7$^$;$s!=!=$=$NBe$o$j$K!"%l%Y%k\e(B 1 \e$B$H\e(B 2 \e$B$K$"$k$9$Y$F$N\e(B
 \e$B%0%k!<%W$r3hF0>uBV$K$7$^$9\e(B (\e$B4pK\%0%k!<%W$G$J$$%0%k!<%W$O$=$NFs$D$N%l%Y%k\e(B
-\e$B$K$7$F$*$/$N$,K>$^$7$$$G$7$g$&\e(B)\e$B!#\e(B
+\e$B$K$7$F$*$/$N$,K>$^$7$$$G$7$g$&\e(B)\e$B!#\e(B@pxref{Group Levels} \e$B$b;2>H$7$F2<$5$$!#\e(B
 
 @node Slave Gnusae
 @section gnus \e$B$r%9%l!<%V$K$9$k\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 04c77a7..da145e9 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1042,7 +1042,7 @@ your mail without bothering with the server at all, you can use the
 if you're in a hurry as well.  This command will not attempt to contact
 your primary server---instead, it will just activate all groups on level
 1 and 2.  (You should preferably keep no native groups on those two
-levels.)
+levels.) Also @pxref{Group Levels}.
 
 
 @node Slave Gnusae