Commit 39f5e519 authored by Paul Eggert's avatar Paul Eggert
Browse files

* frame.c (validate_x_resource_name): Simplify count usage.

This also avoids a warning with gcc -Wstrict-overflow.
parent 5ffe6683
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
   
* frame.c (Fmodify_frame_parameters): Simplify loop counter. * frame.c (Fmodify_frame_parameters): Simplify loop counter.
This also avoids a warning with gcc -Wstrict-overflow. 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 * fileio.c (Fcopy_file): Report error if fchown or fchmod
fail (Bug#8306). fail (Bug#8306).
...@@ -3713,8 +3713,7 @@ validate_x_resource_name (void) ...@@ -3713,8 +3713,7 @@ validate_x_resource_name (void)
return; return;
/* If name is entirely invalid, or nearly so, use `emacs'. */ /* If name is entirely invalid, or nearly so, use `emacs'. */
if (good_count == 0 if (good_count < 2)
|| (good_count == 1 && bad_count > 0))
{ {
Vx_resource_name = build_string ("emacs"); Vx_resource_name = build_string ("emacs");
return; return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment