* xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.

Add a FIXME comment, since the code still doesn't look right.

2 files changed, 11 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d0380e42e49..94ce2a9f6ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-06  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.
+        Add a FIXME comment, since the code still doesn't look right.
+
         current_column: Now returns EMACS_INT, fixing some iftc.
         * bytecode.c (Fbyte_code): Don't cast current_column () to int.
         * cmds.c (internal_self_insert): Likewise.
@@ -10,6 +13,7 @@
         to int.
         * xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
         Likewise.
+
         * cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
         not int or double, if they might contain a column number.
         * indent.c (current_column, Findent_to, indented_beyond_p):
diff --git a/src/xdisp.c b/src/xdisp.c
index 44cb7130119..44a317b5785 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22292,7 +22292,13 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym)
           if (metrics_upper.width >= metrics_lower.width)
             lower_xoff = (width - metrics_lower.width) / 2;
           else
-            upper_xoff = (width - metrics_upper.width) / 2;
+            {
+              /* FIXME: This code doesn't look right.  It formerly was
+                 missing the "lower_xoff = 0;", which couldn't have
+                 been right since it left lower_xoff uninitialized.  */
+              lower_xoff = 0;
+              upper_xoff = (width - metrics_upper.width) / 2;
+            }
         }
 
       /* +5 is for horizontal bars of a box plus 1-pixel spaces at