Merge from trunk.

1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 80d8f287cb1..b512700f5b9 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -832,6 +832,8 @@ Run the Viper tutorial? "))
               (insert-file-contents (tutorial--saved-file))
               (let ((enable-local-variables :safe))
                 (hack-local-variables))
+              ;; FIXME?  What we actually want is to ignore dir-locals (?).
+              (setq buffer-read-only nil) ; bug#11118
               (goto-char (point-min))
               (setq old-tut-point
                     (string-to-number
@@ -849,6 +851,8 @@ Run the Viper tutorial? "))
           (insert-file-contents (expand-file-name filename tutorial-directory))
           (let ((enable-local-variables :safe))
             (hack-local-variables))
+          ;; FIXME?  What we actually want is to ignore dir-locals (?).
+          (setq buffer-read-only nil) ; bug#11118
           (forward-line)
           (setq tutorial--point-before-chkeys (point-marker)))