aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2007-11-07 15:31:20 +0000
committerChong Yidong2007-11-07 15:31:20 +0000
commit566242b78fad53044e4fee8f7271aa9a62a13d98 (patch)
tree702a643aec6d78111fe35a7cc40a6da40fc08c0c /src
parentebe7c7e71023de407998016be49fad97172cdd92 (diff)
downloademacs-566242b78fad53044e4fee8f7271aa9a62a13d98.tar.gz
emacs-566242b78fad53044e4fee8f7271aa9a62a13d98.zip
(handle_face_prop): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 60bca299bc1..4c78f6ac8f8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3369,9 +3369,9 @@ handle_face_prop (it)
3369 Lisp_Object from_overlay 3369 Lisp_Object from_overlay
3370 = (it->current.overlay_string_index >= 0 3370 = (it->current.overlay_string_index >= 0
3371 ? it->string_overlays[it->current.overlay_string_index] 3371 ? it->string_overlays[it->current.overlay_string_index]
3372 : from_overlay); 3372 : Qnil);
3373 3373
3374 /* See we got to this string directly or indirectly from 3374 /* See if we got to this string directly or indirectly from
3375 an overlay property. That includes the before-string or 3375 an overlay property. That includes the before-string or
3376 after-string of an overlay, strings in display properties 3376 after-string of an overlay, strings in display properties
3377 provided by an overlay, their text properties, etc. 3377 provided by an overlay, their text properties, etc.