Commit 01d87bf8 authored by Tino Calancha's avatar Tino Calancha

Ignore error after kill last file or hunk

* 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.
parent e280b94d
......@@ -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."
(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."
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment