From 566242b78fad53044e4fee8f7271aa9a62a13d98 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 7 Nov 2007 15:31:20 +0000
Subject: [PATCH] (handle_face_prop): Fix last change.

---
 src/xdisp.c | 4 ++--
 1 file 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.
-- 
2.39.2