diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-26 06:17:25 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-26 06:17:25 -0700 |
| commit | 9e9f8582a893f1e97b1f8955f69b96f969ee1f85 (patch) | |
| tree | ef8b4c36f8b88d1273572b8140a8651854b65e6b /src/font.c | |
| parent | 54e3f15626296c1ece932852df2b3d4938b0b44a (diff) | |
| download | emacs-9e9f8582a893f1e97b1f8955f69b96f969ee1f85.tar.gz | |
Revert previous change.
There is certainly nothing wrong with writing code like 'lo <= i
&& i <= hi', even if LO happens to a constant. There isn't even
anything wrong in general with writing 'a <= b' if A happens to
be a constant. At any rate stylistic changes shouldn't
be done like this without discussion.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/font.c b/src/font.c index ee6d230e171..054a68bfd94 100644 --- a/src/font.c +++ b/src/font.c @@ -280,7 +280,7 @@ font_intern_prop (const char *str, ptrdiff_t len, bool force_symbol) if (len == 1 && *str == '*') return Qnil; - if (!force_symbol && len > 0 && '0' <= *str && *str <= '9') + if (!force_symbol && 0 < len && '0' <= *str && *str <= '9') { for (i = 1; i < len; i++) if (! ('0' <= str[i] && str[i] <= '9')) @@ -445,10 +445,10 @@ font_style_symbolic (Lisp_Object font, enum font_property_index prop, table = AREF (font_style_table, prop - FONT_WEIGHT_INDEX); CHECK_VECTOR (table); i = XINT (val) & 0xFF; - eassert (ASIZE (table) > ((i >> 4) & 0xF)); + eassert (((i >> 4) & 0xF) < ASIZE (table)); elt = AREF (table, ((i >> 4) & 0xF)); CHECK_VECTOR (elt); - eassert (ASIZE (elt) > (i & 0xF) + 1); + eassert ((i & 0xF) + 1 < ASIZE (elt)); elt = (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); CHECK_SYMBOL (elt); return elt; |