diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-02-10 17:50:45 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-02-10 17:50:45 -0800 |
| commit | 97a1cd9d27e7d95263b475d03ce39c20a2ff4512 (patch) | |
| tree | 6ccbcec387797f9e1407c19169d7d4747a741784 /lisp/tutorial.el | |
| parent | c57b2d76277b678431d2926a542003e1275927a9 (diff) | |
| download | emacs-97a1cd9d27e7d95263b475d03ce39c20a2ff4512.tar.gz | |
Add `enable-dir-local-variables'
* 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
Diffstat (limited to 'lisp/tutorial.el')
| -rw-r--r-- | lisp/tutorial.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el index 011461119fc..39eb9e8b9aa 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -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))) |