1 files changed, 11 insertions, 3 deletions
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 04a900f23c0..0a9578391e0 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -2846,9 +2846,17 @@ The following properties have special meanings for this widget:
     (if (and (fboundp symbol) (boundp symbol))
 	;; If there are two doc strings, give the user a way to pick one.
 	(apropos (concat "\\`" (regexp-quote string) "\\'"))
-      (if (fboundp symbol)
-	  (describe-function symbol)
-	(describe-variable symbol)))))
+      (cond
+       ((fboundp symbol)
+	(describe-function symbol))
+       ((facep symbol)
+	(describe-face symbol))
+       ((featurep symbol)
+	(describe-package symbol))
+       ((or (boundp symbol) (get symbol 'variable-documentation))
+	(describe-variable symbol))
+       (t
+	(message "No documentation available for %s" symbol))))))
 
 (defcustom widget-documentation-links t
   "Add hyperlinks to documentation strings when non-nil."