diff options
| author | Paul Eggert | 2017-05-16 10:24:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-05-16 10:27:41 -0700 |
| commit | 2e1bebe279b7108f74c3a1e7e30e8a43c2cfa31f (patch) | |
| tree | 869b2d36a6a07dca857254202d620358c004489f /src/xterm.c | |
| parent | 138c8256f41f242341c7d146c99f4e6fa267a638 (diff) | |
| download | emacs-2e1bebe279b7108f74c3a1e7e30e8a43c2cfa31f.tar.gz emacs-2e1bebe279b7108f74c3a1e7e30e8a43c2cfa31f.zip | |
Merge with gnulib, pacifying GCC 7
This incorporates:
2017-05-16 manywarnings: update for GCC 7
2017-05-15 sys_select: Avoid "was expanded before it was required"
* configure.ac (nw): Suppress GCC 7’s new -Wduplicated-branches and
-Wformat-overflow=2 options, due to too many false alarms.
* doc/misc/texinfo.tex, lib/strftime.c, m4/manywarnings.m4:
Copy from gnulib.
* m4/gnulib-comp.m4: Regenerate.
* src/coding.c (decode_coding_iso_2022):
Fix bug uncovered by -Wimplicit-fallthrough.
* src/conf_post.h (FALLTHROUGH): New macro.
Use it to mark all switch cases that fall through.
* src/editfns.c (styled_format): Use !, not ~, on bool.
* src/gtkutil.c (xg_check_special_colors):
When using sprintf, don’t trust Gtk to output colors in [0, 1] range.
(xg_update_scrollbar_pos): Avoid use of possibly-uninitialized bool;
this bug was actually caught by Clang.
* src/search.c (boyer_moore):
Tell GCC that CHAR_BASE, if nonzero, must be a non-ASCII character.
* src/xterm.c (x_draw_glyphless_glyph_string_foreground):
Tell GCC that glyph->u.glyphless.ch must be a character.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c index e9068830f85..c8836b7ca78 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -2005,9 +2005,9 @@ x_draw_glyphless_glyph_string_foreground (struct glyph_string *s) | |||
| 2005 | } | 2005 | } |
| 2006 | else if (glyph->u.glyphless.method == GLYPHLESS_DISPLAY_HEX_CODE) | 2006 | else if (glyph->u.glyphless.method == GLYPHLESS_DISPLAY_HEX_CODE) |
| 2007 | { | 2007 | { |
| 2008 | sprintf (buf, "%0*X", | 2008 | unsigned int ch = glyph->u.glyphless.ch; |
| 2009 | glyph->u.glyphless.ch < 0x10000 ? 4 : 6, | 2009 | eassume (ch <= MAX_CHAR); |
| 2010 | glyph->u.glyphless.ch + 0u); | 2010 | sprintf (buf, "%0*X", ch < 0x10000 ? 4 : 6, ch); |
| 2011 | str = buf; | 2011 | str = buf; |
| 2012 | } | 2012 | } |
| 2013 | 2013 | ||
| @@ -8949,7 +8949,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 8949 | { | 8949 | { |
| 8950 | case MappingModifier: | 8950 | case MappingModifier: |
| 8951 | x_find_modifier_meanings (dpyinfo); | 8951 | x_find_modifier_meanings (dpyinfo); |
| 8952 | /* This is meant to fall through. */ | 8952 | FALLTHROUGH; |
| 8953 | case MappingKeyboard: | 8953 | case MappingKeyboard: |
| 8954 | XRefreshKeyboardMapping ((XMappingEvent *) &event->xmapping); | 8954 | XRefreshKeyboardMapping ((XMappingEvent *) &event->xmapping); |
| 8955 | } | 8955 | } |