From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 6 Jun 2006 14:17:31 +0000 (+0000)
Subject: * diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
X-Git-Tag: emacs-pretest-22.0.90~2048
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd24cb375fc84ea98e672da58b5ba814ef8ba472;p=emacs.git

* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)
	(diff-refine-hunk): Set inhibit-read-only to t.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0dc4bdbba45..2aedcbc3280 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index f78ce1ae155..7ea02352b0b 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -438,7 +438,8 @@ If the prefix ARG is given, restrict the view to the current file instead."
 	 (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 @@ If the prefix ARG is given, restrict the view to the current file instead."
 		     (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 @@ If the prefix ARG is given, restrict the view to the current file instead."
     (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 @@ For use in `add-log-current-defun-function'."
 	 (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