Commit 2ee20f24 authored by Juri Linkov's avatar Juri Linkov
Browse files

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

parent 8c8b0185
2009-07-19 Juri Linkov <>
* 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.
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 <>
* files.el (hack-local-variables-filter): Rewrite.
......@@ -710,6 +710,18 @@ it is displayed along with the global value."
(use (format ";\n use `%s' instead." (car obsolete)))
(t ".")))
(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 ")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment