Synch to No Gnus 200602082352.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1bf157c..e0ccf5b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2006-02-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * nnfolder.el (nnfolder-insert-newsgroup-line): Use
+       message-make-date instead of current-time-string.
+
+       * mm-view.el (mm-inline-message): Don't set gnus-newsgroup-charset
+       to gnus-decoded which mm-uu might set.
+
+2006-02-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * rfc2231.el (rfc2231-parse-string): Sort segmented parameters;
        don't decode quoted parameters; remove misimported Emacs code.
        Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 1d180bb..881b0d5 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -492,7 +492,8 @@
              ;; disable prepare hook
              gnus-article-prepare-hook
              (gnus-newsgroup-charset
-              (or charset gnus-newsgroup-charset)))
+              (unless (eq charset 'gnus-decoded) ;; mm-uu might set it.
+                (or charset gnus-newsgroup-charset))))
          (let ((gnus-original-article-buffer (mm-handle-buffer handle)))
            (run-hooks 'gnus-article-decode-hook))
          (gnus-article-prepare-display)

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 94262e2..dff3337 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -827,7 +827,7 @@ deleted.  Point is left where the deleted region was."
       (insert "\n"))
     (forward-char -1)
     (insert (format (concat nnfolder-article-marker "%d   %s\n")
-                   (cdr group-art) (current-time-string)))))
+                   (cdr group-art) (message-make-date)))))
 
 (defun nnfolder-active-number (group)
   ;; Find the next article number in GROUP.