(server-switch-buffer): Remove redundant check.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0b00b8fbb132960fd2d0b9e47559a13ae938da5..7ab55f730a344107ded25fc91a75e139a184b0d5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
+2007-06-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       * server.el (server-switch-buffer): Remove redundant check.
+
 2007-06-10  Martin Rudalics  <rudalics@gmx.at>
 
-       * emacs-lisp/bytecomp.el (byte-compile-find-cl-functions): Match
-       against file-name-nondirectory.
+       * emacs-lisp/bytecomp.el (byte-compile-find-cl-functions):
+       Match against file-name-nondirectory.
        Fix text on user customization variables.
        Reported by Johan Bockg\e,Ae\e(Brd <bojohan@dd.chalmers.se>.
 

diff --git a/lisp/server.el b/lisp/server.el
index 690f51034f2c814a3eebaac445390b8a83f87546..2cf2a2e3953d008c489cdc05cd6ecc5c37a7bd68 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -735,8 +735,7 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
                 (select-window win)
                 (set-buffer next-buffer))
            ;; Otherwise, let's find an appropriate window.
-           (cond ((and (windowp server-window)
-                       (window-live-p server-window))
+           (cond ((window-live-p server-window)
                   (select-window server-window))
                  ((framep server-window)
                   (unless (frame-live-p server-window)