aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2010-08-30 23:40:10 +0000
committerKatsumi Yamaoka2010-08-30 23:40:10 +0000
commit0be02d8a41dae178ba6d8c80a4839fa02f3ec4d8 (patch)
treebdbcf00db5b9d143f127ce2606d33ec09787a509
parenta3e01263b117b9f82b4c8d1e2e22f40b5112a749 (diff)
downloademacs-0be02d8a41dae178ba6d8c80a4839fa02f3ec4d8.tar.gz
emacs-0be02d8a41dae178ba6d8c80a4839fa02f3ec4d8.zip
Protect against not having completion-styles bound by Lars Magne Ingebrigtsen <larsi@gnus.org>.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/gnus-group.el3
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f2af7b2614f..991a9910e7f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,11 @@
12010-08-30 Lars Magne Ingebrigtsen <larsi@gnus.org> 12010-08-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * gnus-group.el (gnus-group-completing-read): Protect against not
4 having completion-styles bound.
5
6 * mml.el (mml-insert-mime-headers-always): Change the default to t, to
7 make broken recipients happier.
8
3 * gnus-html.el (gnus-html-put-image): Use gnus-put-image. 9 * gnus-html.el (gnus-html-put-image): Use gnus-put-image.
4 10
5 * gnus-ems.el (gnus-put-image): Have gnus-put-image take an optional 11 * gnus-ems.el (gnus-put-image): Have gnus-put-image take an optional
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index f9f97071eb5..adab5650dc3 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2202,7 +2202,8 @@ be permanent."
2202The arguments are the same as `completing-read' except that COLLECTION 2202The arguments are the same as `completing-read' except that COLLECTION
2203and HIST default to `gnus-active-hashtb' and `gnus-group-history' 2203and HIST default to `gnus-active-hashtb' and `gnus-group-history'
2204respectively if they are omitted." 2204respectively if they are omitted."
2205 (let ((completion-styles completion-styles) 2205 (let ((completion-styles (and (boundp 'completion-styles)
2206 completion-styles))
2206 group) 2207 group)
2207 (push 'substring completion-styles) 2208 (push 'substring completion-styles)
2208 (mapatoms (lambda (symbol) 2209 (mapatoms (lambda (symbol)