[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 79b3434 052/258: Make some arg names more consi
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 79b3434 052/258: Make some arg names more consistent |
Date: |
Wed, 17 May 2017 08:13:21 -0400 (EDT) |
branch: scratch/add-vdiff
commit 79b34344ce91d7f331e87e7ad4372139ca6eaafa
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Make some arg names more consistent
---
vdiff.el | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 135436e..93d7aaf 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -328,30 +328,30 @@ text on the first line, and the width of the buffer."
;; * Add overlays
-(defun vdiff--make-subtraction-string (length)
+(defun vdiff--make-subtraction-string (n-lines)
(let (string)
- (dotimes (_ length)
+ (dotimes (_ n-lines)
(push (make-string (1- (vdiff--min-window-width)) ?-) string))
(propertize
(concat (mapconcat #'identity string "\n") "\n")
'face 'vdiff-subtraction-face)))
-(defun vdiff--add-subtraction-overlay (buffer start-line amount)
+(defun vdiff--add-subtraction-overlay (buffer start-line n-lines)
(with-current-buffer buffer
(vdiff--move-to-line start-line)
(let* ((ovr (make-overlay (point) (point))))
(overlay-put ovr 'before-string
- (vdiff--make-subtraction-string amount))
+ (vdiff--make-subtraction-string n-lines))
(overlay-put ovr 'vdiff-type 'subtraction)
(overlay-put ovr 'vdiff t)
ovr)))
(defun vdiff--add-change-overlay
- (buffer start-line lines &optional addition subtraction-padding)
+ (buffer start-line n-lines &optional addition n-subtraction-lines)
(with-current-buffer buffer
(vdiff--move-to-line start-line)
(let ((beg (point))
- (end (progn (forward-line lines)
+ (end (progn (forward-line n-lines)
(point))))
(let ((ovr (make-overlay beg end))
(type (if addition 'addition 'change))
@@ -359,16 +359,16 @@ text on the first line, and the width of the buffer."
(overlay-put ovr 'vdiff-type type)
(overlay-put ovr 'face face)
(overlay-put ovr 'vdiff t)
- (when subtraction-padding
+ (when n-subtraction-lines
(overlay-put ovr 'after-string
- (vdiff--make-subtraction-string subtraction-padding)))
+ (vdiff--make-subtraction-string n-subtraction-lines)))
ovr))))
-(defun vdiff-fold-string-default (lines first-line width)
+(defun vdiff-fold-string-default (n-lines first-line width)
"Produces default format line for closed folds. See
`vdiff-fold-string-function'."
(let ((first-line (string-trim-left first-line))
- (start (format "+--%d lines: " lines))
+ (start (format "+--%d lines: " n-lines))
(width (1- width)))
(if (> (+ 1 (length first-line) (length start)) width)
(concat start
- [elpa] scratch/add-vdiff 90374e7 223/258: vdiff-magit: Port dwim-show-on-hunks, (continued)
- [elpa] scratch/add-vdiff 90374e7 223/258: vdiff-magit: Port dwim-show-on-hunks, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 219d765 225/258: vdiff-magit: Simplify stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 05cbdee 227/258: vdiff: Allow buffers to be killed in quit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 98e1add 216/258: vdiff-magit: Port show-staged, show-unstaged and stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e5d3633 226/258: Revert "vdiff-magit: Simplify stage", Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff de84cfd 232/258: vdiff-magit: Fix a function reference in dwim, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7a3e456 234/258: vdiff-magit: Cleanup after stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 52d49ba 214/258: Merge branch 'magit' into magit2, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ff1fbc4 248/258: vdiff: Generate ancestor buffer in merge-conflict, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d243767 253/258: README: Add entry points and vimdiff bindings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 79b3434 052/258: Make some arg names more consistent,
Justin Burkett <=
- [elpa] scratch/add-vdiff 528a5ce 051/258: Simplify logic for sending/receiving changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c2f1ad9 068/258: Add vdiff-hydra.el, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e94d187 059/258: Simplify adding overlays, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4596948 081/258: Reduce load in vdiff--scroll-function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d65fcd7 083/258: Simplify commentary, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0777eda 099/258: Add vdiff-refresh binding to prefix map, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d46f686 094/258: Make README table narrower, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 803fd6d 098/258: Add subtraction style option, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5f2c72c 105/258: Change alignment algorithm, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f481a82 112/258: Add refresh timer delay, Justin Burkett, 2017/05/17