(Fselect_window): Don't update window_select_count and

use_time when norecord is not nil.

2 files changed, 15 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1f0ae13a37d..98e4aad8a80 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-15  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fselect_window): Don't update window_select_count and
+        use_time when norecord is not nil.
+
 2008-09-14  Kenichi Handa  <handa@m17n.org>
 
         * fileio.c (Finsert_file_contents): Delete incorrect decrement of
diff --git a/src/window.c b/src/window.c
index f3154849fef..a5374d3531e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3496,11 +3496,11 @@ DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
        doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
 If WINDOW is not already selected, make WINDOW's buffer current
 and make WINDOW the frame's selected window.  Return WINDOW.
-Optional second arg NORECORD non-nil means
-do not put this buffer at the front of the list of recently selected ones.
+Optional second arg NORECORD non-nil means do not put this buffer
+at the front of the list of recently selected ones.
 
-Note that the main editor command loop
-selects the buffer of the selected window before each command.  */)
+Note that the main editor command loop selects the buffer of the
+selected window before each command.  */)
      (window, norecord)
      register Lisp_Object window, norecord;
 {
@@ -3513,8 +3513,12 @@ selects the buffer of the selected window before each command.  */)
   w = XWINDOW (window);
   w->frozen_window_start_p = 0;
 
-  ++window_select_count;
-  XSETFASTINT (w->use_time, window_select_count);
+  if (NILP (norecord))
+    {
+      ++window_select_count;
+      XSETFASTINT (w->use_time, window_select_count);
+    }
+
   if (EQ (window, selected_window))
     return window;