* lisp/emacs-lisp/eldoc.el (eldoc-highlight-function-argument):

Use font-lock-keyword-face for macros and special forms.

Fixes: debbugs:8345

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d5308875de606e070bb190d2f8130faa962c868..b1d1c1e7fd07327ec582e424f0280c590966faa9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-18  Michael Heerdegen  <michael_heerdegen@web.de>
+
+       * emacs-lisp/eldoc.el (eldoc-highlight-function-argument):
+       Use font-lock-keyword-face for macros and special forms (bug#8345).
+
 2013-02-17  Didier Verna  <didier@didierverna.net>
 
        * net/network-stream.el (network-stream-open-starttls):

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 0f01857381c2c7f32c0b3958b389454a65e35599..5a6b486dcd03d3d8daaa59a1e0fb100f0ce4c15b 100644 (file)
--- 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