summaryrefslogtreecommitdiff
path: root/lisp/help.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-02-01 09:29:40 +0000
committerRichard M. Stallman <rms@gnu.org>1995-02-01 09:29:40 +0000
commit83ead87a16c4d5bf2f5171a8c8fa90ab744bee0b (patch)
tree40f360c43119a7ed7ad485337ad0f42514038ba1 /lisp/help.el
parentb4428d883e0c00053ebf1317d6c9ec1220d05cd0 (diff)
downloademacs-83ead87a16c4d5bf2f5171a8c8fa90ab744bee0b.tar.gz
(describe-variable): If var is local, mention default.
Diffstat (limited to 'lisp/help.el')
-rw-r--r--lisp/help.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/help.el b/lisp/help.el
index 2ad91584132..fb4815408e0 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -499,13 +499,19 @@ Returns the documentation as a string, also."
v (intern val)))))
(with-output-to-temp-buffer "*Help*"
(prin1 variable)
- (princ "'s value is ")
(if (not (boundp variable))
- (princ "void.")
+ (princ " is void")
+ (princ "'s value is ")
(prin1 (symbol-value variable)))
(terpri)
(if (local-variable-p variable)
- (princ (format "Local in buffer %s\n" (buffer-name))))
+ (progn
+ (princ (format "Local in buffer %s; " (buffer-name)))
+ (if (not (default-boundp variable))
+ (princ "globally void")
+ (princ "global value is ")
+ (prin1 (default-value variable)))
+ (terpri)))
(terpri)
(princ "Documentation:")
(terpri)