mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 12:40:49 -08:00
Code Issues Projects Releases Wiki Activity

(describe-variable): Add information about file-local and dir-local variables.

Browse source
This commit is contained in:
Juri Linkov 2009-07-19 16:56:22 +00:00
parent 8c8b01853d
commit 2ee20f24e8
2 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/ChangeLog
View file

@ -1,3 +1,18 @@
2009-07-19 Juri Linkov <juri@jurta.org>
* files.el (ignored-local-variables): Add `dir-local-variables-alist'.
(dir-local-variables-alist): New buffer-local variable.
(hack-local-variables-filter): If variable is not dir-local,
i.e. `dir-name' is nil, then remove it from `dir-local-variables-alist',
because file-local overrides dir-local.
(c-postprocess-file-styles)<declare-function>:
Remove obsolete declaration.
(hack-dir-local-variables): Add dir-local variable/value pair to
`dir-local-variables-alist' and remove duplicates. Doc fix.
* help-fns.el (describe-variable): Add information about
file-local and dir-local variables.
2009-07-19 Chong Yidong <cyd@stupidchicken.com>
* files.el (hack-local-variables-filter): Rewrite.

12
lisp/help-fns.el
View file

@ -710,6 +710,18 @@ it is displayed along with the global value."
(use (format ";\n use `%s' instead." (car obsolete)))
(t ".")))
(terpri))
(when (member (cons variable val) file-local-variables-alist)
(setq extra-line t)
(if (member (cons variable val) dir-local-variables-alist)
(let ((file (and (buffer-file-name)
(not (file-remote-p (buffer-file-name)))
(dir-locals-find-file (buffer-file-name)))))
(princ " This variable is a directory local variable")
(if file (princ (concat "\n from the file \"" file "\"")))
(princ ".\n"))
(princ " This variable is a file local variable.\n")))
(when safe-var
(setq extra-line t)
(princ " This variable is safe as a file local variable ")