summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2011-06-26 13:23:23 +0200
committerJuanma Barranquero <lekktu@gmail.com>2011-06-26 13:23:23 +0200
commit7ca8fc42baeb89a0d5f84b6c8549fdf6f3d8d0e6 (patch)
tree9a6468be38d8d87ac00f2685160883b4ee4a6e8d
parent7d2a1c5ef54c81ba041cb74ab29d8deae76c5dfd (diff)
downloademacs-7ca8fc42baeb89a0d5f84b6c8549fdf6f3d8d0e6.tar.gz
emacs-7ca8fc42baeb89a0d5f84b6c8549fdf6f3d8d0e6.tar.bz2
emacs-7ca8fc42baeb89a0d5f84b6c8549fdf6f3d8d0e6.zip
lisp/bs.el (bs-cycle-next): Pass current buffer to `bury-buffer'.
Fixes: debbugs:8911
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/bs.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d86248454be..0dde4aa62bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-26 Juanma Barranquero <lekktu@gmail.com>
+
+ * bs.el (bs-cycle-next): Pass current buffer to `bury-buffer' to
+ avoid deleting the current window in some cases (bug#8911).
+
2011-06-26 Andreas Schwab <schwab@linux-m68k.org>
* emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.
diff --git a/lisp/bs.el b/lisp/bs.el
index 95dc371e57b..73f8d0bf52a 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1214,8 +1214,8 @@ by buffer configuration `bs-cycle-configuration-name'."
(cycle-list (cdr tupel)))
(unless (window-dedicated-p (selected-window))
;; We don't want the frame iconified if the only window in the frame
- ;; happens to be dedicated; let's get the error from switch-to-buffer
- (bury-buffer))
+ ;; happens to be dedicated
+ (bury-buffer (current-buffer)))
(switch-to-buffer next)
(setq bs--cycle-list (append (cdr cycle-list)
(list (car cycle-list))))