[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 69eacfe 18/57: Fix and simplify final newline detection
From: |
Justin Burkett |
Subject: |
[elpa] master 69eacfe 18/57: Fix and simplify final newline detection |
Date: |
Tue, 3 Nov 2020 14:32:20 -0500 (EST) |
branch: master
commit 69eacfee0eb675ce667d46cc82f1ab679cb9b76f
Author: Justin Burkett <justin@burkett.cc>
Commit: Justin Burkett <justin@burkett.cc>
Fix and simplify final newline detection
Issue warning if no newline is found.
---
vdiff.el | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index d8cf976..85a3b58 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -529,25 +529,25 @@ POST-REFRESH-FUNCTION is called when the process
finishes."
(with-current-buffer (car buffers)
(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))))
+ (unless (= (char-before (point-max)) ?\n)
+ (message "vdiff: Warning %s does not end in a newline."
+ (if buffer-file-name buffer-file-name (buffer-name)))
+ (write-region "\n" nil tmp-a t 'quietly)))
(with-current-buffer (cadr buffers)
(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))))
+ (unless (= (char-before (point-max)) ?\n)
+ (message "vdiff: Warning %s does not end in a newline."
+ (if buffer-file-name buffer-file-name (buffer-name)))
+ (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)
;; 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)))))
+ (unless (= (char-before (point-max)) ?\n)
+ (message "vdiff: Warning %s does not end in a newline."
+ (if buffer-file-name buffer-file-name (buffer-name)))
+ (write-region "\n" nil tmp-c t 'quietly))))
(when proc
(kill-process proc))
(with-current-buffer (get-buffer-create proc-buf)
- [elpa] master 110d672 12/57: Cleanup diff parsing function, (continued)
- [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
- [elpa] master 69eacfe 18/57: Fix and simplify final newline detection,
Justin Burkett <=
- [elpa] master 68d6ea3 23/57: Make name of vdiff-test consistent with prefixes, Justin Burkett, 2020/11/03
- [elpa] master e3f5370 37/57: Handle case where full line is not selected in selective send, Justin Burkett, 2020/11/03
- [elpa] master 6c3731a 40/57: Fixup vdiff--transmit-change for 3way diffs, Justin Burkett, 2020/11/03
- [elpa] master ef899b8 46/57: Reset truncate-lines on cleanup, Justin Burkett, 2020/11/03
- [elpa] master c5e0cb0 47/57: Update gitignore, Justin Burkett, 2020/11/03
- [elpa] master 5b643c7 24/57: Add another send/receive test, Justin Burkett, 2020/11/03
- [elpa] master 4cc1ee5 35/57: Allow sending selective regions from additions, Justin Burkett, 2020/11/03
- [elpa] master 02309fc 38/57: Retain buffer identities in line maps, Justin Burkett, 2020/11/03
- [elpa] master 71b6f40 43/57: Bound target lines in vdiff--transmit-changes, Justin Burkett, 2020/11/03
- [elpa] master 0efde18 49/57: Improve behavior with respect to region selection, Justin Burkett, 2020/11/03