[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100334: * src/window.c (Fmove_to_window_line): Avoid abort when called in a buffer

[Stefan Monnier]

------------------------------------------------------------
revno: 100334
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-12-25 23:04:58 -0500
message:
  * src/window.c (Fmove_to_window_line): Avoid abort when called in a buffer
  different from selected-window's.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-12-25 17:19:57 +0000
+++ b/src/ChangeLog     2010-12-26 04:04:58 +0000
@@ -1,3 +1,8 @@
+2010-12-26  Stefan Monnier  <address@hidden>
+
+       * window.c (Fmove_to_window_line): Avoid abort when called in a buffer
+       different from selected-window's.
+
 2010-12-25  Eli Zaretskii  <address@hidden>
 
        * keyboard.c (parse_menu_item): Prepend "  " to the key sequence

=== modified file 'src/window.c'
--- a/src/window.c      2010-07-22 23:57:23 +0000
+++ b/src/window.c      2010-12-26 04:04:58 +0000
@@ -5856,6 +5856,12 @@
   int this_scroll_margin;
 #endif
 
+  if (!(BUFFERP (w->buffer)
+       && XBUFFER (w->buffer) == current_buffer))
+    /* This test is needed to make sure PT/PT_BYTE make sense in w->buffer
+       when passed below to set_marker_both.  */
+    error ("move-to-window-line called from unrelated buffer");
+  
   window = selected_window;
   start = marker_position (w->start);
   if (start < BEGV || start > ZV)