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

2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0b00b8fbb1..7ab55f730a3 100644
--- 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,Ae(Brd <bojohan@dd.chalmers.se>.
 
diff --git a/lisp/server.el b/lisp/server.el
index 690f51034f2..2cf2a2e3953 100644
--- 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)