summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/apropos.el15
1 files changed, 13 insertions, 2 deletions
diff --git a/lisp/apropos.el b/lisp/apropos.el
index ca9be2f36f8..68721eb05a8 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -649,8 +649,19 @@ thus be found in `load-history'."
(apropos-documentation-property
symbol 'widget-documentation t))
(when (facep symbol)
- (apropos-documentation-property
- symbol 'face-documentation t))
+ (let ((alias (get symbol 'face-alias)))
+ (if alias
+ (if (facep alias)
+ (format "%slias for the face `%s'."
+ (if (get symbol 'obsolete-face)
+ "Obsolete a"
+ "A")
+ alias)
+ ;; Never happens in practice because fails
+ ;; (facep symbol) test.
+ "(alias for undefined face)")
+ (apropos-documentation-property
+ symbol 'face-documentation t))))
(when (get symbol 'custom-group)
(apropos-documentation-property
symbol 'group-documentation t)))))