[Emacs-diffs] Changes to emacs/lisp/bs.el,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      06/11/10 01:34:35

Index: bs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/bs.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- bs.el       9 Nov 2006 16:32:30 -0000       1.29
+++ bs.el       10 Nov 2006 01:34:35 -0000      1.30
@@ -692,17 +692,6 @@
   (interactive)
   (bs--redisplay t))
 
-(defun bs--window-for-buffer (buffer-name)
-  "Return a window showing a buffer with name BUFFER-NAME.
-Take only windows of current frame into account.
-Return nil if there is no such buffer."
-  (catch 'window
-    (walk-windows (lambda (w)
-                   (when (string= (buffer-name (window-buffer w))
-                                   buffer-name)
-                      (throw 'window w))))
-    nil))
-
 (defun bs--set-window-height ()
   "Change the height of the selected window to suit the current buffer list."
   (unless (one-window-p t)
@@ -1241,7 +1230,6 @@
                                (or (cdr bs--cycle-list)
                                    "this buffer"))))))
 
-
 ;;;###autoload
 (defun bs-cycle-previous ()
   "Select previous buffer defined by buffer cycling.
@@ -1435,7 +1423,10 @@
       ;; we have to set the buffer we started the command
       (setq bs--buffer-coming-from (current-buffer)))
     (let ((liste (bs-buffer-list))
-         (active-window (bs--window-for-buffer "*buffer-selection*")))
+         (active-window (get-window-with-predicate
+                          (lambda (w)
+                            (string= (buffer-name (window-buffer w))
+                                     "*buffer-selection*")))))
       (if active-window
          (select-window active-window)
         (modify-frame-parameters nil