From 9718b207e97dcef952fee38b1269130d68744013 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Mon, 2 Sep 2013 19:23:26 +0200 Subject: [PATCH] Move Flast_nonminibuf_frame from dispnew.c to frame.c. * dispnew.c (Flast_nonminibuf_frame): Move from here ... * frame.c (Flast_nonminibuf_frame): ... to here. --- src/ChangeLog | 6 ++++-- src/dispnew.c | 14 -------------- src/frame.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2507f898c5a..d2e80ace3e4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,8 +8,10 @@ 2013-09-02 Martin Rudalics - * frame.c (check_minibuf_window): Don't abort if no window was - found (Bug#15247). + * dispnew.c (Flast_nonminibuf_frame): Move from here ... + * frame.c (Flast_nonminibuf_frame): ... to here. + (check_minibuf_window): Don't abort if no window was found + (Bug#15247). 2013-09-02 Dmitry Antipov diff --git a/src/dispnew.c b/src/dispnew.c index 0e336d4feea..1d7cad13e6d 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6172,19 +6172,6 @@ WINDOW nil or omitted means report on the selected window. */) { return decode_any_window (window)->cursor_off_p ? Qnil : Qt; } - -DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame, - Slast_nonminibuf_frame, 0, 0, 0, - doc: /* Value is last nonminibuffer frame. */) - (void) -{ - Lisp_Object frame = Qnil; - - if (last_nonminibuf_frame) - XSETFRAME (frame, last_nonminibuf_frame); - - return frame; -} /*********************************************************************** Initialization @@ -6203,7 +6190,6 @@ syms_of_display (void) defsubr (&Ssend_string_to_terminal); defsubr (&Sinternal_show_cursor); defsubr (&Sinternal_show_cursor_p); - defsubr (&Slast_nonminibuf_frame); #ifdef GLYPH_DEBUG defsubr (&Sdump_redisplay_history); diff --git a/src/frame.c b/src/frame.c index e33426c2a44..d11a6b8fee9 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1078,6 +1078,19 @@ Otherwise, include all frames. */) CHECK_LIVE_FRAME (frame); return prev_frame (frame, miniframe); } + +DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame, + Slast_nonminibuf_frame, 0, 0, 0, + doc: /* Return last non-minibuffer frame selected. */) + (void) +{ + Lisp_Object frame = Qnil; + + if (last_nonminibuf_frame) + XSETFRAME (frame, last_nonminibuf_frame); + + return frame; +} /* Return 1 if it is ok to delete frame F; 0 if all frames aside from F are invisible. @@ -4492,6 +4505,7 @@ automatically. See also `mouse-autoselect-window'. */); defsubr (&Sframe_list); defsubr (&Snext_frame); defsubr (&Sprevious_frame); + defsubr (&Slast_nonminibuf_frame); defsubr (&Sdelete_frame); defsubr (&Smouse_position); defsubr (&Smouse_pixel_position); -- 2.39.2