diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-21 11:12:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-21 11:12:38 -0700 |
| commit | 39f5e5198f666c1a00b9df957a17b2c3fe11a9ae (patch) | |
| tree | 3914d103d1086ab5ddf642594afd526a6ae4f1d3 | |
| parent | 5ffe6683c36bdaed21324ddd59cb47aecadea8ea (diff) | |
| download | emacs-39f5e5198f666c1a00b9df957a17b2c3fe11a9ae.tar.gz emacs-39f5e5198f666c1a00b9df957a17b2c3fe11a9ae.tar.bz2 emacs-39f5e5198f666c1a00b9df957a17b2c3fe11a9ae.zip | |
* frame.c (validate_x_resource_name): Simplify count usage.
This also avoids a warning with gcc -Wstrict-overflow.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/frame.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d833648667d..34104669a53 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,8 @@ * frame.c (Fmodify_frame_parameters): Simplify loop counter. This also avoids a warning with gcc -Wstrict-overflow. + (validate_x_resource_name): Simplify count usage. + This also avoids a warning with gcc -Wstrict-overflow. * fileio.c (Fcopy_file): Report error if fchown or fchmod fail (Bug#8306). diff --git a/src/frame.c b/src/frame.c index 60f192e9817..3e00e1bf107 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3713,8 +3713,7 @@ validate_x_resource_name (void) return; /* If name is entirely invalid, or nearly so, use `emacs'. */ - if (good_count == 0 - || (good_count == 1 && bad_count > 0)) + if (good_count < 2) { Vx_resource_name = build_string ("emacs"); return; |