procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gnus-art.el (article-wash-html): Fix non-ASCII characters when washing HTML (bug#7410).

Browse source 
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.
This commit is contained in:
Lars Magne Ingebrigtsen 2012-04-11 22:31:16 +00:00 • committed by Katsumi Yamaoka
parent 4517fe3a47
commit dc2ab667ae
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/gnus/ChangeLog
View file

@ -1,3 +1,16 @@
2012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
* 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 <larsi@gnus.org>
* auth-source.el (auth-source-netrc-create): Quote tokens that contain

4
lisp/gnus/gnus-art.el
View file

@ -2754,9 +2754,11 @@ If READ-CHARSET, ask for a coding system."
(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

6
lisp/gnus/gnus-msg.el
View file

@ -1670,11 +1670,13 @@ this is a reply."
(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

4
lisp/gnus/gnus-start.el
View file

@ -2442,7 +2442,9 @@ If FORCE is non-nil, the .newsrc file is read."
(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