# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 785022255 0
# Node ID 0a50658ec6f9c1b4c2cc0875ce38ca799b3a3001
# Parent  df605fcd1e75abc302ef0e6ff5c7b43461ee1f7e
(try_window, display_text_line): Undo previous change.

diff -r df605fcd1e75 -r 0a50658ec6f9 src/xdisp.c
--- a/src/xdisp.c	Wed Nov 16 20:35:34 1994 +0000
+++ b/src/xdisp.c	Wed Nov 16 21:44:15 1994 +0000
@@ -1447,19 +1447,15 @@
       if (val.vpos) tab_offset = 0;
       vpos++;
       if (pos != val.bufpos)
-	{
-	  last_text_vpos = vpos;
-	  /* Next line, unless prev line ended in end of buffer with no cr.  */
-	  if (val.vpos && (FETCH_CHAR (val.bufpos - 1) != '\n'
+	last_text_vpos
+	  /* Next line, unless prev line ended in end of buffer with no cr */
+	  = vpos - (val.vpos && (FETCH_CHAR (val.bufpos - 1) != '\n'
 #ifdef USE_TEXT_PROPERTIES
-			   || ! NILP (Fget_char_property
-				      (val.bufpos-1,
-				       Qinvisible,
-				       XWINDOW (window)->buffer))
+				 || ! NILP (Fget_char_property (val.bufpos-1,
+								Qinvisible,
+								window))
 #endif
-			   ))
-	    --last_text_vpos;
-	}
+				 ));
       pos = val.bufpos;
     }
 
@@ -2256,17 +2252,17 @@
 	     the next property change */
 	  while (pos == next_invisible && pos < end)
 	    {
-	      Lisp_Object position, limit, endpos, prop;
+	      Lisp_Object position, limit, endpos, prop, ww;
 	      XSETFASTINT (position, pos);
-	      prop = Fget_char_property (position, Qinvisible, w->buffer);
+	      XSETWINDOW (ww, w);
+	      prop = Fget_char_property (position, Qinvisible, ww);
 	      /* This is just an estimate to give reasonable
 		 performance; nothing should go wrong if it is too small.  */
 	      limit = Fnext_overlay_change (position);
 	      if (XFASTINT (limit) > pos + 50)
 		XSETFASTINT (limit, pos + 50);
 	      endpos = Fnext_single_property_change (position, Qinvisible,
-						     Fcurrent_buffer (),
-						     limit);
+						Fcurrent_buffer (), limit);
 	      if (INTEGERP (endpos))
 		next_invisible = XINT (endpos);
 	      else