diff options
| author | Paul Eggert | 2011-06-18 11:09:17 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-18 11:09:17 -0700 |
| commit | f2ed8a709551a7125d2e024757262c5bf770766b (patch) | |
| tree | 243e64b1b0c310497411df131e4aea0ada4de9e0 /src/composite.c | |
| parent | e1528d010f497f97d660902b8a8727fc1b77f53b (diff) | |
| download | emacs-f2ed8a709551a7125d2e024757262c5bf770766b.tar.gz emacs-f2ed8a709551a7125d2e024757262c5bf770766b.zip | |
* lisp.h (lint_assume): New macro.
* composite.c (composition_gstring_put_cache):
* ftfont.c (ftfont_shape_by_flt): Use it to pacify GCC 4.6.0.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/composite.c b/src/composite.c index 1bc7b435e11..f494f454a9c 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -680,6 +680,7 @@ composition_gstring_put_cache (Lisp_Object gstring, EMACS_INT len) | |||
| 680 | len = j; | 680 | len = j; |
| 681 | } | 681 | } |
| 682 | 682 | ||
| 683 | lint_assume (len <= TYPE_MAXIMUM (EMACS_INT) - 2); | ||
| 683 | copy = Fmake_vector (make_number (len + 2), Qnil); | 684 | copy = Fmake_vector (make_number (len + 2), Qnil); |
| 684 | LGSTRING_SET_HEADER (copy, Fcopy_sequence (header)); | 685 | LGSTRING_SET_HEADER (copy, Fcopy_sequence (header)); |
| 685 | for (i = 0; i < len; i++) | 686 | for (i = 0; i < len; i++) |