aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-10-04 12:14:03 -0700
committerGlenn Morris2014-10-04 12:14:03 -0700
commit9ed4c74e8bb6dc1da8ded4667b770de8f24b587d (patch)
tree4ddf53a3b92f96d55cb8258613530cc10bb06965
parent8d035a693645bd0dfd0222ad7781e3aaeba9499e (diff)
downloademacs-9ed4c74e8bb6dc1da8ded4667b770de8f24b587d.tar.gz
emacs-9ed4c74e8bb6dc1da8ded4667b770de8f24b587d.zip
* apropos.el (apropos-symbols-internal): Avoid error with non-symbol properties.
Fixes: debbugs:18337
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/apropos.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e3be6ce9aa..9af5186375e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-10-04 Glenn Morris <rgm@gnu.org> 12014-10-04 Glenn Morris <rgm@gnu.org>
2 2
3 * apropos.el (apropos-symbols-internal):
4 Avoid error with non-symbol properties. (Bug#18337#16)
5
3 * startup.el (command-line): 6 * startup.el (command-line):
4 Handle altered user-emacs-directory in load-path warning. (Bug#18512) 7 Handle altered user-emacs-directory in load-path warning. (Bug#18512)
5 8
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 2cba65e9559..ac76ce26b41 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -718,7 +718,7 @@ the output includes key-bindings of commands."
718 (setq doc (list (car properties))) 718 (setq doc (list (car properties)))
719 (while (setq properties (cdr (cdr properties))) 719 (while (setq properties (cdr (cdr properties)))
720 (setq doc (cons (car properties) doc))) 720 (setq doc (cons (car properties) doc)))
721 (mapconcat #'symbol-name (nreverse doc) " ")) 721 (mapconcat (lambda (p) (format "%s" p)) (nreverse doc) " "))
722 (when (get symbol 'widget-type) 722 (when (get symbol 'widget-type)
723 (apropos-documentation-property 723 (apropos-documentation-property
724 symbol 'widget-documentation t)) 724 symbol 'widget-documentation t))