[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 90f4b24 52/57: Ensure char-before doesn't cause an error
From: |
Justin Burkett |
Subject: |
[elpa] master 90f4b24 52/57: Ensure char-before doesn't cause an error |
Date: |
Tue, 3 Nov 2020 14:32:26 -0500 (EST) |
branch: master
commit 90f4b242e1a402dddafccff09e8d161b12416f13
Author: Justin Burkett <justin@burkett.cc>
Commit: Justin Burkett <justin@burkett.cc>
Ensure char-before doesn't cause an error
It won't return a number when at the beginning of a buffer.
---
vdiff.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 32b2092..29c02a4 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -536,14 +536,16 @@ 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
- (unless (= (char-before (point-max)) ?\n)
+ (when (or (= (point-min) (point-max))
+ (/= (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
- (unless (= (char-before (point-max)) ?\n)
+ (when (or (= (point-min) (point-max))
+ (/= (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)))
@@ -551,7 +553,8 @@ POST-REFRESH-FUNCTION is called when the process finishes."
(with-current-buffer (nth 2 buffers)
(write-region nil nil tmp-c nil 'quietly)
;; ensure tmp file ends in newline
- (unless (= (char-before (point-max)) ?\n)
+ (when (or (= (point-min) (point-max))
+ (/= (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))))
@@ -1390,7 +1393,8 @@ immediately preceding line."
(let ((end (when (number-or-marker-p end)
(save-excursion
(goto-char end)
- (unless (= (char-before) ?\n)
+ (when (and (char-before)
+ (/= (char-before) ?\n))
(forward-line))
(point)))))
(if (and end (< end max)) end max)))
- [elpa] master e3f5370 37/57: Handle case where full line is not selected in selective send, (continued)
- [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
- [elpa] master 185e803 57/57: Merge commit '007e44be19d068fd6b49874b6e9b8df8b1f552bd', Justin Burkett, 2020/11/03
- [elpa] master 90f4b24 52/57: Ensure char-before doesn't cause an error,
Justin Burkett <=
- [elpa] master a1a82de 50/57: Merge pull request #25 from justbur/send-region, Justin Burkett, 2020/11/03
- [elpa] master 08437d5 48/57: Update gitignore, Justin Burkett, 2020/11/03
- [elpa] master 09e15fc 51/57: Announce selective sending of changes using the region in README, Justin Burkett, 2020/11/03
- [elpa] master 45923bb 41/57: Fix compiler warnings, Justin Burkett, 2020/11/03
- [elpa] master 745cc02 42/57: Add test for selective send, Justin Burkett, 2020/11/03
- [elpa] master fe10fb3 44/57: Cleanup some of the transmit addition/changes logic, Justin Burkett, 2020/11/03
- [elpa] master 835485b 13/57: Announce vdiff-diff-algorithm in README, Justin Burkett, 2020/11/03
- [elpa] master c0541ae 55/57: Update readme badges, Justin Burkett, 2020/11/03