summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-msg.el
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2012-04-11 22:31:16 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-04-11 22:31:16 +0000
commitdc2ab667ae97f2194f5a258084e0dd96eb064bff (patch)
tree78468b098e5049cb027700a35ef6f99007cf23c5 /lisp/gnus/gnus-msg.el
parent4517fe3a47700373d03fb389ff038572a1144f5b (diff)
downloademacs-dc2ab667ae97f2194f5a258084e0dd96eb064bff.tar.gz
emacs-dc2ab667ae97f2194f5a258084e0dd96eb064bff.tar.bz2
emacs-dc2ab667ae97f2194f5a258084e0dd96eb064bff.zip
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.
Diffstat (limited to 'lisp/gnus/gnus-msg.el')
-rw-r--r--lisp/gnus/gnus-msg.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 500ace9e8ff..507f0406ea1 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -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