mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

* diff-mode.el (diff-hunk-kill, diff-file-kill, diff-split-hunk)

Browse source 
(diff-refine-hunk): Set inhibit-read-only to t.
This commit is contained in:
Chong Yidong 2006-06-06 14:17:31 +00:00
parent 53dd481c3f
commit dd24cb375f
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -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.

10
lisp/diff-mode.el
View file

@ -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