From f15763b11022918ca401963ecc22adbd0c4ff6d2 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Sun, 2 Mar 2003 02:55:59 +0000
Subject: [PATCH] Synch to Oort Gnus.

---
 lisp/ChangeLog   |   33 +++++++++++++++++++++++++++++++++
 lisp/gnus-art.el |   15 +++++++--------
 lisp/message.el  |    3 ++-
 lisp/mm-view.el  |    3 ++-
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd74aca..e4fe4f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2003-03-01  Jesper Harder  <harder@ifa.au.dk>
+
+	* gnus-art.el (gnus-article-refer-article): Be more permissive.
+
+2003-03-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* spam.el: Fix typo.
+
+2003-03-01  Satyaki Das  <satyaki@theforce.stanford.edu>
+	(Trivial patch.)
+
+	* pgg-gpg.el (pgg-gpg-process-region): Insert process status into
+	errors-buffer. This produces a nicer error message in case of
+	problems.
+	
+2003-03-01  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-maybe-spam-stat-load, spam-maybe-spam-stat-load):
+	load stats iff spam-use-stat is on
+
+	* spam.el: add spam-maybe-spam-stat-load to gnus-startup hook,
+	also use spam-maybe-spam-stat-load and spam-maybe-spam-stat-save
+	instead of spam-stat-load and spam-stat-save in the
+	gnus-get-new-news-hook and gnus-save-newsrc-hook, respectively
+
+2003-03-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-view.el (mm-inline-text): Ignore errors from enriched-decode.
+
+2003-03-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* message.el (message-make-fqdn): Protect against nil user-mail. 
+
 2003-02-28  Vasily Korytov <deskpot@myrealbox.com>
 
 	* gnus-art.el (gnus-boring-article-headers): New values:
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 9482842..87ea9ce 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5199,14 +5199,13 @@ not have a face in `gnus-article-boring-faces'."
   "Read article specified by message-id around point."
   (interactive)
   (save-excursion
-    (re-search-backward "<?news:\\|<" (gnus-point-at-bol) t)
-    (cond ((re-search-forward
-	    gnus-button-mid-or-mail-regexp (gnus-point-at-eol) t)
-	    (let ((msg-id (concat "<" (match-string 0) ">")))
-	      (set-buffer gnus-summary-buffer)
-	      (gnus-summary-refer-article msg-id)))
-	  (t
-	    (error "No references around point")))))
+    (re-search-backward "[ \t]\\|^" (gnus-point-at-bol) t)
+    (re-search-forward "<?news:<?\\|<" (gnus-point-at-eol) t)
+    (if (re-search-forward "[^@ ]+@[^ \t>]+" (gnus-point-at-eol) t)
+	(let ((msg-id (concat "<" (match-string 0) ">")))
+	  (set-buffer gnus-summary-buffer)
+	  (gnus-summary-refer-article msg-id))
+      (error "No references around point"))))
 
 (defun gnus-article-show-summary ()
   "Reconfigure windows to show summary buffer."
diff --git a/lisp/message.el b/lisp/message.el
index d5f9a62..aad4d54 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5132,7 +5132,8 @@ give as trustworthy answer as possible."
   (let* ((system-name (system-name))
 	 (user-mail (message-user-mail-address))
 	 (user-domain
-	  (if (string-match "@\\(.*\\)\\'" user-mail)
+	  (if (and user-mail
+		   (string-match "@\\(.*\\)\\'" user-mail))
 	      (match-string 1 user-mail))))
     (cond
      ((and message-user-fqdn
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index d5e5dc3..cb1dd37 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -369,7 +369,8 @@ map.")))
       (set-text-properties (point-min) (point-max) nil)
       (when (or (equal type "enriched")
 		(equal type "richtext"))
-	(enriched-decode (point-min) (point-max)))
+	(ignore-errors
+	  (enriched-decode (point-min) (point-max))))
       (mm-handle-set-undisplayer
        handle
        `(lambda ()
-- 
1.7.10.4