summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/tutorial.el4
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cfe12d0019..3dd552bb927 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-07 Eli Zaretskii <eliz@gnu.org>
+
+ * tutorial.el (help-with-tutorial): Hack safe file-local variables
+ after reading the tutorial.
+
2010-08-06 Alan Mackenzie <bug-cc-mode@gnu.org>
* progmodes/cc-cmds.el (c-mask-paragraph, c-fill-paragraph): Fix
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 0ac315ac6dc..bab943968f8 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -829,6 +829,8 @@ Run the Viper tutorial? "))
(if old-tut-file
(progn
(insert-file-contents (tutorial--saved-file))
+ (let ((enable-local-variables :safe))
+ (hack-local-variables))
(goto-char (point-min))
(setq old-tut-point
(string-to-number
@@ -844,6 +846,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))
+ (hack-local-variables))
(forward-line)
(setq tutorial--point-before-chkeys (point-marker)))