[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 5667bc6 16/57: Ensure input files to diff end in newline
From: |
Justin Burkett |
Subject: |
[elpa] master 5667bc6 16/57: Ensure input files to diff end in newline |
Date: |
Tue, 3 Nov 2020 14:32:19 -0500 (EST) |
branch: master
commit 5667bc6204086f129292122e6b1b08e9a93906a1
Author: Justin Burkett <justin@burkett.cc>
Commit: Justin Burkett <justin@burkett.cc>
Ensure input files to diff end in newline
---
vdiff.el | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 69bde38..0e71a38 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -522,12 +522,27 @@ POST-REFRESH-FUNCTION is called when the process
finishes."
(proc (get-buffer-process proc-buf)))
(setq vdiff--last-command cmd)
(with-current-buffer (car buffers)
- (write-region nil nil tmp-a nil 'quietly))
+ (write-region nil nil tmp-a nil 'quietly)
+ ;; ensure tmp file ends in newline
+ (save-excursion
+ (goto-char (point-max))
+ (unless (looking-at-p "\n")
+ (write-region "\n" nil tmp-a t 'quietly))))
(with-current-buffer (cadr buffers)
- (write-region nil nil tmp-b nil 'quietly))
+ (write-region nil nil tmp-b nil 'quietly)
+ ;; ensure tmp file ends in newline
+ (save-excursion
+ (goto-char (point-max))
+ (unless (looking-at-p "\n")
+ (write-region "\n" nil tmp-b t 'quietly))))
(when vdiff-3way-mode
(with-current-buffer (nth 2 buffers)
- (write-region nil nil tmp-c nil 'quietly)))
+ (write-region nil nil tmp-c nil 'quietly)
+ ;; ensure tmp file ends in newline
+ (save-excursion
+ (goto-char (point-max))
+ (unless (looking-at-p "\n")
+ (write-region "\n" nil tmp-c t 'quietly)))))
(when proc
(kill-process proc))
(with-current-buffer (get-buffer-create proc-buf)
- [elpa] master 348d1a7 27/57: Add after-quit arg to vdiff-test-with-buffers, (continued)
- [elpa] master 348d1a7 27/57: Add after-quit arg to vdiff-test-with-buffers, Justin Burkett, 2020/11/03
- [elpa] master fd6ec8e 25/57: Test that both buffers are correct by default, Justin Burkett, 2020/11/03
- [elpa] master 45666cc 30/57: README: evil-collection adds vimdiff-like bindings, Justin Burkett, 2020/11/03
- [elpa] master 6878093 33/57: Add vdiff-toggle-fold and vdiff-toggle-all-folds, Justin Burkett, 2020/11/03
- [elpa] master ccc773b 39/57: Add optional to-buffer arg to vdiff--translate line, Justin Burkett, 2020/11/03
- [elpa] master 58d530b 53/57: Add vdiff-temp-files, Justin Burkett, 2020/11/03
- [elpa] master c732247 45/57: Reset truncate-lines on cleanup, Justin Burkett, 2020/11/03
- [elpa] master 61d29bb 54/57: Travis -> github workflow, Justin Burkett, 2020/11/03
- [elpa] master eb553fa 09/57: Add support for different diff algorithms, Justin Burkett, 2020/11/03
- [elpa] master 8f3fa10 15/57: Fix Makefile typo, Justin Burkett, 2020/11/03
- [elpa] master 5667bc6 16/57: Ensure input files to diff end in newline,
Justin Burkett <=
- [elpa] master 110d672 12/57: Cleanup diff parsing function, Justin Burkett, 2020/11/03
- [elpa] master bd8976e 26/57: Add movement and setup tests, Justin Burkett, 2020/11/03
- [elpa] master 40ffc92 29/57: Warn on bad initialization of vdiff session., Justin Burkett, 2020/11/03
- [elpa] master 0e10521 31/57: Merge pull request #20 from edkolev/patch-1, Justin Burkett, 2020/11/03
- [elpa] master f2a622f 34/57: Improve vdiff-toggle-fold, Justin Burkett, 2020/11/03
- [elpa] master 45f7019 19/57: Add basic send and receive tests, Justin Burkett, 2020/11/03
- [elpa] master 773e3eb 28/57: Fix compiler warnings, Justin Burkett, 2020/11/03
- [elpa] master 3bfb5de 32/57: Truncate long lines by default, Justin Burkett, 2020/11/03
- [elpa] master c806fe2 36/57: Allow selective sending in change hunks, Justin Burkett, 2020/11/03
- [elpa] master 007e44b 56/57: Version 0.2.4, Justin Burkett, 2020/11/03