aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-08-07 12:31:03 +0300
committerEli Zaretskii2010-08-07 12:31:03 +0300
commit822775bf513e1e4be07ef36f0220bf3b89c9ed76 (patch)
tree5176215b5ddf4d2e6e0e09cc7e372d0674ab1854
parent0e9c8657ca938bd3cdb90824873dff539801fdbe (diff)
downloademacs-822775bf513e1e4be07ef36f0220bf3b89c9ed76.tar.gz
emacs-822775bf513e1e4be07ef36f0220bf3b89c9ed76.zip
Evaluate file-local variables in tutorials.
tutorial.el (help-with-tutorial): Hack safe file-local variables after reading the tutorial.
-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 @@
12010-08-07 Eli Zaretskii <eliz@gnu.org>
2
3 * tutorial.el (help-with-tutorial): Hack safe file-local variables
4 after reading the tutorial.
5
12010-08-06 Alan Mackenzie <bug-cc-mode@gnu.org> 62010-08-06 Alan Mackenzie <bug-cc-mode@gnu.org>
2 7
3 * progmodes/cc-cmds.el (c-mask-paragraph, c-fill-paragraph): Fix 8 * 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? "))
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))
833 (hack-local-variables))
832 (goto-char (point-min)) 834 (goto-char (point-min))
833 (setq old-tut-point 835 (setq old-tut-point
834 (string-to-number 836 (string-to-number
@@ -844,6 +846,8 @@ Run the Viper tutorial? "))
844 (goto-char tutorial--point-before-chkeys) 846 (goto-char tutorial--point-before-chkeys)
845 (setq tutorial--point-before-chkeys (point-marker))) 847 (setq tutorial--point-before-chkeys (point-marker)))
846 (insert-file-contents (expand-file-name filename tutorial-directory)) 848 (insert-file-contents (expand-file-name filename tutorial-directory))
849 (let ((enable-local-variables :safe))
850 (hack-local-variables))
847 (forward-line) 851 (forward-line)
848 (setq tutorial--point-before-chkeys (point-marker))) 852 (setq tutorial--point-before-chkeys (point-marker)))
849 853