From: Glenn Morris Date: Sat, 4 Oct 2014 19:14:03 +0000 (-0700) Subject: * apropos.el (apropos-symbols-internal): Avoid error with non-symbol properties. X-Git-Tag: emacs-25.0.90~2635^2~679^2~130 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ed4c74e8bb6dc1da8ded4667b770de8f24b587d;p=emacs.git * apropos.el (apropos-symbols-internal): Avoid error with non-symbol properties. Fixes: debbugs:18337 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e3be6ce9aa..9af5186375e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-10-04 Glenn Morris + * apropos.el (apropos-symbols-internal): + Avoid error with non-symbol properties. (Bug#18337#16) + * startup.el (command-line): Handle altered user-emacs-directory in load-path warning. (Bug#18512) 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." (setq doc (list (car properties))) (while (setq properties (cdr (cdr properties))) (setq doc (cons (car properties) doc))) - (mapconcat #'symbol-name (nreverse doc) " ")) + (mapconcat (lambda (p) (format "%s" p)) (nreverse doc) " ")) (when (get symbol 'widget-type) (apropos-documentation-property symbol 'widget-documentation t))