aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-06-15 03:12:05 +0200
committerJuanma Barranquero2013-06-15 03:12:05 +0200
commit05e7ce903731c7d79b14f6687ee365693e4dff49 (patch)
tree8f4e0f0403976dcf1a9f8e1e7c23da6164eec6d6
parent12e5e86e89a667a64e2e2b14bc66739339c2cf57 (diff)
downloademacs-05e7ce903731c7d79b14f6687ee365693e4dff49.tar.gz
emacs-05e7ce903731c7d79b14f6687ee365693e4dff49.zip
lisp/help-fns.el (describe-variable): Add extra line for permanent-local vars.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help-fns.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 783cd2d864b..f45fbd3f5e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-06-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * help-fns.el (describe-variable):
4 Add extra line for permanent-local variables.
5
12013-06-15 Simen Heggestøyl <simenheg@ifi.uio.no> (tiny change) 62013-06-15 Simen Heggestøyl <simenheg@ifi.uio.no> (tiny change)
2 7
3 * progmodes/scheme.el (scheme-font-lock-keywords-2): 8 * progmodes/scheme.el (scheme-font-lock-keywords-2):
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 86bb67e87c2..52aa0517fa8 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -875,8 +875,10 @@ it is displayed along with the global value."
875 (princ "buffer-local when set.\n")) 875 (princ "buffer-local when set.\n"))
876 ((not permanent-local)) 876 ((not permanent-local))
877 ((bufferp locus) 877 ((bufferp locus)
878 (setq extra-line t)
878 (princ " This variable's buffer-local value is permanent.\n")) 879 (princ " This variable's buffer-local value is permanent.\n"))
879 (t 880 (t
881 (setq extra-line t)
880 (princ " This variable's value is permanent \ 882 (princ " This variable's value is permanent \
881if it is given a local binding.\n"))) 883if it is given a local binding.\n")))
882 884