diff options
| author | Kenichi Handa | 2012-08-16 21:25:17 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-16 21:25:17 +0900 |
| commit | d75ffb4ed0b2e72a9361a07d16a5c884a9459728 (patch) | |
| tree | 8ac5a6a8ae033fef7fbc7fb7b09a703ef4b0ed5b /lisp/tutorial.el | |
| parent | 69c41c4070c86baac11a627e9c3d366420aeb7cc (diff) | |
| parent | 250c8ab9b8f6322959fa3122db83944c30c3894b (diff) | |
| download | emacs-d75ffb4ed0b2e72a9361a07d16a5c884a9459728.tar.gz emacs-d75ffb4ed0b2e72a9361a07d16a5c884a9459728.zip | |
merge trunk
Diffstat (limited to 'lisp/tutorial.el')
| -rw-r--r-- | lisp/tutorial.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el index e0e2a82fab9..64879e5cfd5 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el | |||
| @@ -829,7 +829,8 @@ Run the Viper tutorial? ")) | |||
| 829 | (if old-tut-file | 829 | (if old-tut-file |
| 830 | (progn | 830 | (progn |
| 831 | (insert-file-contents (tutorial--saved-file)) | 831 | (insert-file-contents (tutorial--saved-file)) |
| 832 | (let ((enable-local-variables :safe)) | 832 | (let ((enable-local-variables :safe) |
| 833 | (enable-local-eval nil)) | ||
| 833 | (hack-local-variables)) | 834 | (hack-local-variables)) |
| 834 | ;; FIXME? What we actually want is to ignore dir-locals (?). | 835 | ;; FIXME? What we actually want is to ignore dir-locals (?). |
| 835 | (setq buffer-read-only nil) ; bug#11118 | 836 | (setq buffer-read-only nil) ; bug#11118 |
| @@ -848,7 +849,8 @@ Run the Viper tutorial? ")) | |||
| 848 | (goto-char tutorial--point-before-chkeys) | 849 | (goto-char tutorial--point-before-chkeys) |
| 849 | (setq tutorial--point-before-chkeys (point-marker))) | 850 | (setq tutorial--point-before-chkeys (point-marker))) |
| 850 | (insert-file-contents (expand-file-name filename tutorial-directory)) | 851 | (insert-file-contents (expand-file-name filename tutorial-directory)) |
| 851 | (let ((enable-local-variables :safe)) | 852 | (let ((enable-local-variables :safe) |
| 853 | (enable-local-eval nil)) | ||
| 852 | (hack-local-variables)) | 854 | (hack-local-variables)) |
| 853 | ;; FIXME? What we actually want is to ignore dir-locals (?). | 855 | ;; FIXME? What we actually want is to ignore dir-locals (?). |
| 854 | (setq buffer-read-only nil) ; bug#11118 | 856 | (setq buffer-read-only nil) ; bug#11118 |