procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Flast_nonminibuf_frame from dispnew.c to frame.c.

Browse source 
* dispnew.c (Flast_nonminibuf_frame): Move from here ...
* frame.c (Flast_nonminibuf_frame): ... to here.
This commit is contained in:
Martin Rudalics 2013-09-02 19:23:26 +02:00
parent b594a96c87
commit 9718b207e9
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -8,8 +8,10 @@
2013-09-02 Martin Rudalics <rudalics@gmx.at>
* 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 <dmantipov@yandex.ru>

14
src/dispnew.c
View file

@ -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);

14
src/frame.c
View file

@ -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);