diff options
author | Tom Tromey <tromey@redhat.com> | 2013-03-08 11:57:29 -0700 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2013-03-08 11:57:29 -0700 |
commit | 71f91792e3013b397996905224f387da5cc539a9 (patch) | |
tree | 4c3d3ba909e76deea1cdf73b73fca67a57149465 /lisp/emacs-lisp/eldoc.el | |
parent | 6f4de085f065e11f4df3195d47479f28f5ef08ba (diff) | |
parent | b5426561089d39f18b42bed9dbfcb531f43ed562 (diff) | |
download | emacs-71f91792e3013b397996905224f387da5cc539a9.tar.gz emacs-71f91792e3013b397996905224f387da5cc539a9.tar.bz2 emacs-71f91792e3013b397996905224f387da5cc539a9.zip |
merge from trunk
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
-rw-r--r-- | lisp/emacs-lisp/eldoc.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 0f01857381c..5a6b486dcd0 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -356,7 +356,8 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'." (setq doc (copy-sequence args)) (add-text-properties start end (list 'face argument-face) doc)) (setq doc (eldoc-docstring-format-sym-doc - sym doc 'font-lock-function-name-face)) + sym doc (if (functionp sym) 'font-lock-function-name-face + 'font-lock-keyword-face))) doc))) ;; Return a string containing a brief (one-line) documentation string for |