changeset 95639:2c12b44a3dfc

(Flast_nonminibuf_frame): Handle the NULL case.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 07 Jun 2008 13:52:12 +0000
parents bd7f6b7e4578
children 70d0398a5c78
files src/ChangeLog src/dispnew.c
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
 }