[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 7029054 159/258: Comment out vdiff-buffers3
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 7029054 159/258: Comment out vdiff-buffers3 |
Date: |
Wed, 17 May 2017 08:13:42 -0400 (EDT) |
branch: scratch/add-vdiff
commit 70290547637bb4ab8db8bce14ce956798a07e5a5
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Comment out vdiff-buffers3
Not quite working yet
---
vdiff.el | 54 +++++++++++++++++++++++++++---------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index bb3ad04..aba6869 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1477,33 +1477,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 ad0e8c3 091/258: Make mirrored-commands private and rename, (continued)
- [elpa] scratch/add-vdiff ad0e8c3 091/258: Make mirrored-commands private and rename, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 309e912 108/258: Refresh automatically on idle after change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5b1b342 119/258: Remove duplicated code in vdiff-files, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 750a1bc 124/258: Fix bug in remove-refinements, Justin Burkett, 2017/05/17
- [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 <=
- [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, 2017/05/17
- [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