* vc/diff-mode.el (diff-mode): Tiny change re diff-default-read-only

Only allow diff-default-read-only to set buffer-read-only to t, never to nil.

Fixes: debbugs:15938

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2321854e5453e133516b21ab38d283afe1fb0f18..ede723e6d6b44e89ee7171f46d6154873aa60e67 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-23  Ivan Shmakov  <ivan@siamics.net>  (tiny change)
 
+       * vc/diff-mode.el (diff-mode): Only allow diff-default-read-only
+       to set buffer-read-only to t, never to nil.  (Bug#15938)
+
        * textmodes/tex-mode.el (latex-noindent-environments):
        Add safe-local-variable property.  (Bug#15936)
 

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index e945d6ef160992511036f68e7e8e38194f7a5dda..0bf0b05c7d57b9300ecb18556d64675caed9732e 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1366,7 +1366,8 @@ a diff with \\[diff-reverse-direction].
 
   (diff-setup-whitespace)
 
-  (setq buffer-read-only diff-default-read-only)
+  (if diff-default-read-only
+      (setq buffer-read-only t))
   ;; setup change hooks
   (if (not diff-update-on-the-fly)
       (add-hook 'write-contents-functions 'diff-write-contents-hooks nil t)