Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4abf466..cd30ce0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2001-01-16  Simon Josefsson  <simon@josefsson.org>
+
+       * message.el (message-make-in-reply-to): Add comment to message-id
+       (old syntax, see 2000-08-02 change).
+
+2001-01-16 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (gnus-url-mailto): Use gnus-msg-mail.
+       (gnus-button-mailto): Setup message. Moved to gnus-msg.el.
+       (gnus-button-reply): Ditto.
+
+2001-01-16  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * gnus-art.el (article-display-x-face): Fix.
+
 2001-01-15 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-art.el (article-display-x-face): Use

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index c51540f..2872d70 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -48,6 +48,10 @@
   (require 'mm-uu)
   )
 
+(autoload 'gnus-msg-mail "gnus-msg" nil t)
+(autoload 'gnus-button-mailto "gnus-msg")
+(autoload 'gnus-button-reply "gnus-msg" nil t)
+
 (defgroup gnus-article nil
   "Article display."
   :link '(custom-manual "(gnus)The Article Buffer")
@@ -1703,13 +1707,26 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")."
       (delete-process "article-x-face"))
     (let ((inhibit-point-motion-hooks t)
          (case-fold-search t)
+         (x-faces "")
          from last)
-;;      (if (gnus-buffer-live-p gnus-original-article-buffer)
-;;       (set-buffer gnus-original-article-buffer))
+      (when (gnus-buffer-live-p gnus-original-article-buffer)
+       (with-current-buffer gnus-original-article-buffer
+         (save-restriction
+           (article-narrow-to-head)
+           (while (re-search-forward "^X-Face:" nil t)
+             (setq x-faces
+                   (concat
+                    x-faces
+                    (buffer-substring (match-beginning 0)
+                                      (1- (re-search-forward
+                                           "^\\($\\|[^ \t]\\)" nil t)))))))))
       (save-restriction
        (article-narrow-to-head)
-       (goto-char (point-min))
        (setq from (message-fetch-field "from"))
+       (when (gnus-buffer-live-p gnus-original-article-buffer)
+         (message-remove-header "X-Face")
+         (goto-char (point-min))
+         (insert x-faces))
        (goto-char (point-min))
        (while (and gnus-article-x-face-command
                    (not last)
@@ -1720,7 +1737,7 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")."
                             (not (string-match gnus-article-x-face-too-ugly
                                                from))))
                    ;; Has to be present.
-                   (re-search-forward "^X-Face:[ \t]*" nil t))
+                   (re-search-forward "^X-Face:[\t ]*" nil t))
          ;; This used to try to do multiple faces (`while' instead of
          ;; `when' above), but (a) sending multiple EOFs to xv doesn't
          ;; work (b) it can crash some versions of Emacs (c) are
@@ -5502,25 +5519,17 @@ forbidden in URL encoding."
       (setq to (gnus-url-unhex-string url)))
     (setq args (cons (list "to" to) args)
           subject (cdr-safe (assoc "subject" args)))
-    (gnus-setup-message 'reply
-      (message-mail)
-      (while args
-       (setq func (intern-soft (concat "message-goto-" (downcase (caar args)))))
-       (if (fboundp func)
-           (funcall func)
-         (message-position-on-field (caar args)))
-       (insert (mapconcat 'identity (cdar args) ", "))
-       (setq args (cdr args)))
-      (if subject
-         (message-goto-body)
-       (message-goto-subject)))))
-
-(defun gnus-button-mailto (address)
-  "Mail to ADDRESS."
-  (set-buffer (gnus-copy-article-buffer))
-  (message-reply address))
-
-(defalias 'gnus-button-reply 'message-reply)
+    (gnus-msg-mail)
+    (while args
+      (setq func (intern-soft (concat "message-goto-" (downcase (caar args)))))
+      (if (fboundp func)
+          (funcall func)
+        (message-position-on-field (caar args)))
+      (insert (mapconcat 'identity (cdar args) ", "))
+      (setq args (cdr args)))
+    (if subject
+        (message-goto-body)
+      (message-goto-subject))))
 
 (defun gnus-button-embedded-url (address)
   "Activate ADDRESS with `browse-url'."

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index c9ea406..1d59c5d 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -278,6 +278,20 @@ Gcc: header for archiving purposes."
   t)
 
 ;;;###autoload
+(defun gnus-button-mailto (address)
+  "Mail to ADDRESS."
+  (set-buffer (gnus-copy-article-buffer))
+  (gnus-setup-message 'message
+    (message-reply address)))
+
+;;;###autoload
+(defun gnus-button-reply (&optional to-address wide)
+  "Like `message-reply'."
+  (interactive)
+  (gnus-setup-message 'message
+    (message-reply to-address wide)))
+
+;;;###autoload
 (define-mail-user-agent 'gnus-user-agent
   'gnus-msg-mail 'message-send-and-exit
   'message-kill-buffer 'message-send-hook)

diff --git a/lisp/message.el b/lisp/message.el
index 3f50cb5..64976bf 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3940,11 +3940,11 @@ If NOW, use that time instead."
 (defun message-make-in-reply-to ()
   "Return the In-Reply-To header for this message."
   (when message-reply-headers
-    (let ((mid (mail-header-message-id message-reply-headers))
-         (from (mail-header-from message-reply-headers))
-         (date (mail-header-date message-reply-headers)))
-      (when mid
-       (concat mid
+    (let ((from (mail-header-from message-reply-headers))
+         (date (mail-header-date message-reply-headers))
+         (msg-id (mail-header-message-id message-reply-headers)))
+      (when msg-id
+       (concat msg-id
                (when from
                  (let ((pair (std11-extract-address-components from)))
                    (concat "\n ("

diff --git a/texi/ChangeLog b/texi/ChangeLog
index c0ad7dd..b6a0f74 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-16  Jesper Harder <harder@ifa.au.dk>
+
+       * gnus.texi (Group Line Specification): Add.
+
 2001-01-15 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus.texi (Using GPG): Doc fix.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index f2a2fc7..62817cd 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1798,6 +1798,10 @@ Gnus \e$B$N5/F0$K@.8y$7$?8e$K!"0lHV:G8e$K<B9T$5$l$k%U%C%/$G$9!#\e(B
 \e$B$=$N%0%k!<%W$K:G6a?7Ce%a!<%k$,FO$$$F$$$k>l9g\e(B
 \e$B$O\e(B @samp{%} (@code{gnus-new-mail-mark})\e$B!#\e(B
 
+@item p
+@samp{#} (@code{gnus-process-mark}) \e$B$G!"$=$N%0%k!<%W$K%W%m%;%9%^!<%/$,IU\e(B
+\e$B$$$F$$$k$3$H$r<($7$^$9!#\e(B
+
 @item d
 \e$B:G8e$K$$$D$3$N%0%k!<%W$rFI$s$@$+$r<($9J8;zNs\e(B (@pxref{Group Timestamp})\e$B!#\e(B
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 20be195..7cceb33 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1733,6 +1733,9 @@ The default is 1---this will mean that group names like
 @samp{%} (@code{gnus-new-mail-mark}) if there has arrived new mail to
 the group lately.
 
+@item p
+@samp{#} (@code{gnus-process-mark}) if the group is process marked.
+
 @item d
 A string that says when you last read the group (@pxref{Group
 Timestamp}).