comparison src/xdisp.c @ 6066:4ff0c5c05867

(try_window, display_text_line): Use Fget_char_property to test for invisibility.
author Karl Heuer <kwzh@gnu.org>
date Thu, 24 Feb 1994 20:00:34 +0000
parents ab1aef4b0e07
children b634e16673ab
comparison
equal deleted inserted replaced
6065:ab1aef4b0e07 6066:4ff0c5c05867
1367 if (pos != val.bufpos) 1367 if (pos != val.bufpos)
1368 last_text_vpos 1368 last_text_vpos
1369 /* Next line, unless prev line ended in end of buffer with no cr */ 1369 /* Next line, unless prev line ended in end of buffer with no cr */
1370 = vpos - (val.vpos && (FETCH_CHAR (val.bufpos - 1) != '\n' 1370 = vpos - (val.vpos && (FETCH_CHAR (val.bufpos - 1) != '\n'
1371 #ifdef USE_TEXT_PROPERTIES 1371 #ifdef USE_TEXT_PROPERTIES
1372 || ! NILP (Fget_text_property (val.bufpos-1, 1372 || ! NILP (Fget_char_property (val.bufpos-1,
1373 Qinvisible, 1373 Qinvisible,
1374 Fcurrent_buffer ())) 1374 window))
1375 #endif 1375 #endif
1376 )); 1376 ));
1377 pos = val.bufpos; 1377 pos = val.bufpos;
1378 } 1378 }
1379 1379
2054 #ifdef USE_TEXT_PROPERTIES 2054 #ifdef USE_TEXT_PROPERTIES
2055 /* if the `invisible' property is set to t, we can skip to 2055 /* if the `invisible' property is set to t, we can skip to
2056 the next property change */ 2056 the next property change */
2057 while (pos == next_invisible && pos < end) 2057 while (pos == next_invisible && pos < end)
2058 { 2058 {
2059 Lisp_Object position, limit, endpos, prop; 2059 Lisp_Object position, limit, endpos, prop, ww;
2060 XFASTINT (position) = pos; 2060 XFASTINT (position) = pos;
2061 prop = Fget_text_property (position, Qinvisible, 2061 XSET (ww, Lisp_Window, w);
2062 Fcurrent_buffer ()); 2062 prop = Fget_char_property (position, Qinvisible, ww);
2063 /* This is just an estimate to give reasonable 2063 /* This is just an estimate to give reasonable
2064 performance; nothing should go wrong if it is too small. */ 2064 performance; nothing should go wrong if it is too small. */
2065 XFASTINT (limit) = pos + 50; 2065 XFASTINT (limit) = pos + 50;
2066 endpos 2066 endpos
2067 = Fnext_single_property_change (position, Qinvisible, 2067 = Fnext_single_property_change (position, Qinvisible,