diff options
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? ")) | |||
| 829 | (progn | 829 | (progn |
| 830 | (insert-file-contents (tutorial--saved-file)) | 830 | (insert-file-contents (tutorial--saved-file)) |
| 831 | (let ((enable-local-variables :safe) | 831 | (let ((enable-local-variables :safe) |
| 832 | (enable-local-eval nil)) | 832 | (enable-local-eval nil) |
| 833 | (enable-dir-local-variables nil)) ; bug#11127 | ||
| 833 | (hack-local-variables)) | 834 | (hack-local-variables)) |
| 834 | ;; FIXME? What we actually want is to ignore dir-locals (?). | ||
| 835 | (setq buffer-read-only nil) ; bug#11118 | ||
| 836 | (goto-char (point-min)) | 835 | (goto-char (point-min)) |
| 837 | (setq old-tut-point | 836 | (setq old-tut-point |
| 838 | (string-to-number | 837 | (string-to-number |
| @@ -849,10 +848,9 @@ Run the Viper tutorial? ")) | |||
| 849 | (setq tutorial--point-before-chkeys (point-marker))) | 848 | (setq tutorial--point-before-chkeys (point-marker))) |
| 850 | (insert-file-contents (expand-file-name filename tutorial-directory)) | 849 | (insert-file-contents (expand-file-name filename tutorial-directory)) |
| 851 | (let ((enable-local-variables :safe) | 850 | (let ((enable-local-variables :safe) |
| 852 | (enable-local-eval nil)) | 851 | (enable-local-eval nil) |
| 852 | (enable-dir-local-variables nil)) ; bug#11127 | ||
| 853 | (hack-local-variables)) | 853 | (hack-local-variables)) |
| 854 | ;; FIXME? What we actually want is to ignore dir-locals (?). | ||
| 855 | (setq buffer-read-only nil) ; bug#11118 | ||
| 856 | (forward-line) | 854 | (forward-line) |
| 857 | (setq tutorial--point-before-chkeys (point-marker))) | 855 | (setq tutorial--point-before-chkeys (point-marker))) |
| 858 | 856 | ||