From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 14 Jun 2007 00:10:43 +0000 (+0000)
Subject: (edebug-pop-to-buffer, edebug-display): Remove redundant checks.
X-Git-Tag: emacs-pretest-23.0.90~12293
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b96c77f465f44c1e8c83a46f4c9bd70098766d4;p=emacs.git

(edebug-pop-to-buffer, edebug-display): Remove redundant checks.
---

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 9ae33599f09..3d9e63bc802 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -369,7 +369,7 @@ Return the result of the last expression in BODY."
   ;; Otherwise, find a new window, possibly splitting one.
   (setq window
 	(cond
-	 ((and (windowp window) (edebug-window-live-p window)
+	 ((and (edebug-window-live-p window)
 	       (eq (window-buffer window) buffer))
 	  window)
 	 ((eq (window-buffer (selected-window)) buffer)
@@ -2739,7 +2739,7 @@ MSG is printed after `::::} '."
 
 		  ;; Unrestore edebug-buffer's window-start, if displayed.
 		  (let ((window (car edebug-window-data)))
-		    (if (and window (edebug-window-live-p window)
+		    (if (and (edebug-window-live-p window)
 			     (eq (window-buffer) edebug-buffer))
 			(progn
 			  (set-window-start window (cdr edebug-window-data)