[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 5b1b342 119/258: Remove duplicated code in vdif
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 5b1b342 119/258: Remove duplicated code in vdiff-files |
Date: |
Wed, 17 May 2017 08:13:35 -0400 (EDT) |
branch: scratch/add-vdiff
commit 5b1b3423bbff7f74b327aed46f161fd65eb464ca
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Remove duplicated code in vdiff-files
---
vdiff.el | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 982b1f6..b0a6c7e 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1220,20 +1220,9 @@ asked to select two files."
(format "[File 1 %s] File 2: "
(file-name-nondirectory file-a)))
current-prefix-arg)))
- (let (window-b buffer-a)
- (delete-other-windows)
- (find-file file-a)
- (goto-char (point-min))
- (setq buffer-a (current-buffer))
- (save-selected-window
- (setq window-b (if horizontal
- (split-window-vertically)
- (split-window-horizontally)))
- (find-file-other-window file-b)
- (setq vdiff--buffers (list buffer-a (window-buffer window-b)))
- (vdiff-mode 1))
- (vdiff-mode 1)
- (vdiff-refresh)))
+ (vdiff-buffers (find-file-noselect file-a)
+ (find-file-noselect file-b)
+ horizontal))
;;;###autoload
(defun vdiff-buffers (buffer-a buffer-b &optional horizontal)
@@ -1261,17 +1250,16 @@ asked to select two buffers."
(switch-to-buffer-other-window buffer-b)
(setq vdiff--buffers (list buffer-a buffer-b))
(vdiff--with-all-buffers
- (vdiff-mode 1))
- (vdiff-refresh)))
+ (vdiff-mode 1)))
+ (vdiff-refresh))
-(defun vdiff-exit ()
- "Exit `vdiff-mode' and clean up."
+(defun vdiff-quit ()
+ "Quit `vdiff-mode' and clean up."
(interactive)
(dolist (buf vdiff--buffers)
(with-current-buffer buf
(vdiff-mode -1)))
(message "vdiff exited"))
-(defalias 'vdiff-quit 'vdiff-exit)
(defvar vdiff-mode-map
(let ((map (make-sparse-keymap)))
- [elpa] scratch/add-vdiff 3a32c4e 255/258: README: Update, (continued)
- [elpa] scratch/add-vdiff 3a32c4e 255/258: README: Update, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d4883de 256/258: vdiff-magit: Remove use of camel case names for consistency, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 819ea4b 258/258: Add 'packages/vdiff/' from commit 'f11c7c2eeef33a0b75fe4e025818e7e672c57397', Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 14abb75 078/258: Allow jumping to subtraction overlays, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a15b0e5 084/258: Move point before closing fold, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 425d50b 085/258: Add vdiff-close-other-folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 6516112 075/258: Minor formatting, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 968047f 093/258: Change wording in a docstring, Justin Burkett, 2017/05/17
- [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 <=
- [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, 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