[Emacs-diffs] /srv/bzr/emacs/trunk r104767: * lisp/help-fns.el (describe-variable): Fix message for terminal-local vars.

[Stefan Monnier]

------------------------------------------------------------
revno: 104767
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-06-27 17:39:03 -0400
message:
  * lisp/help-fns.el (describe-variable): Fix message for terminal-local vars.
modified:
  lisp/ChangeLog
  lisp/help-fns.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-27 21:30:37 +0000
+++ b/lisp/ChangeLog    2011-06-27 21:39:03 +0000
@@ -1,3 +1,7 @@
+2011-06-27  Stefan Monnier  <address@hidden>
+
+       * help-fns.el (describe-variable): Fix message for terminal-local vars.
+
 2011-06-27  Katsumi Yamaoka  <address@hidden>
 
        * net/ange-ftp.el: Allow loading .gz files (Bug#6923).

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2011-06-01 19:32:04 +0000
+++ b/lisp/help-fns.el  2011-06-27 21:39:03 +0000
@@ -731,12 +731,18 @@
                          (delete-region (1- from) from)))))))
            (terpri)
            (when locus
-             (if (bufferp locus)
-                 (princ (format "%socal in buffer %s; "
-                                (if (get variable 'permanent-local)
-                                    "Permanently l" "L")
-                                (buffer-name)))
-               (princ (format "It is a frame-local variable; ")))
+             (cond
+               ((bufferp locus)
+                (princ (format "%socal in buffer %s; "
+                               (if (get variable 'permanent-local)
+                                   "Permanently l" "L")
+                               (buffer-name))))
+               ((framep locus)
+                (princ (format "It is a frame-local variable; ")))
+               ((terminal-live-p locus)
+                (princ (format "It is a terminal-local variable; ")))
+               (t
+                (princ (format "It is local to %S" locus))))
              (if (not (default-boundp variable))
                  (princ "globally void")
                (let ((val (default-value variable)))