From 1da452efe48395cac225a7935e4fc31a2762649f Mon Sep 17 00:00:00 2001 From: tsuchiya Date: Sun, 28 May 2000 07:03:33 +0000 Subject: [PATCH] (nnshimbun-request-article-1): Fix to insert x-face unless SERVER. (nnshimbun-asahi-get-headers): Fix for subjects which contain ^M. --- lisp/nnshimbun.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 "
" nil t) (point))) - "<[^>]+>") + "\\(<[^>]+>\\|\r\\)") "")) nnshimbun-from-address "" id "" 0 0 (concat nnshimbun-url url)) -- 1.7.10.4