From e1b01c7fedfe8b481eb45ec64786981e1cc50264 Mon Sep 17 00:00:00 2001 From: Ivan Shmakov Date: Fri, 22 Nov 2013 18:55:17 -0800 Subject: [PATCH] * 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 --- lisp/ChangeLog | 3 +++ lisp/vc/diff-mode.el | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2321854e545..ede723e6d6b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-11-23 Ivan Shmakov (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 e945d6ef160..0bf0b05c7d5 100644 --- 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) -- 2.39.2