procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add `enable-dir-local-variables'

Browse source 
* lisp/files.el (enable-dir-local-variables): New variable.
(hack-dir-local-variables): Respect enable-dir-local-variables.

* lisp/tutorial.el (help-with-tutorial): Ignore directory-local variables.

Fixes: debbugs:11127
This commit is contained in:
Glenn Morris 2013-02-10 17:50:45 -08:00
parent c57b2d7627
commit 97a1cd9d27
4 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/tutorial.el
View file

@ -829,10 +829,9 @@ Run the Viper tutorial? "))
(progn
(insert-file-contents (tutorial--saved-file))
(let ((enable-local-variables :safe)
(enable-local-eval nil))
(enable-local-eval nil)
(enable-dir-local-variables nil)) ; bug#11127
(hack-local-variables))
;; FIXME? What we actually want is to ignore dir-locals (?).
(setq buffer-read-only nil) ; bug#11118
(goto-char (point-min))
(setq old-tut-point
(string-to-number
@ -849,10 +848,9 @@ Run the Viper tutorial? "))
(setq tutorial--point-before-chkeys (point-marker)))
(insert-file-contents (expand-file-name filename tutorial-directory))
(let ((enable-local-variables :safe)
(enable-local-eval nil))
(enable-local-eval nil)
(enable-dir-local-variables nil)) ; bug#11127
(hack-local-variables))
;; FIXME? What we actually want is to ignore dir-locals (?).
(setq buffer-read-only nil) ; bug#11118
(forward-line)
(setq tutorial--point-before-chkeys (point-marker)))