emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 9be9d1f: * lisp/vc/diff-mode.el (diff-hunk-text): Handle better "


From: Juri Linkov
Subject: master 9be9d1f: * lisp/vc/diff-mode.el (diff-hunk-text): Handle better "\ No newline at end".
Date: Thu, 20 May 2021 14:23:17 -0400 (EDT)

branch: master
commit 9be9d1f94ed6506f5b9659dfb40e5b5d8cdb3310
Author: Juri Linkov <juri@linkov.net>
Commit: Juri Linkov <juri@linkov.net>

    * lisp/vc/diff-mode.el (diff-hunk-text): Handle better "\ No newline at 
end".
---
 lisp/vc/diff-mode.el | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 2c72c45..4118a2e 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)))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]