# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1212846732 0
# Node ID 2c12b44a3dfcc30ba8e97dee86e2ef59b33b879f
# Parent  bd7f6b7e45780a05731e04256291e80a36a4b24b
(Flast_nonminibuf_frame): Handle the NULL case.

diff -r bd7f6b7e4578 -r 2c12b44a3dfc src/ChangeLog
--- a/src/ChangeLog	Sat Jun 07 12:43:11 2008 +0000
+++ b/src/ChangeLog	Sat Jun 07 13:52:12 2008 +0000
@@ -1,3 +1,7 @@
+2008-06-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* dispnew.c (Flast_nonminibuf_frame): Handle the NULL case.
+
 2008-06-06  Miles Bader  <miles@gnu.org>
 
 	* xdisp.c (x_produce_glyphs): Calculate tab width based on current
diff -r bd7f6b7e4578 -r 2c12b44a3dfc src/dispnew.c
--- a/src/dispnew.c	Sat Jun 07 12:43:11 2008 +0000
+++ b/src/dispnew.c	Sat Jun 07 13:52:12 2008 +0000
@@ -7066,9 +7066,10 @@
        doc: /* Value is last nonminibuffer frame. */)
      ()
 {
-  Lisp_Object frame;
-
-  XSETFRAME (frame, last_nonminibuf_frame);
+  Lisp_Object frame = Qnil;
+
+  if (last_nonminibuf_frame)
+    XSETFRAME (frame, last_nonminibuf_frame);
 
   return frame;
 }