From 4958ed94efea5ede7c69bfdecdb4d59873db274a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 7 Jun 2008 13:52:12 +0000 Subject: [PATCH] (Flast_nonminibuf_frame): Handle the NULL case. --- src/ChangeLog | 4 ++++ src/dispnew.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6ae6e4fc14..9337dbf699 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-06-07 Stefan Monnier + + * dispnew.c (Flast_nonminibuf_frame): Handle the NULL case. + 2008-06-06 Miles Bader * xdisp.c (x_produce_glyphs): Calculate tab width based on current diff --git a/src/dispnew.c b/src/dispnew.c index 0867c2eccb..f6f464d9eb 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -7066,9 +7066,10 @@ DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame, doc: /* Value is last nonminibuffer frame. */) () { - Lisp_Object frame; + Lisp_Object frame = Qnil; - XSETFRAME (frame, last_nonminibuf_frame); + if (last_nonminibuf_frame) + XSETFRAME (frame, last_nonminibuf_frame); return frame; } -- 2.20.1