Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com

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? "))
         (if old-tut-file
             (progn
               (insert-file-contents (tutorial--saved-file))
-              (let ((enable-local-variables :safe))
+              (let ((enable-local-variables :safe)
+                    (enable-local-eval nil))
                 (hack-local-variables))
               ;; FIXME?  What we actually want is to ignore dir-locals (?).
               (setq buffer-read-only nil) ; bug#11118
@@ -848,7 +849,8 @@ Run the Viper tutorial? "))
               (goto-char tutorial--point-before-chkeys)
               (setq tutorial--point-before-chkeys (point-marker)))
           (insert-file-contents (expand-file-name filename tutorial-directory))
-          (let ((enable-local-variables :safe))
+          (let ((enable-local-variables :safe)
+                (enable-local-eval nil))
             (hack-local-variables))
           ;; FIXME?  What we actually want is to ignore dir-locals (?).
           (setq buffer-read-only nil) ; bug#11118