* 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 4c2f2ec59d64667b3c9eace0fd7c8bb80c0d272c..51ab3396ef376901a54ea40af9ed16689b3d2932 100644 (file)
--- 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 f01ae323c0d1280d691bc6b3323281b9bb386409..1080eb0960cba954fed4853d9c02e3eb028a5dfb 100644 (file)
--- 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;