[Emacs-diffs] trunk r114110: Move Flast_nonminibuf_frame from dispnew.c to frame.c.

[Martin Rudalics]

------------------------------------------------------------
revno: 114110
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-02 19:23:26 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispnew.c                  dispnew.c-20091113204419-o5vbwnq5f7feedwu-258
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-02 15:48:59 +0000
+++ b/src/ChangeLog     2013-09-02 17:23:26 +0000
@@ -8,8 +8,10 @@
 
 2013-09-02  Martin Rudalics  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2013-09-01 16:21:48 +0000
+++ b/src/dispnew.c     2013-09-02 17:23:26 +0000
@@ -6172,19 +6172,6 @@
 {
   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 @@
   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);

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-09-02 12:22:21 +0000
+++ b/src/frame.c       2013-09-02 17:23:26 +0000
@@ -1078,6 +1078,19 @@
   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 @@
   defsubr (&Sframe_list);
   defsubr (&Snext_frame);
   defsubr (&Sprevious_frame);
+  defsubr (&Slast_nonminibuf_frame);
   defsubr (&Sdelete_frame);
   defsubr (&Smouse_position);
   defsubr (&Smouse_pixel_position);