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

diff --git a/lisp/help.el b/lisp/help.el
index 2ad915841328502c768c57a84ba2510b9f6e55f7..fb4815408e0948f247d12bc4cee65b4de6d74583 100644 (file)
--- 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)