[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 192dbfe 166/258: Release vdiff-buffers3
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 192dbfe 166/258: Release vdiff-buffers3 |
Date: |
Wed, 17 May 2017 08:13:44 -0400 (EDT) |
branch: scratch/add-vdiff
commit 192dbfe67c9a03c9f3c5bb0e430df43292f46f79
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Release vdiff-buffers3
---
vdiff.el | 58 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 6e7d4d7..f054b17 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -259,8 +259,8 @@ because those are handled differently.")
(list ovr)))
other-ovrs)))
;; FIXME: Doesn't quite send correctly
- ;; (unless just-one
- ;; (push (cons "all" other-ovrs) choices))
+ (unless just-one
+ (push (cons "all" other-ovrs) choices))
(cdr-safe
(assoc-string
(completing-read "Choose a target buffer(s): "
@@ -1515,33 +1515,33 @@ asked to select two buffers."
(set-window-buffer (split-window-vertically) buffer-c)
(set-window-buffer (split-window-horizontally) buffer-b))
-;; ;;;###autoload
-;; (defun vdiff-buffers3 (buffer-a buffer-b buffer-c)
-;; "Start a vdiff session. If called interactively, you will be
-;; asked to select two buffers."
-;; (interactive
-;; (let* ((buffer-a
-;; (get-buffer
-;; (read-buffer
-;; "Buffer A: " (current-buffer))))
-;; (buffer-b
-;; (get-buffer
-;; (read-buffer
-;; (format "[A:%s] Buffer B: " buffer-a)
-;; (window-buffer (next-window (selected-window))))))
-;; (buffer-c
-;; (get-buffer
-;; (read-buffer
-;; (format "[A:%s B:%s] Buffer C: " buffer-a buffer-b)
-;; (window-buffer (next-window (selected-window)))))))
-;; (list buffer-a
-;; buffer-b
-;; buffer-c)))
-;; (funcall vdiff-3way-layout-function buffer-a buffer-b buffer-c)
-;; (setq vdiff--buffers (list buffer-a buffer-b buffer-c))
-;; (vdiff--with-all-buffers
-;; (vdiff-3way-mode 1))
-;; (vdiff-refresh))
+;;;###autoload
+(defun vdiff-buffers3 (buffer-a buffer-b buffer-c)
+ "Start a vdiff session. If called interactively, you will be
+asked to select two buffers."
+ (interactive
+ (let* ((buffer-a
+ (get-buffer
+ (read-buffer
+ "Buffer A: " (current-buffer))))
+ (buffer-b
+ (get-buffer
+ (read-buffer
+ (format "[A:%s] Buffer B: " buffer-a)
+ (window-buffer (next-window (selected-window))))))
+ (buffer-c
+ (get-buffer
+ (read-buffer
+ (format "[A:%s B:%s] Buffer C: " buffer-a buffer-b)
+ (window-buffer (next-window (selected-window)))))))
+ (list buffer-a
+ buffer-b
+ buffer-c)))
+ (funcall vdiff-3way-layout-function buffer-a buffer-b buffer-c)
+ (setq vdiff--buffers (list buffer-a buffer-b buffer-c))
+ (vdiff--with-all-buffers
+ (vdiff-3way-mode 1))
+ (vdiff-refresh))
(defun vdiff-quit ()
"Quit `vdiff-mode' and clean up."
- [elpa] scratch/add-vdiff c8cba47 125/258: Fix package, (continued)
- [elpa] scratch/add-vdiff c8cba47 125/258: Fix package, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 83f0788 118/258: Don't make temp files global, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 72fe0fa 130/258: Don't update diff info while sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c6e30a2 136/258: Merge pull request #9 from gvol/master, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 53c2a6b 153/258: Fix receiving changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5dcdc97 158/258: Remove other-window, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7029054 159/258: Comment out vdiff-buffers3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 97d7098 174/258: Add screenshot of three way diff, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8b79246 171/258: Make sure we're in a vdiff buffer on refresh, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 42f56ae 177/258: Don't jump to beginning of buffer on start, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 192dbfe 166/258: Release vdiff-buffers3,
Justin Burkett <=
- [elpa] scratch/add-vdiff 1d8f6e7 185/258: Use correct mode for three way diff on quit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 71d1d20 169/258: Add overlay markers to diff3 send/receive, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff fef3208 189/258: Update screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 03e1b64 186/258: Remove unnecessary unique name function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 87ade86 192/258: Always move to start of fold on close, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d3faef0 197/258: Refresh manually after receive, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a88d313 200/258: Sync scroll after fold toggle, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 74feddf 206/258: Adjust width of subtraction string, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9d89a66 211/258: Add melpa badge, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b705857 006/258: Remove window-starts variable, Justin Burkett, 2017/05/17