* lisp/progmodes/elisp-mode.el (elisp-context-menu): Improve menu items.

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 04311985c171926a8109a8d7e86230c070d9d4a0..d082db5f02f5bc3d0692abc3760c8cdf751046cf 100644 (file)
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -169,9 +169,19 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
            (symbol (when (stringp string) (intern string)))
            (title (cond
                    ((not (symbolp symbol)) nil)
-                   ((fboundp symbol) "Function")
-                   ((and (boundp symbol) (not (keywordp symbol))) "Variable")
-                   ((facep symbol) "Face"))))
+                   ((and (facep symbol) (not (fboundp symbol)))
+                    "Face")
+                   ((and (fboundp symbol) (boundp symbol)
+                         (memq symbol minor-mode-list))
+                    "Mode")
+                   ((and (fboundp symbol)
+                         (not (or (boundp symbol) (facep symbol))))
+                    "Function")
+                   ((and (boundp symbol)
+                         (not (or (fboundp symbol) (facep symbol))))
+                    "Variable")
+                   ((or (fboundp symbol) (boundp symbol) (facep symbol))
+                    "Symbol"))))
       (when title
         (define-key-after menu [describe-symbol]
           `(menu-item (format "Describe %s" ,title)