summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/eldoc.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d5308875d..b1d1c1e7fd 100644
--- 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 0f01857381..5a6b486dcd 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