(describe-variable): If var is local, mention default.

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)