Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f07d547..6ae1de5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,30 @@
+2001-09-07 Raja R Harinath  <harinath@cs.umn.edu>
+
+       * nnml.el (nnml-filenames-are-evil): New variable.
+       (nnml-article-to-file-alist): Rename to ...
+       (nnml-current-group-article-to-file-alist): ... this.  
+       Respect `nnml-filenames-are-evil'.
+       (nnml-active-number): Update.
+       (nnml-update-file-alist): Update.
+       (nnml-request-article): Use nnheader-article-to-file-alist.
+       (nnml-request-rename-group): Likewise.
+       
+2001-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-sum.el (gnus-summary-insert-line): Fix.
+       
+2001-09-06  Bj\e,Av\e(Brn Torkelsson  <torkel@acc.umu.se>
+
+       * gnus-sum.el: Bind g-s-t-s to "W g".
+       * gnus-sum.el (gnus-summary-make-menu-bar): Add g-s-t-s.
+       * gnus-sum.el (gnus-summary-toggle-smiley): New function. Toggles
+       display of graphical smilies.
+
+2001-09-07 02:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-start.el (gnus-setup-news): A typo.
+       From Bill White <billw@wolfram.com>.
+
 2001-09-06  Simon Josefsson  <jas@extundo.com>
 
        * gnus-sum.el (gnus-summary-insert-line): Insert forwarded, recent

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 85762a9..7c39e65 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -925,14 +925,14 @@ If LEVEL is non-nil, the news will be set up at level LEVEL."
     (when gnus-message-archive-method
       (unless (assoc "archive" gnus-server-alist)
        (push `("archive"
-               (nnfolder
-                "archive"
-                (nnfolder-directory
-                 ,(nnheader-concat message-directory "archive"))
-                (nnfolder-active-file
-                 ,(nnheader-concat message-directory "archive/active"))
-                (nnfolder-get-new-mail nil)
-                (nnfolder-inhibit-expiry t)))
+               nnfolder
+               "archive"
+               (nnfolder-directory
+                ,(nnheader-concat message-directory "archive"))
+               (nnfolder-active-file
+                ,(nnheader-concat message-directory "archive/active"))
+               (nnfolder-get-new-mail nil)
+               (nnfolder-inhibit-expiry t))
              gnus-server-alist)))
 
     ;; If we don't read the complete active file, we fill in the

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 81e739a..b0eba9c 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1716,6 +1716,7 @@ increase the score of each group you read."
     "l" gnus-summary-stop-page-breaking
     "r" gnus-summary-caesar-message
     "t" gnus-article-toggle-headers
+    "g" gnus-summary-toggle-smiley
     "v" gnus-summary-verbose-headers
     "m" gnus-summary-toggle-mime
     "a" gnus-article-strip-headers-in-body ;; mnemonic: wash archive
@@ -1897,7 +1898,7 @@ increase the score of each group you read."
              ["Toggle MIME" gnus-summary-toggle-mime t]
              ["Verbose header" gnus-summary-verbose-headers t]
              ["Toggle header" gnus-summary-toggle-header t]
-             ["Toggle smileys" gnus-smiley-display t]
+             ["Toggle smiley" gnus-summary-toggle-smiley t]
              ["Verify X-PGP-Sig" gnus-article-verify-x-pgp-sig t]
              ["HZ" gnus-article-decode-HZ t])
             ("Output"
@@ -8716,6 +8717,13 @@ groups."
   (execute-kbd-macro (concat (this-command-keys) key))
   (gnus-article-edit-done))
 
+(defun gnus-summary-toggle-smiley (&optional arg)
+  "Toggle the display of smilies as small graphical icons."
+  (interactive "P")
+  (save-excursion
+    (set-buffer gnus-article-buffer)
+    (gnus-smiley-display arg)))
+
 ;;; Respooling
 
 (defun gnus-summary-respool-query (&optional silent trace)

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 817ea15..a292c6b 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -86,6 +86,13 @@ marks file will be regenerated properly by Gnus.
 
 This variable is a virtual server slot.  See the Gnus manual for details.")
 
+(defvoo nnml-filenames-are-evil t
+  "If non-nil, Gnus will not assume that the articles file name 
+is the same as the article number listed in the nov database.  This 
+variable should be set if any of the files are compressed.
+
+This variable is a virtual server slot.  See the Gnus manual for details.")
+
 (defvoo nnml-prepare-save-mail-hook nil
   "Hook run narrowed to an article before saving.
 
@@ -204,7 +211,7 @@ This variable is a virtual server slot.  See the Gnus manual for details.")
        (when (and (setq group-num (nnml-find-group-number id))
                   (cdr
                    (assq (cdr group-num)
-                         (nnml-article-to-file-alist
+                         (nnheader-article-to-file-alist
                           (setq gpath
                                 (nnmail-group-pathname
                                  (car group-num)
@@ -484,7 +491,7 @@ This variable is a virtual server slot.  See the Gnus manual for details.")
       ;; We move the articles file by file instead of renaming
       ;; the directory -- there may be subgroups in this group.
       ;; One might be more clever, I guess.
-      (let ((files (nnml-article-to-file-alist old-dir)))
+      (let ((files (nnheader-article-to-file-alist old-dir)))
        (while files
          (rename-file
           (concat old-dir (cdar files))
@@ -679,7 +686,7 @@ This variable is a virtual server slot.  See the Gnus manual for details.")
       (unless nnml-article-file-alist
        (setq nnml-article-file-alist
              (sort
-              (nnml-article-to-file-alist nnml-current-directory)
+              (nnml-current-group-article-to-file-alist)
               'car-less-than-car)))
       (setq active
            (if nnml-article-file-alist
@@ -874,7 +881,7 @@ This variable is a virtual server slot.  See the Gnus manual for details.")
   (when (or (not nnml-article-file-alist)
            force)
     (setq nnml-article-file-alist
-         (nnml-article-to-file-alist nnml-current-directory))))
+         (nnml-current-group-article-to-file-alist))))
 
 (defun nnml-directory-articles (dir)
   "Return a list of all article files in a directory.
@@ -898,10 +905,12 @@ Use the nov database for that directory if available."
          (forward-line 1))
        list))))
 
-(defun nnml-article-to-file-alist (dir)
-  "Return an alist of article/file pairs in DIR.
-Use the nov database for that directory if available."
-  (if (or gnus-nov-is-evil nnml-nov-is-evil
+(defun nnml-current-group-article-to-file-alist ()
+  "Return an alist of article/file pairs in the current group.
+Use the nov database for the current group if available."
+  (if (or gnus-nov-is-evil 
+         nnml-nov-is-evil
+         nnml-filenames-are-evil
          (not (file-exists-p
                (expand-file-name nnml-nov-file-name
                                  nnml-current-directory))))