diff src/window.c @ 112098:40af77a50adc

Merge changes from emacs-23 branch

--- a/src/window.c	Sun Jan 02 11:23:02 2011 +0000
+++ b/src/window.c	Sun Jan 02 15:28:40 2011 -0500
@@ -5762,6 +5762,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)