Merge from emacs--devo--0

[bpt/emacs.git] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 5bc83e0..fb44e53 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1395,6 +1395,7 @@ mouse."
            (window-dedicated-p (selected-window)))
        (pop-to-buffer (current-buffer))
       (switch-to-buffer "GNU Emacs"))
+    (setq buffer-read-only nil)
     (erase-buffer)
     (if pure-space-overflow
        (insert "\
@@ -1406,6 +1407,9 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
        (apply #'fancy-splash-insert text))
       (fancy-splash-tail)
       (set-buffer-modified-p nil)
+      (setq buffer-read-only t)
+      (if (and view-read-only (not view-mode))
+         (view-mode-enter nil 'kill-buffer))
       (goto-char (point-min)))))
 
 (defun fancy-splash-frame ()
@@ -1442,6 +1446,7 @@ we put it on this frame."
   (let ((prev-buffer (current-buffer)))
     (unwind-protect
        (with-current-buffer (get-buffer-create "GNU Emacs")
+         (setq buffer-read-only nil)
          (erase-buffer)
          (set (make-local-variable 'tab-width) 8)
          (if hide-on-input
@@ -1581,6 +1586,9 @@ Type \\[describe-distribution] for information on getting the latest version."))
 
           ;; Display the input that we set up in the buffer.
           (set-buffer-modified-p nil)
+         (setq buffer-read-only t)
+         (if (and view-read-only (not view-mode))
+             (view-mode-enter nil 'kill-buffer))
           (goto-char (point-min))
          (if (or (window-minibuffer-p)
                  (window-dedicated-p (selected-window)))