Synch with Oort Gnus.

diff --git a/contrib/md5.el b/contrib/md5.el
index 94d65de..5720346 100644 (file)
--- a/contrib/md5.el
+++ b/contrib/md5.el
@@ -406,4 +406,4 @@ hash of a portion of OBJECT."
 
 (provide 'md5)
 
-;;; md5.el ends here ----------------------------------------------------------
+;;; md5.el ends here

diff --git a/contrib/vcard.el b/contrib/vcard.el
index 000da5e..22f032c 100644 (file)
--- a/contrib/vcard.el
+++ b/contrib/vcard.el
@@ -305,4 +305,4 @@ presentation buffer."
 
 (provide 'vcard)
 
-;;; vcard.el ends here.
+;;; vcard.el ends here

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17739d8..e090ffe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2001-07-10  Pavel Jan\e,Bm\e(Bk <Pavel@Janik.cz>
+
+       * gnus-logic.el, gnus-srvr.el, gnus-vm.el, nnheaderxm.el, nnoo.el:
+       Cleanup.
+
+2001-07-09 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-msg.el (gnus-bug): Erase buffer.
+
+       * nnfolder.el (nnfolder-possibly-change-group): Don't create group.
+
 2001-07-09 19:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-decode.el (mm-attachment-override-p): Fix typo.

diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el
index 03b1c1c..9d2c009 100644 (file)
--- a/lisp/gnus-logic.el
+++ b/lisp/gnus-logic.el
@@ -227,4 +227,4 @@
 
 (provide 'gnus-logic)
 
-;;; gnus-logic.el ends here.
+;;; gnus-logic.el ends here

diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index 729899a..8d573fb 100644 (file)
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -849,4 +849,4 @@ buffer.
 
 (provide 'gnus-srvr)
 
-;;; gnus-srvr.el ends here.
+;;; gnus-srvr.el ends here

diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el
index e0bf16e..fb0682c 100644 (file)
--- a/lisp/gnus-vm.el
+++ b/lisp/gnus-vm.el
@@ -164,4 +164,4 @@ save those articles instead."
 
 (provide 'gnus-vm)
 
-;;; gnus-vm.el ends here.
+;;; gnus-vm.el ends here

diff --git a/lisp/md5.el b/lisp/md5.el
index a246b1a..b143366 100644 (file)
--- a/lisp/md5.el
+++ b/lisp/md5.el
@@ -375,9 +375,9 @@ OBJECT is either a string or a buffer.
 Optional arguments START and END denote buffer positions for computing the
 hash of a portion of OBJECT.
 
-The optional CODING and NOERROR arguments are ignored.  They are only
-placeholders to ensure the compatibility with XEmacsen with file-coding or
-Mule support."
+The optional CODING and NOERROR arguments are ignored.  They are no
+more than placeholders to ensure the compatibility with XEmacsen with
+file-coding or Mule support."
   (let ((buffer nil))
     (unwind-protect
        (save-excursion
@@ -410,4 +410,4 @@ Mule support."
 
 (provide 'md5)
 
-;;; md5.el ends here ----------------------------------------------------------
+;;; md5.el ends here

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index db79bae..ce3c20b 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -638,18 +638,14 @@ deleted.  Point is left where the deleted region was."
     (setq nnfolder-current-buffer nil
          nnfolder-current-group nil))
   ;; Change group.
-  (when (and group
-            (not (equal group nnfolder-current-group)))
-    (let ((file-name-coding-system nnmail-pathname-coding-system)
-         (pathname-coding-system nnmail-pathname-coding-system))
-      (nnmail-activate 'nnfolder)
-      (when (and (not (assoc group nnfolder-group-alist))
-                (not (file-exists-p
-                      (nnfolder-group-pathname group))))
-       ;; The group doesn't exist, so we create a new entry for it.
-       (push (list group (cons 1 0)) nnfolder-group-alist)
-       (nnfolder-save-active nnfolder-group-alist nnfolder-active-file))
-
+  (let ((file-name-coding-system nnmail-pathname-coding-system)
+       (pathname-coding-system nnmail-pathname-coding-system))
+    (when (and group
+              (not (equal group nnfolder-current-group))
+              (progn
+                (nnmail-activate 'nnfolder)
+                (and (assoc group nnfolder-group-alist)
+                     (file-exists-p (nnfolder-group-pathname group)))))
       (if dont-check
          (setq nnfolder-current-group group
                nnfolder-current-buffer nil)

diff --git a/lisp/nnheaderxm.el b/lisp/nnheaderxm.el
index 22d44b5..06bce72 100644 (file)
--- a/lisp/nnheaderxm.el
+++ b/lisp/nnheaderxm.el
@@ -63,4 +63,4 @@
 
 (provide 'nnheaderxm)
 
-;;; nnheaderxm.el ends here.
+;;; nnheaderxm.el ends here

diff --git a/lisp/nnoo.el b/lisp/nnoo.el
index dc2fa31..dae2d14 100644 (file)
--- a/lisp/nnoo.el
+++ b/lisp/nnoo.el
@@ -320,4 +320,4 @@ All functions will return nil and report an error."
 
 (provide 'nnoo)
 
-;;; nnoo.el ends here.
+;;; nnoo.el ends here

diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index baf57a0..0b97298 100644 (file)
--- a/lisp/nnshimbun.el
+++ b/lisp/nnshimbun.el
@@ -801,4 +801,5 @@ and the NOV is open.  The optional fourth argument FORCE is ignored."
 
 
 (provide 'nnshimbun)
-;;; nnshimbun.el ends here.
+
+;;; nnshimbun.el ends here