[Emacs-diffs] /srv/bzr/emacs/trunk r107431: lisp/bs.el: Fix bug#10882

[Juanma Barranquero]

------------------------------------------------------------
revno: 107431
fixes bug(s): http://debbugs.gnu.org/10882
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-26 00:26:40 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/bs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-25 12:09:19 +0000
+++ b/lisp/ChangeLog    2012-02-25 23:26:40 +0000
@@ -1,3 +1,9 @@
+2012-02-25  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * term/ns-win.el (global-map): Bind ns-drag-file to

=== modified file 'lisp/bs.el'
--- a/lisp/bs.el        2012-01-19 07:21:25 +0000
+++ b/lisp/bs.el        2012-02-25 23:26:40 +0000
@@ -1414,7 +1414,8 @@
        (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)))))