From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 29 Jul 2006 11:19:58 +0000 (+0000)
Subject: (bw-get-tree): Don't integerp subtree if it's nil.
X-Git-Tag: emacs-pretest-22.0.90~1192
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=114b3e94ec69f283a82298a1607f1943ec22c540;p=emacs.git

(bw-get-tree): Don't integerp subtree if it's nil.
---

diff --git a/lisp/window.el b/lisp/window.el
index 2ae1a2c9e79..7810ba4c5be 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -246,9 +246,10 @@ then the smallest tree containing that window is returned."
                 (windowp window-or-frame))
       (error "Not a frame or window: %s" window-or-frame)))
   (let ((subtree (bw-find-tree-sub window-or-frame)))
-    (if (integerp subtree)
-        nil
-      (bw-get-tree-1 subtree))))
+    (when subtree
+      (if (integerp subtree)
+	  nil
+	(bw-get-tree-1 subtree)))))
 
 (defun bw-get-tree-1 (split)
   (if (windowp split)