Merge commit 'b114cf8a93224c85c51e95db52bf359131130476' from ace-window

[gnu-emacs-elpa] / packages / ace-window / ace-window.el

diff --git a/packages/ace-window/ace-window.el b/packages/ace-window/ace-window.el
index f34a77afcd15daa4e0414bf39d0f47959c9fc5a5..791b34d0d1625e5aab9f94079d952b2f98772e6b 100644 (file)
--- a/packages/ace-window/ace-window.el
+++ b/packages/ace-window/ace-window.el
@@ -87,6 +87,10 @@
 Use M-0 `ace-window' to toggle this value."
   :type 'boolean)
 
+(defcustom aw-ignore-current nil
+  "When t, `ace-window' will ignore `selected-window'."
+  :type 'boolean)
+
 (defcustom aw-background t
   "When t, `ace-window' will dim out all buffers temporarily when used.'."
   :type 'boolean)
@@ -115,9 +119,11 @@ Use M-0 `ace-window' to toggle this value."
 ;;* Implementation
 (defun aw-ignored-p (window)
   "Return t if WINDOW should be ignored."
-  (and aw-ignore-on
-       (member (buffer-name (window-buffer window))
-               aw-ignored-buffers)))
+  (or (and aw-ignore-on
+           (member (buffer-name (window-buffer window))
+                   aw-ignored-buffers))
+      (and aw-ignore-current
+           (equal window (selected-window)))))
 
 (defun aw-window-list ()
   "Return the list of interesting windows."