From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 20 Dec 2014 23:49:04 +0000 (-0800)
Subject: * composite.h (struct composition.width): Now int
X-Git-Tag: emacs-25.0.90~2635^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67bb1c1944ef69710e9d36420bc01e2183941358;p=emacs.git

* composite.h (struct composition.width): Now int

instead of unsigned short, as we prefer signed integers.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c2f2ec59d6..51ab3396ef3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-12-20  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* composite.h (struct composition.width): Now int
+	instead of unsigned short, as we prefer signed integers.
+
 	Let charset tick grow past USHRT_MAX
 	* charset.c, charset.h (charset_ordered_list_tick):
 	Now EMACS_UINT, not unsigned short.
diff --git a/src/composite.h b/src/composite.h
index f01ae323c0d..1080eb0960c 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -156,7 +156,7 @@ struct composition {
   /* How many columns the overall glyphs occupy on the screen.  This
      gives an approximate value for column calculation in
      Fcurrent_column, and etc.  */
-  unsigned short width;
+  int width;
 
   /* Method of the composition.  */
   enum composition_method method;