[Emacs-diffs] /srv/bzr/emacs/trunk r109695: In select_window always make selected window's buffer current.

[martin rudalics]

------------------------------------------------------------
revno: 109695
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-20 11:28:39 +0200
message:
  In select_window always make selected window's buffer current.
  
  * window.c (select_window): Always make selected window's buffer
  current.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-20 08:20:25 +0000
+++ b/src/ChangeLog     2012-08-20 09:28:39 +0000
@@ -1,3 +1,8 @@
+2012-08-20  Martin Rudalics  <address@hidden>
+
+       * window.c (select_window): Always make selected window's buffer
+       current.
+
 2012-08-20  Dmitry Antipov  <address@hidden>
 
        Use AREF and ASET for docstrings of category tables.

=== modified file 'src/window.c'
--- a/src/window.c      2012-08-18 06:06:39 +0000
+++ b/src/window.c      2012-08-20 09:28:39 +0000
@@ -477,6 +477,9 @@
       record_buffer (w->buffer);
     }
 
+  /* Make the selected window's buffer current.  */
+  Fset_buffer (w->buffer);
+
   if (EQ (window, selected_window) && !inhibit_point_swap)
     return window;
 
@@ -496,9 +499,9 @@
   else
     fset_selected_window (sf, window);
 
-  /* Store the current buffer's actual point into the
-     old selected window.  It belongs to that window,
-     and when the window is not selected, must be in the window.  */
+  /* Store the old selected window's buffer's point in pointm of the old
+     selected window.  It belongs to that window, and when the window is
+     not selected, must be in the window.  */
   if (!inhibit_point_swap)
     {
       ow = XWINDOW (selected_window);
@@ -509,9 +512,6 @@
     }
 
   selected_window = window;
-
-  Fset_buffer (w->buffer);
-
   bset_last_selected_window (XBUFFER (w->buffer), window);
 
   /* Go to the point recorded in the window.