[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107813: gnus-art.el (article-wash-html): Fix non-ASCII characters when washing HTML (bug#7410).

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107813
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-04-11 22:31:16 +0000
message:
  gnus-art.el (article-wash-html): Fix non-ASCII characters when washing HTML 
(bug#7410).
  gnus-msg.el (gnus-inews-insert-gcc): Protect against when we don't have a 
group name.
  gnus-start.el (gnus-read-newsrc-el-file): Protect against broken .newsrc.el 
files.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el
  lisp/gnus/gnus-msg.el
  lisp/gnus/gnus-start.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-03-23 11:22:21 +0000
+++ b/lisp/gnus/ChangeLog       2012-04-11 22:31:16 +0000
@@ -1,3 +1,16 @@
+2012-04-10  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-msg.el (gnus-inews-insert-gcc): Protect against when we don't
+       have a group name.
+
+       * gnus-art.el (article-wash-html): Ensure that we insert the HTML into
+       a multibyte buffer (bug#7410).
+       (article-wash-html): Parse the original article buffer to get the
+       unencoded data (bug#7410).
+
+       * gnus-start.el (gnus-read-newsrc-el-file): Protect against broken
+       .newsrc.el files.
+
 2012-03-22  Lars Magne Ingebrigtsen  <address@hidden>
 
        * auth-source.el (auth-source-netrc-create): Quote tokens that contain

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2012-02-12 22:20:48 +0000
+++ b/lisp/gnus/gnus-art.el     2012-04-11 22:31:16 +0000
@@ -2754,9 +2754,11 @@
   (let ((handles nil)
        (buffer-read-only nil))
     (when (gnus-buffer-live-p gnus-original-article-buffer)
-      (setq handles (mm-dissect-buffer t t)))
+      (with-current-buffer gnus-original-article-buffer
+       (setq handles (mm-dissect-buffer t t))))
     (article-goto-body)
     (delete-region (point) (point-max))
+    (mm-enable-multibyte)
     (mm-inline-text-html handles)))
 
 (defvar gnus-article-browse-html-temp-list nil

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2012-03-14 22:15:04 +0000
+++ b/lisp/gnus/gnus-msg.el     2012-04-11 22:31:16 +0000
@@ -1670,11 +1670,13 @@
                        (not
                         (setq result
                               (cond
-                               ((stringp (caar var))
+                               ((and group
+                                     (stringp (caar var)))
                                 ;; Regexp.
                                 (when (string-match (caar var) group)
                                   (cdar var)))
-                               ((functionp (car var))
+                               ((and group
+                                     (functionp (car var)))
                                 ;; Function.
                                 (funcall (car var) group))
                                (t

=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el   2012-02-16 14:33:58 +0000
+++ b/lisp/gnus/gnus-start.el   2012-04-11 22:31:16 +0000
@@ -2442,7 +2442,9 @@
        (when gnus-newsrc-assoc
          (setq gnus-newsrc-alist gnus-newsrc-assoc))))
     (dolist (elem gnus-newsrc-alist)
-      (setcar elem (mm-string-as-unibyte (car elem))))
+      ;; Protect against broken .newsrc.el files.
+      (when (car elem)
+       (setcar elem (mm-string-as-unibyte (car elem)))))
     (gnus-make-hashtable-from-newsrc-alist)
     (when (file-newer-than-file-p file ding-file)
       ;; Old format quick file