Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5e578a..b1ce117 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2001-01-08 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnmail.el (nnmail-get-new-mail): Find group only if file is not
+       orig-file. Use ,source.
+
+2001-01-08 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-xmas.el (gnus-xmas-modeline-glyph): 
+       (gnus-xmas-group-startup-message): 
+       Detect gnus-xmas-glyph-directory when it is nil.
+
 2001-01-08 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * pop3.el (pop3-get-message-count): Andrew Innes

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 84dc234..aeafe0d 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -45,6 +45,11 @@ automatically."
                 directory)
   :group 'gnus-xmas)
 
+(unless gnus-xmas-glyph-directory
+  (unless (setq gnus-xmas-glyph-directory 
+               (message-xmas-find-glyph-directory "gnus"))
+    (gnus-error 1 "Can't find glyph directory. Possibly the `etc' directory is not installed.")))
+
 ;;(format "%02x%02x%02x" 114 66 20) "724214"
 
 (defvar gnus-xmas-logo-color-alist
@@ -583,7 +588,6 @@ the resulting string may be narrower than END-COLUMN.
 (defun gnus-xmas-group-startup-message (&optional x y)
   "Insert startup message in current buffer."
   ;; Insert the message.
-  (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
   (erase-buffer)
   (cond
    ((and (console-on-window-system-p)
@@ -840,7 +844,6 @@ XEmacs compatibility workaround."
 
 (defvar gnus-xmas-modeline-glyph
   (progn
-    (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
     (let* ((file-xpm (expand-file-name "gnus-pointer.xpm"
                                       gnus-xmas-glyph-directory))
           (file-xbm (expand-file-name "gnus-pointer.xbm"

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 197866f..b40f1fe 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1583,7 +1583,9 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
                        (nnmail-split-incoming
                         file ',(intern (format "%s-save-mail" method))
                         ',spool-func
-                        (nnmail-get-split-group orig-file source)
+                        (if (equal file orig-file)
+                            nil
+                          (nnmail-get-split-group orig-file ,source))
                         ',(intern (format "%s-active-number" method))))))
          (incf total new)
          (incf i)))