lisp/bs.el: Fix bug#10882

* bs.el (bs--show-with-configuration): Don't throw an error
  if the window cannot be split; otherwise, subsequent calls
  to bs-show fail, restoring a stale window config.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 353d40a9fa4f20f6c3d4886509d01a582e4179fd..f585be4ec342fd7adbeb35e6202facd34f0b9e03 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-25  Juanma Barranquero  <lekktu@gmail.com>
+
+       * bs.el (bs--show-with-configuration): Don't throw an error
+       if the window cannot be split; otherwise, subsequent calls to
+       bs-show fail, restoring a stale window config.  (Bug#10882)
+
 2012-02-25  Jan Djärv  <jan.h.d@swipnet.se>
 
        * term/ns-win.el (global-map): Bind ns-drag-file to

diff --git a/lisp/bs.el b/lisp/bs.el
index 2e0089d153f3bbfe914d5f08eb6cdd05c050fa20..4e54ef882fe73d140038a056949a4c029943e271 100644 (file)
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1414,7 +1414,8 @@ for buffer selection."
        (bs--restore-window-config)
        (setq bs--window-config-coming-from (current-window-configuration))
        (when (> (window-height (selected-window)) 7)
-          (select-window (split-window-below))))
+          ;; Errors would mess with the window configuration (bug#10882).
+          (ignore-errors (select-window (split-window-below)))))
       (bs-show-in-buffer liste)
       (bs-message-without-log "%s" (bs--current-config-message)))))