From: tsuchiya <tsuchiya>
Date: Sun, 28 May 2000 07:03:33 +0000 (+0000)
Subject: (nnshimbun-request-article-1): Fix to insert x-face unless SERVER.
X-Git-Tag: t-gnus-6_14_4-03~3
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1da452efe48395cac225a7935e4fc31a2762649f;p=elisp%2Fgnus.git-

(nnshimbun-request-article-1): Fix to insert x-face unless SERVER.
(nnshimbun-asahi-get-headers): Fix for subjects which contain ^M.
---

diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index ed60a93..71a9e8d 100644
--- a/lisp/nnshimbun.el
+++ b/lisp/nnshimbun.el
@@ -295,7 +295,9 @@
 			   (and (nnheader-find-nov-line article)
 				(nnheader-parse-nov))))
 	(let* ((xref (substring (mail-header-xref header) 6))
-	       (x-faces (cdr (or (assoc server nnshimbun-x-face-alist)
+	       (x-faces (cdr (or (assoc (or server
+					    (nnoo-current-server 'nnshimbun))
+					nnshimbun-x-face-alist)
 				 (assoc "default" nnshimbun-x-face-alist))))
 	       (x-face (cdr (or (assoc group x-faces)
 				(assoc "default" x-faces)))))
@@ -785,7 +787,7 @@ is enclosed by at least one regexp grouping construct."
 				(buffer-substring
 				 (match-end 0)
 				 (progn (search-forward "<br>" nil t) (point)))
-				"<[^>]+>")
+				"\\(<[^>]+>\\|\r\\)")
 			       ""))
 		   nnshimbun-from-address
 		   "" id "" 0 0 (concat nnshimbun-url url))