diff options
| author | Paul Eggert | 2013-03-08 13:37:41 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-03-08 13:37:41 -0800 |
| commit | 457882c20c301f076ff6a4ef7ffd78ed3d35e699 (patch) | |
| tree | f5295ec9fd8cdf57a90b99a52be684cf71b4361b /src/scroll.c | |
| parent | b5426561089d39f18b42bed9dbfcb531f43ed562 (diff) | |
| download | emacs-457882c20c301f076ff6a4ef7ffd78ed3d35e699.tar.gz emacs-457882c20c301f076ff6a4ef7ffd78ed3d35e699.zip | |
region-cache.c, scroll.c, search.c: Use bool for booleans.
* lisp.h (compile_pattern):
* scroll.c (do_scrolling, do_direct_scrolling):
* search.c (struct regexp_cache, compile_pattern_1)
(compile_pattern, string_match_1, search_command)
(trivial_regexp_p, search_buffer, Freplace_match, match_limit)
(search_regs_saved, Fregexp_quote):
Use bool for boolean.
* region-cache.c (region_cache_forward, region_cache_backward):
Fix comments to match code: these functions return int, not boolean.
Diffstat (limited to 'src/scroll.c')
| -rw-r--r-- | src/scroll.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/scroll.c b/src/scroll.c index 9e11feb64d4..037e338c696 100644 --- a/src/scroll.c +++ b/src/scroll.c | |||
| @@ -246,9 +246,8 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, | |||
| 246 | struct matrix_elt *p; | 246 | struct matrix_elt *p; |
| 247 | int i, j, k; | 247 | int i, j, k; |
| 248 | 248 | ||
| 249 | /* Set to 1 if we have set a terminal window with | 249 | /* True if we have set a terminal window with set_terminal_window. */ |
| 250 | set_terminal_window. It's unsigned to work around GCC bug 48228. */ | 250 | bool terminal_window_p = 0; |
| 251 | unsigned int terminal_window_p = 0; | ||
| 252 | 251 | ||
| 253 | /* A queue for line insertions to be done. */ | 252 | /* A queue for line insertions to be done. */ |
| 254 | struct queue { int count, pos; }; | 253 | struct queue { int count, pos; }; |
| @@ -657,18 +656,16 @@ do_direct_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, | |||
| 657 | alloca (window_size * sizeof *queue_start); | 656 | alloca (window_size * sizeof *queue_start); |
| 658 | struct alt_queue *queue = queue_start; | 657 | struct alt_queue *queue = queue_start; |
| 659 | 658 | ||
| 660 | /* Set to 1 if a terminal window has been set with | 659 | /* True if a terminal window has been set with set_terminal_window. */ |
| 661 | set_terminal_window: */ | 660 | bool terminal_window_p = 0; |
| 662 | int terminal_window_p = 0; | ||
| 663 | 661 | ||
| 664 | /* A nonzero value of write_follows indicates that a write has been | 662 | /* If true, a write has been selected, allowing either an insert or a |
| 665 | selected, allowing either an insert or a delete to be selected | 663 | delete to be selected next. If false, a delete cannot be selected |
| 666 | next. When write_follows is zero, a delete cannot be selected | ||
| 667 | unless j < i, and an insert cannot be selected unless i < j. | 664 | unless j < i, and an insert cannot be selected unless i < j. |
| 668 | This corresponds to a similar restriction (with the ordering | 665 | This corresponds to a similar restriction (with the ordering |
| 669 | reversed) in calculate_direct_scrolling, which is intended to | 666 | reversed) in calculate_direct_scrolling, which is intended to |
| 670 | ensure that lines marked as inserted will be blank. */ | 667 | ensure that lines marked as inserted will be blank. */ |
| 671 | int write_follows_p = 1; | 668 | bool write_follows_p = 1; |
| 672 | 669 | ||
| 673 | /* For each row in the new matrix what row of the old matrix it is. */ | 670 | /* For each row in the new matrix what row of the old matrix it is. */ |
| 674 | int *copy_from = alloca (window_size * sizeof *copy_from); | 671 | int *copy_from = alloca (window_size * sizeof *copy_from); |