summaryrefslogtreecommitdiff
path: root/lisp/help-fns.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-06-27 17:39:03 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2011-06-27 17:39:03 -0400
commite2b551c50e6444892055652b0ba6f3f4f96917f7 (patch)
treea38988f5962ca1a6b342c2b8874e7191759a695a /lisp/help-fns.el
parent8982b23153305ada35825abfb6bbf0e9e3c9e985 (diff)
downloademacs-e2b551c50e6444892055652b0ba6f3f4f96917f7.tar.gz
* lisp/help-fns.el (describe-variable): Fix message for terminal-local vars.
Diffstat (limited to 'lisp/help-fns.el')
-rw-r--r--lisp/help-fns.el18
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 1cd62c1dfa4..b13e6a77d5d 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -731,12 +731,18 @@ it is displayed along with the global value."
(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)))