From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 24 Feb 1994 20:00:34 +0000 (+0000)
Subject: (try_window, display_text_line): Use Fget_char_property to test for invisibility.
X-Git-Tag: emacs-19.34~9786
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ae8ced7cb508d0b2958f78a9a47be9215bfe76b;p=emacs.git

(try_window, display_text_line): Use Fget_char_property to test for invisibility.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index f109060287c..da7af7d5b73 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1369,9 +1369,9 @@ try_window (window, pos)
 	  /* 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_text_property (val.bufpos-1,
+				 || ! NILP (Fget_char_property (val.bufpos-1,
 								Qinvisible,
-								Fcurrent_buffer ()))
+								window))
 #endif
 				 ));
       pos = val.bufpos;
@@ -2056,10 +2056,10 @@ display_text_line (w, start, vpos, hpos, taboffset)
 	     the next property change */
 	  while (pos == next_invisible && pos < end)
 	    {
-	      Lisp_Object position, limit, endpos, prop;
+	      Lisp_Object position, limit, endpos, prop, ww;
 	      XFASTINT (position) = pos;
-	      prop = Fget_text_property (position, Qinvisible,
-					 Fcurrent_buffer ());
+	      XSET (ww, Lisp_Window, 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.  */
 	      XFASTINT (limit) = pos + 50;