[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 45c97bb 11/68: Fix selection when two single-window frames
From: |
Oleh Krehel |
Subject: |
[elpa] master 45c97bb 11/68: Fix selection when two single-window frames |
Date: |
Sat, 21 Mar 2015 19:06:50 +0000 |
branch: master
commit 45c97bbd45d156d9c67ff9b682ab5bcc7f3dcc49
Author: Kyle Meyer <address@hidden>
Commit: Kyle Meyer <address@hidden>
Fix selection when two single-window frames
With two single-window frames, `next-window' was being called with
ALL-FRAMES as nil, resulting in the current window being returned
instead of the non-selected window. This commit sets the ALL-FRAMES
argument to 'visible' and modifies `aw-switch-to-window' to account for
the two-window case where POSITION may not be a window in the current
frame.
The only handler this commit modifies is `aw-switch-to-window' because
the behavior for `aw-delete-window' and `aw-swap-window' with multiple
frames doesn't seem to be well specified at this point.
---
ace-window.el | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ace-window.el b/ace-window.el
index 602ccad..518e117 100644
--- a/ace-window.el
+++ b/ace-window.el
@@ -138,7 +138,7 @@ HANDLER is a function that takes a window argument."
(0)
(1)
(2
- (,handler (next-window)))
+ (,handler (next-window nil nil 'visible)))
(t
(let ((candidate-list
(mapcar (lambda (va)
@@ -230,16 +230,18 @@ Windows are numbered top down, left to right."
(defun aw-switch-to-window (position)
"Switch to window of `aj-position' structure POSITION."
- (if (windowp position)
- (select-window position)
- (let ((frame (aj-position-frame position))
- (window (aj-position-window position)))
- (if (and (frame-live-p frame)
- (not (eq frame (selected-frame))))
- (select-frame-set-input-focus (window-frame window)))
- (if (and (window-live-p window)
- (not (eq window (selected-window))))
- (select-window window)))))
+ (let (frame window)
+ (if (windowp position)
+ (setq frame (window-frame position)
+ window position)
+ (setq frame (aj-position-frame position)
+ window (aj-position-window position)))
+ (if (and (frame-live-p frame)
+ (not (eq frame (selected-frame))))
+ (select-frame-set-input-focus frame))
+ (if (and (window-live-p window)
+ (not (eq window (selected-window))))
+ (select-window window))))
(defun aw-delete-window (position)
"Delete window of `aj-position' structure POSITION."
- [elpa] master updated (6afd045 -> b11606c), Oleh Krehel, 2015/03/21
- [elpa] master d340d7f 04/68: ace-window.el (ace-window): ensure `ace-jump-mode-scope' is 'global, Oleh Krehel, 2015/03/21
- [elpa] master 0a612b1 02/68: ace-window.el (ace-window): make buffers at least size 1, Oleh Krehel, 2015/03/21
- [elpa] master 7e44037 05/68: ace-window.el (aw-scope): new custom variable, Oleh Krehel, 2015/03/21
- [elpa] master d7a5424 03/68: ace-window.el (ace-window): update doc, Oleh Krehel, 2015/03/21
- [elpa] master 5bd467e 08/68: ace-window.el (aw-generic): autoload, Oleh Krehel, 2015/03/21
- [elpa] master 99ab03f 07/68: README.md: update, Oleh Krehel, 2015/03/21
- [elpa] master 7a65bfa 01/68: Initial import, Oleh Krehel, 2015/03/21
- [elpa] master d6ed99f 09/68: ace-window.el: remove "emacs --deamon"'s invisible frame, Oleh Krehel, 2015/03/21
- [elpa] master 291e93f 10/68: ace-window.el (aw-list-visual-area): autoload, Oleh Krehel, 2015/03/21
- [elpa] master 45c97bb 11/68: Fix selection when two single-window frames,
Oleh Krehel <=
- [elpa] master c3a9242 06/68: ace-window.el: add move and delete functionality, Oleh Krehel, 2015/03/21
- [elpa] master fc95979 14/68: Remove ace-jump-mode-make-indirect-buffer, Oleh Krehel, 2015/03/21
- [elpa] master 4de62ee 15/68: Merge pull request #8 from kyleam/ace-jump-update, Oleh Krehel, 2015/03/21
- [elpa] master dd44ece 13/68: ace-window.el (aw-delete-window): allow to delete current window, Oleh Krehel, 2015/03/21
- [elpa] master 18f300a 12/68: Merge pull request #5 from kyleam/fix-selection, Oleh Krehel, 2015/03/21
- [elpa] master f0b55c8 18/68: Merge pull request #9 from demon386/master, Oleh Krehel, 2015/03/21
- [elpa] master 8f20278 16/68: ace-window.el (aw-generic): switch to cl-position, Oleh Krehel, 2015/03/21
- [elpa] master 6053545 17/68: Respect `aw-scope' when jumping with `next-window', Oleh Krehel, 2015/03/21
- [elpa] master 5127bfd 20/68: ace-window.el (aw-generic): finalize improve for hscroll, Oleh Krehel, 2015/03/21
- [elpa] master 12a34df 19/68: ace-window.el (aw-generic): improve for hscroll, Oleh Krehel, 2015/03/21