# HG changeset patch # User Chong Yidong # Date 1149603451 0 # Node ID 3798a822991e689ac0e61c5492d95a6032ea2d7e # Parent 3071d2ae462407c6e694cfc44e7a3da064a2beb9 * diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk) (diff-refine-hunk): Set inhibit-read-only to t. diff -r 3071d2ae4624 -r 3798a822991e lisp/ChangeLog --- a/lisp/ChangeLog Tue Jun 06 14:06:13 2006 +0000 +++ b/lisp/ChangeLog Tue Jun 06 14:17:31 2006 +0000 @@ -2,6 +2,8 @@ * diff-mode.el (diff-mode): Set buffer-read-only to t when diff-default-read-only is non-nill. + (diff-hunk-kill, diff-file-kill, diff-split-hunk) + (diff-refine-hunk): Set inhibit-read-only to t. * diff.el (diff-sentinel, diff): Set inhibit-read-only to t when modifying the *Diff* buffer. diff -r 3071d2ae4624 -r 3798a822991e lisp/diff-mode.el --- a/lisp/diff-mode.el Tue Jun 06 14:06:13 2006 +0000 +++ b/lisp/diff-mode.el Tue Jun 06 14:17:31 2006 +0000 @@ -438,7 +438,8 @@ (firsthunk (ignore-errors (goto-char start) (diff-beginning-of-file) (diff-hunk-next) (point))) - (nextfile (ignore-errors (diff-file-next) (point)))) + (nextfile (ignore-errors (diff-file-next) (point))) + (inhibit-read-only t)) (goto-char start) (if (and firsthunk (= firsthunk start) (or (null nexthunk) @@ -457,7 +458,8 @@ (ignore-errors (diff-hunk-prev) (point)))) (index (save-excursion - (re-search-backward "^Index: " prevhunk t)))) + (re-search-backward "^Index: " prevhunk t))) + (inhibit-read-only t)) (when index (setq start index)) (diff-end-of-file) (if (looking-at "^\n") (forward-char 1)) ;`tla' generates such diffs. @@ -497,7 +499,8 @@ (let* ((start1 (string-to-number (match-string 1))) (start2 (string-to-number (match-string 2))) (newstart1 (+ start1 (diff-count-matches "^[- \t]" (point) pos))) - (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos)))) + (newstart2 (+ start2 (diff-count-matches "^[+ \t]" (point) pos))) + (inhibit-read-only t)) (goto-char pos) ;; Hopefully the after-change-function will not screw us over. (insert "@@ -" (number-to-string newstart1) ",1 +" @@ -1354,6 +1357,7 @@ (file1 (make-temp-file "diff1")) (file2 (make-temp-file "diff2")) (coding-system-for-read buffer-file-coding-system) + (inhibit-read-only t) old new) (unwind-protect (save-excursion