From: Stefan Monnier Date: Mon, 27 Jun 2011 21:39:03 +0000 (-0400) Subject: * lisp/help-fns.el (describe-variable): Fix message for terminal-local vars. X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~356 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2b551c50e6444892055652b0ba6f3f4f96917f7;p=emacs.git * lisp/help-fns.el (describe-variable): Fix message for terminal-local vars. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 170939cfc4b..c13fe48a730 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-06-27 Stefan Monnier + + * help-fns.el (describe-variable): Fix message for terminal-local vars. + 2011-06-27 Katsumi Yamaoka * net/ange-ftp.el: Allow loading .gz files (Bug#6923). 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)))