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

60b4b298 · Juanma Barranquero · 843d2458 · 60b4b298 · 60b4b298
Commit 60b4b298 authored Jun 11, 2007 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

lisp/ChangeLog lisp/ChangeLog +6 -2

lisp/server.el lisp/server.el +1 -2

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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>.


--- 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)