diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-20 15:20:56 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-20 15:50:45 -0800 |
| commit | 4cc2f6918ddd44bf1f10a1d689b7bd769fcf6b8e (patch) | |
| tree | 0f92d4a3a99608cf45a3f05283144ba160ceba01 /src/charset.c | |
| parent | 9b14d8b6f259a4d602f0c61689d6641e7ab20b49 (diff) | |
| download | emacs-4cc2f6918ddd44bf1f10a1d689b7bd769fcf6b8e.tar.gz | |
Let charset tick grow past USHRT_MAX
* charset.c, charset.h (charset_ordered_list_tick):
Now EMACS_UINT, not unsigned short.
* fontset.c (reorder_font_vector): Allow the tick to grow to the
maximum representable Emacs integer value before wrapping it around.
Diffstat (limited to 'src/charset.c')
| -rw-r--r-- | src/charset.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/charset.c b/src/charset.c index 171a00f23d1..9ad7de67146 100644 --- a/src/charset.c +++ b/src/charset.c @@ -101,10 +101,9 @@ Lisp_Object Vcharset_ordered_list; charsets. */ Lisp_Object Vcharset_non_preferred_head; -/* Incremented everytime we change Vcharset_ordered_list. This is - unsigned short so that it fits in Lisp_Int and never matches - -1. */ -unsigned short charset_ordered_list_tick; +/* Incremented every time we change the priority of charsets. + Wraps around. */*/ +EMACS_UINT charset_ordered_list_tick; /* List of iso-2022 charsets. */ Lisp_Object Viso_2022_charset_list; |