[Emacs-diffs] trunk r113733: Prefer selected_window to Fselected_window, likewise for frames.

[Dmitry Antipov]

------------------------------------------------------------
revno: 113733
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-07 17:21:59 +0400
message:
  Prefer selected_window to Fselected_window, likewise for frames.
  * buffer.c (Fbuffer_swap_text):
  * data.c (Fvariable_binding_locus):
  * window.c (run_window_configuration_change_hook): Adjust users.
  * w16select.c (Fw16_set_clipboard_data, Fw16_get_clipboard_data):
  Use decode_live_frame.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/buffer.c                   buffer.c-20091113204419-o5vbwnq5f7feedwu-264
  src/data.c                     data.c-20091113204419-o5vbwnq5f7feedwu-251
  src/w16select.c                
w16select.c-20091113204419-o5vbwnq5f7feedwu-1103
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-07 10:32:08 +0000
+++ b/src/ChangeLog     2013-08-07 13:21:59 +0000
@@ -1,5 +1,14 @@
 2013-08-07  Dmitry Antipov  <address@hidden>
 
+       Prefer selected_window to Fselected_window, likewise for frames.
+       * buffer.c (Fbuffer_swap_text):
+       * data.c (Fvariable_binding_locus):
+       * window.c (run_window_configuration_change_hook): Adjust users.
+       * w16select.c (Fw16_set_clipboard_data, Fw16_get_clipboard_data):
+       Use decode_live_frame.
+
+2013-08-07  Dmitry Antipov  <address@hidden>
+
        Be more careful if selected window shows the buffer other than current,
        use window_outdated only if this is not so.  This change should also
        address some weird issues discussed in Bug#13012.

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2013-08-06 06:53:09 +0000
+++ b/src/buffer.c      2013-08-07 13:21:59 +0000
@@ -2409,7 +2409,7 @@
        live window points to that window's buffer.  So since we
        just swapped the markers between the two buffers, we need
        to undo the effect of this swap for window markers.  */
-    Lisp_Object w = Fselected_window (), ws = Qnil;
+    Lisp_Object w = selected_window, ws = Qnil;
     Lisp_Object buf1, buf2;
     XSETBUFFER (buf1, current_buffer); XSETBUFFER (buf2, other_buffer);
 

=== modified file 'src/data.c'
--- a/src/data.c        2013-08-05 04:14:43 +0000
+++ b/src/data.c        2013-08-07 13:21:59 +0000
@@ -1975,7 +1975,7 @@
       {
        union Lisp_Fwd *valcontents = SYMBOL_FWD (sym);
        if (KBOARD_OBJFWDP (valcontents))
-         return Fframe_terminal (Fselected_frame ());
+         return Fframe_terminal (selected_frame);
        else if (!BUFFER_OBJFWDP (valcontents))
          return Qnil;
       }

=== modified file 'src/w16select.c'
--- a/src/w16select.c   2013-01-23 20:07:28 +0000
+++ b/src/w16select.c   2013-08-07 13:21:59 +0000
@@ -452,11 +452,7 @@
 
   CHECK_STRING (string);
 
-  if (NILP (frame))
-    frame = Fselected_frame ();
-
-  CHECK_LIVE_FRAME (frame);
-  if ( !FRAME_MSDOS_P (XFRAME (frame)))
+  if (!FRAME_MSDOS_P (decode_live_frame (frame)))
     goto done;
 
   block_input ();
@@ -558,11 +554,7 @@
   Lisp_Object ret = Qnil;
   int require_decoding = 0;
 
-  if (NILP (frame))
-    frame = Fselected_frame ();
-
-  CHECK_LIVE_FRAME (frame);
-  if ( !FRAME_MSDOS_P (XFRAME (frame)))
+  if (!FRAME_MSDOS_P (decode_live_frame (frame)))
     goto done;
 
   block_input ();

=== modified file 'src/window.c'
--- a/src/window.c      2013-08-07 10:32:08 +0000
+++ b/src/window.c      2013-08-07 13:21:59 +0000
@@ -3128,7 +3128,7 @@
 
   if (SELECTED_FRAME () != f)
     {
-      record_unwind_protect (select_frame_norecord, Fselected_frame ());
+      record_unwind_protect (select_frame_norecord, selected_frame);
       select_frame_norecord (frame);
     }
 
@@ -3143,7 +3143,7 @@
                                      buffer)))
          {
            ptrdiff_t inner_count = SPECPDL_INDEX ();
-           record_unwind_protect (select_window_norecord, Fselected_window ());
+           record_unwind_protect (select_window_norecord, selected_window);
            select_window_norecord (window);
            run_funs (Fbuffer_local_value (Qwindow_configuration_change_hook,
                                           buffer));