update nadvice

[bpt/emacs.git] / lisp / bs.el

diff --git a/lisp/bs.el b/lisp/bs.el
index af21333..73b3684 100644 (file)
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1,6 +1,6 @@
 ;;; bs.el --- menu for selecting and displaying buffers -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2014 Free Software Foundation, Inc.
 ;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Maintainer: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Keywords: convenience
@@ -1143,7 +1143,7 @@ and move point to current buffer."
     (delete-char -1)
     (bs--set-window-height)
     (bs--goto-current-buffer)
-    (font-lock-fontify-buffer)
+    (font-lock-ensure)
     (bs-apply-sort-faces)
     (set-buffer-modified-p nil)))
 
@@ -1406,7 +1406,7 @@ for buffer selection."
          (select-window active-window)
        (bs--restore-window-config)
        (setq bs--window-config-coming-from (current-window-configuration))
-       (when (> (window-height (selected-window)) 7)
+       (when (> (window-height) 7)
           ;; Errors would mess with the window configuration (bug#10882).
           (ignore-errors (select-window (split-window-below)))))
       (bs-show-in-buffer liste)