diff options
| author | Paul Eggert | 2012-08-21 16:39:56 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-08-21 16:39:56 -0700 |
| commit | fce31d69dc4d6ff8810d499deebe568437fbf38b (patch) | |
| tree | 4deb5628e430c3f756d235cdbb87244680636173 /src/editfns.c | |
| parent | d0d2d26fba3df1121108fcf80e4a26549d7736a3 (diff) | |
| download | emacs-fce31d69dc4d6ff8810d499deebe568437fbf38b.tar.gz emacs-fce31d69dc4d6ff8810d499deebe568437fbf38b.zip | |
* alloc.c: Use bool for booleans.
(gc_in_progress, abort_on_gc)
(setjmp_tested_p) [!GC_SAVE_REGISTERS_ON_STACK && !GC_SETJMP_WORKS]:
(dont_register_blocks) [GC_MALLOC_CHECK]:
(suppress_checking) [ENABLE_CHECKING]: Now bool, not int.
(check_string_bytes, make_specified_string, memory_full)
(live_string_p, live_cons_p, live_symbol_p, live_float_p)
(live_misc_p, live_vector_p, live_buffer_p, mark_maybe_object)
(mark_stack, valid_pointer_p, make_pure_string)
(Fgarbage_collect, survives_gc_p, gc_sweep):
Use bool for booleans, instead of int.
(test_setjmp) [!GC_SAVE_REGISTERS_ON_STACK && !GC_SETJMP_WORKS]:
Remove unused local.
* alloc.c (PURE_POINTER_P):
* lisp.h (STRING_MULTIBYTE): Document that it returns a boolean.
* editfns.c (Fformat):
* fileio.c (Fexpand_file_name, Fsubstitute_in_file_name)
(Fdo_auto_save):
* fns.c (sweep_weak_table):
* lisp.h (suppress_checking, push_message, survives_gc_p)
(make_pure_string, gc_in_progress, abort_on_gc):
* lread.c (readchar, read1):
* print.c (Fprin1_to_string):
* xdisp.c (push_message):
Use bool for booleans affected directly or indirectly by
alloc.c's changes.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/editfns.c b/src/editfns.c index fa57edead28..0bd632d14b7 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3642,13 +3642,13 @@ usage: (format STRING &rest OBJECTS) */) | |||
| 3642 | ptrdiff_t max_bufsize = STRING_BYTES_BOUND + 1; | 3642 | ptrdiff_t max_bufsize = STRING_BYTES_BOUND + 1; |
| 3643 | char *p; | 3643 | char *p; |
| 3644 | Lisp_Object buf_save_value IF_LINT (= {0}); | 3644 | Lisp_Object buf_save_value IF_LINT (= {0}); |
| 3645 | register char *format, *end, *format_start; | 3645 | char *format, *end, *format_start; |
| 3646 | ptrdiff_t formatlen, nchars; | 3646 | ptrdiff_t formatlen, nchars; |
| 3647 | /* Nonzero if the format is multibyte. */ | 3647 | /* True if the format is multibyte. */ |
| 3648 | int multibyte_format = 0; | 3648 | bool multibyte_format = 0; |
| 3649 | /* Nonzero if the output should be a multibyte string, | 3649 | /* True if the output should be a multibyte string, |
| 3650 | which is true if any of the inputs is one. */ | 3650 | which is true if any of the inputs is one. */ |
| 3651 | int multibyte = 0; | 3651 | bool multibyte = 0; |
| 3652 | /* When we make a multibyte string, we must pay attention to the | 3652 | /* When we make a multibyte string, we must pay attention to the |
| 3653 | byte combining problem, i.e., a byte may be combined with a | 3653 | byte combining problem, i.e., a byte may be combined with a |
| 3654 | multibyte character of the previous string. This flag tells if we | 3654 | multibyte character of the previous string. This flag tells if we |