emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r115196: * vc/diff-mode.el (diff-mode): Tiny change


From: Glenn Morris
Subject: [Emacs-diffs] trunk r115196: * vc/diff-mode.el (diff-mode): Tiny change re diff-default-read-only
Date: Sat, 23 Nov 2013 02:55:24 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 115196
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15938
author: Ivan Shmakov <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-22 18:55:17 -0800
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/diff-mode.el           
diffmode.el-20091113204419-o5vbwnq5f7feedwu-1659
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-23 02:46:20 +0000
+++ b/lisp/ChangeLog    2013-11-23 02:55:17 +0000
@@ -1,5 +1,8 @@
 2013-11-23  Ivan Shmakov  <address@hidden>  (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)
 

=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el      2013-03-23 17:43:18 +0000
+++ b/lisp/vc/diff-mode.el      2013-11-23 02:55:17 +0000
@@ -1366,7 +1366,8 @@
 
   (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)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]