summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2007-11-07 15:31:20 +0000
committerChong Yidong <cyd@stupidchicken.com>2007-11-07 15:31:20 +0000
commit566242b78fad53044e4fee8f7271aa9a62a13d98 (patch)
tree702a643aec6d78111fe35a7cc40a6da40fc08c0c
parentebe7c7e71023de407998016be49fad97172cdd92 (diff)
downloademacs-566242b78fad53044e4fee8f7271aa9a62a13d98.tar.gz
(handle_face_prop): Fix last change.
-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)
Lisp_Object from_overlay
= (it->current.overlay_string_index >= 0
? it->string_overlays[it->current.overlay_string_index]
- : from_overlay);
+ : Qnil);
- /* See we got to this string directly or indirectly from
+ /* See if we got to this string directly or indirectly from
an overlay property. That includes the before-string or
after-string of an overlay, strings in display properties
provided by an overlay, their text properties, etc.