]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/vc/diff-mode.el (diff-hunk-text): Handle better "\ No newline at end".
authorJuri Linkov <juri@linkov.net>
Thu, 20 May 2021 18:23:01 +0000 (21:23 +0300)
committerJuri Linkov <juri@linkov.net>
Thu, 20 May 2021 18:23:01 +0000 (21:23 +0300)
lisp/vc/diff-mode.el

index 2c72c45f4b2d5b786a5776db3cdcc54dea7dda94..4118a2ea06c13c0cc5ae75c5f0acc692adad7a78 100644 (file)
@@ -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)))))