* dispnew.c: Use bool for boolean.

(frame_garbaged, display_completed, delayed_size_change)
(fonts_changed_p, add_window_display_history)
(add_frame_display_history, verify_row_hash)
(adjust_glyph_matrix, clear_window_matrices, glyph_row_slice_p)
(row_equal_p, realloc_glyph_pool)
(allocate_matrices_for_frame_redisplay)
(showing_window_margins_p)
(adjust_frame_glyphs_for_frame_redisplay)
(build_frame_matrix_from_leaf_window, make_current)
(mirrored_line_dance, mirror_line_dance, update_frame)
(update_window_tree, update_single_window)
(check_current_matrix_flags, update_window, update_text_area)
(update_window_line, set_window_update_flags, scrolling_window)
(update_frame_1, scrolling, buffer_posn_from_coords)
(do_pending_window_change, change_frame_size)
(change_frame_size_1, sit_for):
Use bool for boolean.
(clear_glyph_matrix_rows): Rename from enable_glyph_matrix_rows,
and remove last int (actually boolean) argument, which was always 0.
All callers changed.
* dispextern.h, frame.h, lisp.h: Reflect above API changes.
* dispextern.h (struct composition_it): Use bool for boolean.
(struct glyph_matrix): Don't assume buffer sizes can fit in 'int'.
(struct bidi_it): Use unsigned:1, not int, for boolean prev_was_pdf.
* dired.c (file_name_completion):
Use bool for boolean.  (This was missed in an earlier change.)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/dired.c b/src/dired.c
index 206f370ed63..fa293258107 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -460,7 +460,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
   Lisp_Object encoded_file;
   Lisp_Object encoded_dir;
   struct stat st;
-  int directoryp;
+  bool directoryp;
   /* If not INCLUDEALL, exclude files in completion-ignored-extensions as
      well as "." and "..".  Until shown otherwise, assume we can't exclude
      anything.  */
@@ -530,7 +530,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
       if (file_name_completion_stat (encoded_dir, dp, &st) < 0)
         continue;
 
-      directoryp = S_ISDIR (st.st_mode);
+      directoryp = S_ISDIR (st.st_mode) != 0;
       tem = Qnil;
       /* If all_flag is set, always include all.
          It would not actually be helpful to the user to ignore any possible
@@ -718,7 +718,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
               /* This tests that the current file is an exact match
                  but BESTMATCH is not (it is too long).  */
               if ((matchsize == SCHARS (name)
-                   && matchsize + !!directoryp < SCHARS (bestmatch))
+                   && matchsize + directoryp < SCHARS (bestmatch))
                   ||
                   /* If there is no exact match ignoring case,
                      prefer a match that does not change the case
@@ -730,7 +730,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
                      either both or neither are exact.  */
                   (((matchsize == SCHARS (name))
                     ==
-                    (matchsize + !!directoryp == SCHARS (bestmatch)))
+                    (matchsize + directoryp == SCHARS (bestmatch)))
                    && (cmp = Fcompare_strings (name, zero,
                                                make_number (SCHARS (file)),
                                                file, zero,