[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 3d0678f 142/258: Make bitmaps nicer
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 3d0678f 142/258: Make bitmaps nicer |
Date: |
Wed, 17 May 2017 08:13:39 -0400 (EDT) |
branch: scratch/add-vdiff
commit 3d0678fda689d016ada17058271a05cda1922915
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Make bitmaps nicer
---
vdiff.el | 43 +++++++++++++++++++++++++------------------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index f888074..d9e2d69 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -585,7 +585,28 @@ of a \"word\"."
(interactive)
(vdiff-refine-all-hunks "w"))
-;; * Add overlays
+;; * Bitmaps
+
+(define-fringe-bitmap
+ 'vdiff--vertical-bar
+ (make-vector (frame-char-height) #b00100000)
+ nil 8 'center)
+
+(define-fringe-bitmap
+ 'vdiff--top-left-angle
+ (vconcat
+ [#b00111111]
+ (make-vector (1- (frame-char-height))
+ #b00100000))
+ nil 8 'bottom)
+
+(define-fringe-bitmap
+ 'vdiff--bottom-left-angle
+ (vconcat
+ (make-vector (1- (frame-char-height))
+ #b00100000)
+ [#b00111111])
+ nil 8 'top)
(define-fringe-bitmap
'vdiff--insertion-arrow
@@ -600,6 +621,8 @@ of a \"word\"."
#b10001111]
nil 8 'top)
+;; * Add overlays
+
(defun vdiff--make-subtraction-string (n-lines)
(let* ((width (1- (vdiff--min-window-width)))
(win-height (window-height))
@@ -1128,22 +1151,6 @@ buffer)."
vdiff--after-change-refresh-delay
nil #'vdiff-refresh))))
-(defvar vdiff--bottom-left-angle-bits
- (let ((vec (make-vector 13 (+ (expt 2 7) (expt 2 6)))))
- (aset vec 11 (1- (expt 2 8)))
- (aset vec 12 (1- (expt 2 8)))
- vec))
-
-(define-fringe-bitmap 'vdiff--bottom-left-angle vdiff--bottom-left-angle-bits)
-
-(defvar vdiff--top-left-angle-bits
- (let ((vec (make-vector 13 (+ (expt 2 7) (expt 2 6)))))
- (aset vec 0 (1- (expt 2 8)))
- (aset vec 1 (1- (expt 2 8)))
- vec))
-
-(define-fringe-bitmap 'vdiff--top-left-angle vdiff--top-left-angle-bits)
-
(defun vdiff--set-open-fold-props (ovr)
"Set overlay properties to open fold OVR."
(overlay-put ovr 'vdiff-fold-open t)
@@ -1154,7 +1161,7 @@ buffer)."
" " 'display '(left-fringe vdiff--top-left-angle)))
(overlay-put ovr 'line-prefix
(propertize
- " " 'display '(left-fringe vertical-bar)))
+ " " 'display '(left-fringe vdiff--vertical-bar)))
(overlay-put ovr 'after-string
(propertize
" " 'display '(left-fringe vdiff--bottom-left-angle))))
- [elpa] scratch/add-vdiff e6e87f3 019/258: Add screenshot, (continued)
- [elpa] scratch/add-vdiff e6e87f3 019/258: Add screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d77dd83 032/258: Take care to only remove vdiff overlays on refresh, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f915562 047/258: Use customizable function to format closed fold strings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d8a4efb 023/258: Remove unused variable, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 23b3360 030/258: Fix compiler warnings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff eeede0b 045/258: Reset open-fold-face, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 96258b1 046/258: Don't set open fold face, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff dc7a5e2 049/258: Add a comment on line-map structure, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e9d0cc7 050/258: Define new bitmaps for open and close of folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1c8dd1e 138/258: Default to nil for auto refinement, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3d0678f 142/258: Make bitmaps nicer,
Justin Burkett <=
- [elpa] scratch/add-vdiff 53ee239 149/258: Fix bug in receive changes for 3way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e171b7c 140/258: Depend on hydra, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff baed24a 148/258: Work on moving refresh to 3way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 74ebab6 143/258: Don't move point when closing all folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 938cc55 155/258: Fix use of delq (wanted remq), Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0cbaf6f 156/258: Fix point jumping after receive-changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8f7a212 157/258: Remove with-other-window and sync-line, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c2627f0 160/258: Fix recenter-all, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 78071df 147/258: Use a separate minor-mode for 3way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a373c6b 139/258: Fix line endings in README, Justin Burkett, 2017/05/17