From 8c38149446c1ee488f2f1e5e342381f386f8f7d5 Mon Sep 17 00:00:00 2001 From: Vasilij Schneidermann Date: Mon, 31 Mar 2014 10:32:13 +0200 Subject: [PATCH] Fix switching bug at init --- eyebrowse.el | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/eyebrowse.el b/eyebrowse.el index 3c301e0..6591309 100644 --- a/eyebrowse.el +++ b/eyebrowse.el @@ -252,13 +252,14 @@ If `eyebrowse-wrap-around-p' is t, this will switch from the last to the first one." (interactive) (let* ((match (assq eyebrowse-current-slot eyebrowse-window-configs)) - (index (-elem-index match eyebrowse-window-configs)) - (next-index (car (nth (1+ index) eyebrowse-window-configs)))) - (if (< (1+ index) (length eyebrowse-window-configs)) - (eyebrowse-switch-to-window-config next-index) - (when eyebrowse-wrap-around-p - (eyebrowse-switch-to-window-config - (caar eyebrowse-window-configs)))))) + (index (-elem-index match eyebrowse-window-configs))) + (when index + (if (< (1+ index) (length eyebrowse-window-configs)) + (eyebrowse-switch-to-window-config + (car (nth (1+ index) eyebrowse-window-configs))) + (when eyebrowse-wrap-around-p + (eyebrowse-switch-to-window-config + (caar eyebrowse-window-configs))))))) (defun eyebrowse-prev-window-config () "Switch to the previous available window config. @@ -266,13 +267,14 @@ If `eyebrowse-wrap-around-p' is t, this will switch from the first to the last one." (interactive) (let* ((match (assq eyebrowse-current-slot eyebrowse-window-configs)) - (index (-elem-index match eyebrowse-window-configs)) - (prev-index (car (nth (1- index) eyebrowse-window-configs)))) - (if (> index 0) - (eyebrowse-switch-to-window-config prev-index) - (when eyebrowse-wrap-around-p - (eyebrowse-switch-to-window-config - (caar (last eyebrowse-window-configs))))))) + (index (-elem-index match eyebrowse-window-configs))) + (when index + (if (> index 0) + (eyebrowse-switch-to-window-config + (car (nth (1- index) eyebrowse-window-configs))) + (when eyebrowse-wrap-around-p + (eyebrowse-switch-to-window-config + (caar (last eyebrowse-window-configs)))))))) (defun eyebrowse-last-window-config () "Switch to the last window config."