procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ignore error after kill last file or hunk

Browse source 
* lisp/vc/diff-mode.el (diff-hunk-kill): Go to beginning of hunk before kill.
Ignore error after kill last hunk (Bug#25570).
(diff-file-kill): Idem.
This commit is contained in:
Tino Calancha 2017-02-02 22:27:18 +09:00
parent e280b94dcd
commit 01d87bf846
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/vc/diff-mode.el
View file

@ -671,7 +671,7 @@ If the prefix ARG is given, restrict the view to the current file instead."
(inhibit-read-only t))
(apply 'kill-region bounds)
(goto-char (car bounds))
(diff-beginning-of-hunk t)))
(ignore-errors (diff-beginning-of-hunk t))))
(defun diff-beginning-of-file-and-junk ()
"Go to the beginning of file-related diff-info.
@ -723,9 +723,10 @@ data such as \"Index: ...\" and such."
(defun diff-file-kill ()
"Kill current file's hunks."
(interactive)
(diff-beginning-of-hunk t)
(let ((inhibit-read-only t))
(apply 'kill-region (diff-bounds-of-file)))
(diff-beginning-of-hunk t))
(ignore-errors (diff-beginning-of-hunk t)))
(defun diff-kill-junk ()
"Kill spurious empty diffs."