diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-10 17:48:57 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-10 17:48:57 -0700 |
| commit | b3ed13e84d591eeb2f0dde2e7c2558e7abcc66ca (patch) | |
| tree | 747ac2d7805b50b1c83be62888a367b2f13061e2 /src/composite.c | |
| parent | fe252976a18bf7bb66009fa80c1c6f02b124404f (diff) | |
| download | emacs-b3ed13e84d591eeb2f0dde2e7c2558e7abcc66ca.tar.gz emacs-b3ed13e84d591eeb2f0dde2e7c2558e7abcc66ca.tar.bz2 emacs-b3ed13e84d591eeb2f0dde2e7c2558e7abcc66ca.zip | |
Pacify --enable-gcc-warnings when no window system is used.
These warnings found that subscript error, so they seem worthwhile.
* composite.c (char_composable_p): Simplify a bit.
* frame.c (x_set_frame_parameters): Add an IF_LINT.
* frame.c (x_set_horizontal_scroll_bars, x_set_scroll_bar_height):
* frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS):
* window.c (set_window_scroll_bars):
Use USE_HORIZONTAL_SCROLL_BARS for simplicity.
* frame.h [! USE_HORIZONTAL_SCROLL_BARS]:
Ignore -Wsuggest-attribute=const.
* window.h (USE_HORIZONTAL_SCROLL_BARS): New macro.
(WINDOW_HAS_HORIZONTAL_SCROLL_BAR): Use it.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/composite.c b/src/composite.c index 66a20759ec6..1b1960d1c4d 100644 --- a/src/composite.c +++ b/src/composite.c @@ -928,7 +928,7 @@ static bool char_composable_p (int c) { Lisp_Object val; - return (c > ' ' + return (c > ' ' && (c == 0x200C || c == 0x200D || (val = CHAR_TABLE_REF (Vunicode_category_table, c), (INTEGERP (val) && (XINT (val) <= UNICODE_CATEGORY_So))))); @@ -1016,24 +1016,19 @@ composition_compute_stop_pos (struct composition_it *cmp_it, ptrdiff_t charpos, val = CHAR_TABLE_REF (Vcomposition_function_table, c); if (! NILP (val)) { - Lisp_Object elt; - int ridx; - - for (ridx = 0; CONSP (val); val = XCDR (val), ridx++) + for (int ridx = 0; CONSP (val); val = XCDR (val), ridx++) { - elt = XCAR (val); + Lisp_Object elt = XCAR (val); if (VECTORP (elt) && ASIZE (elt) == 3 && NATNUMP (AREF (elt, 1)) && charpos - 1 - XFASTINT (AREF (elt, 1)) >= start) - break; - } - if (CONSP (val)) - { - cmp_it->rule_idx = ridx; - cmp_it->lookback = XFASTINT (AREF (elt, 1)); - cmp_it->stop_pos = charpos - 1 - cmp_it->lookback; - cmp_it->ch = c; - return; + { + cmp_it->rule_idx = ridx; + cmp_it->lookback = XFASTINT (AREF (elt, 1)); + cmp_it->stop_pos = charpos - 1 - cmp_it->lookback; + cmp_it->ch = c; + return; + } } } } |