From fc695b1a110691ba478888816fcef6dc8ed1260b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 28 Dec 2004 13:49:57 +0000 Subject: [PATCH] Synch to No Gnus 200412281349. --- lisp/ChangeLog | 4 ++++ lisp/nnrss.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 081244c..13edcf5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2004-12-28 Katsumi Yamaoka + + * nnrss.el (nnrss-get-encoding): Fix regexp. + 2004-12-27 Simon Josefsson * mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used diff --git a/lisp/nnrss.el b/lisp/nnrss.el index 171126b..77fdd82 100644 --- a/lisp/nnrss.el +++ b/lisp/nnrss.el @@ -311,7 +311,7 @@ The return value will be `html' or `text'." (goto-char (point-min)) (mm-coding-system-p (if (re-search-forward - "<\\?[^>]*encoding=\\(?:\"\\([^>]+\\)\"\\|'\\([^>]+\\)'\\)" + "<\\?[^>]*encoding=\\(?:\"\\([^\">]+\\)\"\\|'\\([^'>]+\\)'\\)" nil t) (intern-soft (downcase (or (match-string-no-properties 1) (match-string-no-properties 2)))) -- 1.7.10.4