diff options
| author | Juri Linkov <juri@linkov.net> | 2021-05-20 21:23:01 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2021-05-20 21:23:01 +0300 |
| commit | 9be9d1f94ed6506f5b9659dfb40e5b5d8cdb3310 (patch) | |
| tree | ae91fbc6e02a15bd9252ef9874945a579f24bed6 /lisp/vc/diff-mode.el | |
| parent | ef7a6eec20a59b338e18aea4f8a805dcfc8dfc96 (diff) | |
| download | emacs-9be9d1f94ed6506f5b9659dfb40e5b5d8cdb3310.tar.gz emacs-9be9d1f94ed6506f5b9659dfb40e5b5d8cdb3310.tar.bz2 emacs-9be9d1f94ed6506f5b9659dfb40e5b5d8cdb3310.zip | |
* lisp/vc/diff-mode.el (diff-hunk-text): Handle better "\ No newline at end".
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 2c72c45f4b2..4118a2ea06c 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1771,7 +1771,14 @@ char-offset in TEXT." (goto-char (point-min)) (while (not (eobp)) (if (memq (char-after) kill-chars) - (delete-region (point) (progn (forward-line 1) (point))) + (delete-region + ;; Check for "\ No newline at end of file" + (if (and (eq (char-after) ?\\) + (save-excursion + (forward-line 1) (eobp))) + (1- (point)) + (point)) + (progn (forward-line 1) (point))) (delete-char num-pfx-chars) (forward-line 1))))) |