Re: quitting ediff with pop-up-frames non-nil gives wrong-type arg error

[Lennart Borgman]

Michael Kifer wrote:
> > > From: "Drew Adams" <address@hidden>
> > > Date: Sat, 22 Jul 2006 07:09:43 -0700
> > >
> > > Get these two buffers (for example) in two separate frames: *scratch*,
> > > *Messages*.
> > >       
> > This was the crucial missing detail: if I do this, I see the error as
> > well.  If I invoke Ediff from the single (initial) frame, the error
> > doesn't happen.
> >
> > Michael, can you reproduce this on GNU/Linux?
> >
> >     
>
>
> no, it works without a hitch.
> Let me understand the precise sequence:
>
> 1. Make 2 frames
> 2. Put *scratch* in one and *Messages* in another
> 3. do ediff-buffers
> 4. Type q in the little window
>
> The above sequence doesn't cause any problems in the Linux
> version of Emacs.
>   

The error is inside balance-windows. I think the patch below cures it. 
Could someone please install this?


Index: window.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/window.el,v
retrieving revision 1.115
diff -u -r1.115 window.el
--- window.el    2 Jul 2006 14:32:52 -0000    1.115
+++ window.el    22 Jul 2006 22:16:22 -0000
@@ -246,9 +246,10 @@
                (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)