(command_loop_1): Handle NORECORD in call of

Fselect_frame (currently ifdefd).

2 files changed, 27 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f67058c9f9e..787ed51658f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,28 @@
+2008-11-02  Martin Rudalics  <rudalics@gmx.at>
+
+        * frame.c (do_switch_frame): New argument NORECORD passed to
+        Fselect_window.
+        (Fselect_frame): New argument NORECORD passed to
+        do_switch_frame.
+        (Fset_frame_selected_window): New argument NORECORD passed to
+        Fselect_frame.
+        (Fhandle_switch_frame, Fdelete_frame): Handle NORECORD argument
+        in call of do_switch_frame.
+        (Fset_mouse_position, Fset_mouse_pixel_position, Fraise_frame):
+        Handle NORECORD argument in call of Fselect_frame.
+        * lisp.h (do_switch_frame, Fselect_frame)
+        (Fset_frame_selected_window): Adjust declarations.
+        * window.c (select_frame_norecord): New function.
+        (run_window_configuration_change_hook): Use it and call
+        Fselect_frame with NORECORD set.
+        (Fselect_window): Pass NORECORD to Fselect_frame.
+        (Fset_window_configuration): Handle NORECORD argument in call of
+        do_switch_frame.
+        * minibuf.c (choose_minibuf_frame): Handle NORECORD in call of
+        Fset_frame_selected_window.
+        * keyboard.c (command_loop_1): Handle NORECORD in call of
+        Fselect_frame (currently ifdefd).
+
 2008-11-02  Ulrich Mueller  <ulm@kph.uni-mainz.de>
 
         * emacs.c (USAGE2): Untabify.
diff --git a/src/keyboard.c b/src/keyboard.c
index b6834e97a8f..bac830d692c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1601,7 +1601,7 @@ command_loop_1 ()
          Is this a good idea?  */
       if (FRAMEP (internal_last_event_frame)
           && !EQ (internal_last_event_frame, selected_frame))
-        Fselect_frame (internal_last_event_frame);
+        Fselect_frame (internal_last_event_frame, Qnil);
 #endif
       /* If it has changed current-menubar from previous value,
          really recompute the menubar from the value.  */
@@ -11098,7 +11098,7 @@ quit_throw_to_read_char ()
   if (FRAMEP (internal_last_event_frame)
       && !EQ (internal_last_event_frame, selected_frame))
     do_switch_frame (make_lispy_switch_frame (internal_last_event_frame),
-                     0, 0);
+                     0, 0, Qnil);
 
   _longjmp (getcjmp, 1);
 }