# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1293336298 18000
# Node ID e829321a29ffca3e2e959737c07fdfbe15efae3c
# Parent  f1e03f250c473db58c5402df76331d69df375bbb
* src/window.c (Fmove_to_window_line): Avoid abort when called in a buffer
different from selected-window's.

diff -r f1e03f250c47 -r e829321a29ff src/ChangeLog
--- a/src/ChangeLog	Sat Dec 25 21:20:45 2010 +0200
+++ b/src/ChangeLog	Sat Dec 25 23:04:58 2010 -0500
@@ -1,3 +1,8 @@
+2010-12-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* window.c (Fmove_to_window_line): Avoid abort when called in a buffer
+	different from selected-window's.
+
 2010-12-25  Eli Zaretskii  <eliz@gnu.org>
 
 	* keyboard.c (parse_menu_item): Prepend "  " to the key sequence
diff -r f1e03f250c47 -r e829321a29ff src/window.c
--- a/src/window.c	Sat Dec 25 21:20:45 2010 +0200
+++ b/src/window.c	Sat Dec 25 23:04:58 2010 -0500
@@ -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)