Mercurial > emacs

changeset 55485:5f04932ca17c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(calc_line_height_property): Use string position when object is a string.
author Kim F. Storm <storm@cua.dk>
date Mon, 10 May 2004 11:16:37 +0000
parents 88b7471d7c2b
children a3e9f5b44041
files src/xdisp.c
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Mon May 10 11:15:55 2004 +0000
+++ b/src/xdisp.c	Mon May 10 11:16:37 2004 +0000
@@ -18529,12 +18529,16 @@
      XFontStruct *font;
      int boff, *total;
 {
-  Lisp_Object val;
+  Lisp_Object position, val;
   Lisp_Object face_name = Qnil;
   int ascent, descent, height, override;
 
-  val = Fget_char_property (make_number (IT_CHARPOS (*it)),
-			    prop, it->object);
+  if (STRINGP (it->object))
+    position = make_number (IT_STRING_CHARPOS (*it));
+  else
+    position = make_number (IT_CHARPOS (*it));
+
+  val = Fget_char_property (position, prop, it->object);
 
   if (NILP (val))
     return val;