aboutsummaryrefslogtreecommitdiffstats
path: root/src/editfns.c
diff options
context:
space:
mode:
authorPaul Eggert2017-05-16 10:24:19 -0700
committerPaul Eggert2017-05-16 10:27:41 -0700
commit2e1bebe279b7108f74c3a1e7e30e8a43c2cfa31f (patch)
tree869b2d36a6a07dca857254202d620358c004489f /src/editfns.c
parent138c8256f41f242341c7d146c99f4e6fa267a638 (diff)
downloademacs-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/editfns.c')
-rw-r--r--src/editfns.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 38530437a2f..ecb8e3f0838 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1595,10 +1595,10 @@ time_arith (Lisp_Object a, Lisp_Object b,
1595 { 1595 {
1596 default: 1596 default:
1597 val = Fcons (make_number (t.ps), val); 1597 val = Fcons (make_number (t.ps), val);
1598 /* Fall through. */ 1598 FALLTHROUGH;
1599 case 3: 1599 case 3:
1600 val = Fcons (make_number (t.us), val); 1600 val = Fcons (make_number (t.us), val);
1601 /* Fall through. */ 1601 FALLTHROUGH;
1602 case 2: 1602 case 2:
1603 val = Fcons (make_number (t.lo), val); 1603 val = Fcons (make_number (t.lo), val);
1604 val = Fcons (make_number (t.hi), val); 1604 val = Fcons (make_number (t.hi), val);
@@ -4072,8 +4072,8 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
4072 } 4072 }
4073 4073
4074 /* Ignore flags when sprintf ignores them. */ 4074 /* Ignore flags when sprintf ignores them. */
4075 space_flag &= ~ plus_flag; 4075 space_flag &= ! plus_flag;
4076 zero_flag &= ~ minus_flag; 4076 zero_flag &= ! minus_flag;
4077 4077
4078 char *num_end; 4078 char *num_end;
4079 uintmax_t raw_field_width = strtoumax (format, &num_end, 10); 4079 uintmax_t raw_field_width = strtoumax (format, &num_end, 10);
@@ -4311,7 +4311,7 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
4311 { 4311 {
4312 memcpy (f, pMd, pMlen); 4312 memcpy (f, pMd, pMlen);
4313 f += pMlen; 4313 f += pMlen;
4314 zero_flag &= ~ precision_given; 4314 zero_flag &= ! precision_given;
4315 } 4315 }
4316 *f++ = conversion; 4316 *f++ = conversion;
4317 *f = '\0'; 4317 *f = '\0';