[Emacs-diffs] master 67bb1c1 2/2: * composite.h (struct composition.width): Now int

[Paul Eggert]

branch: master
commit 67bb1c1944ef69710e9d36420bc01e2183941358
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    * composite.h (struct composition.width): Now int
    
    instead of unsigned short, as we prefer signed integers.
---
 src/ChangeLog   |    3 +++
 src/composite.h |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c2f2ec..51ab339 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-12-20  Paul Eggert  <address@hidden>
 
+       * 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 f01ae32..1080eb0 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;