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.h | |
| parent | 9b14d8b6f259a4d602f0c61689d6641e7ab20b49 (diff) | |
| download | emacs-4cc2f6918ddd44bf1f10a1d689b7bd769fcf6b8e.tar.gz emacs-4cc2f6918ddd44bf1f10a1d689b7bd769fcf6b8e.tar.bz2 emacs-4cc2f6918ddd44bf1f10a1d689b7bd769fcf6b8e.zip | |
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.h')
| -rw-r--r-- | src/charset.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/charset.h b/src/charset.h index 4176ce5ecc6..6c6c3e6479f 100644 --- a/src/charset.h +++ b/src/charset.h @@ -253,8 +253,7 @@ extern struct charset *charset_table; extern Lisp_Object Vcharset_ordered_list; extern Lisp_Object Vcharset_non_preferred_head; -/* Incremented everytime we change the priority of charsets. */ -extern unsigned short charset_ordered_list_tick; +extern EMACS_UINT charset_ordered_list_tick; extern Lisp_Object Viso_2022_charset_list; extern Lisp_Object Vemacs_mule_charset_list; |