diff options
| author | Paul Eggert | 2012-09-02 10:10:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-02 10:10:35 -0700 |
| commit | 1882aa387874f0ac0965fa7bec1c5760dc37e48f (patch) | |
| tree | 27cfcfb9f16c55a0bf84a5c91a5efd20f495ef55 /src/process.c | |
| parent | a411ac43d3667d042fa36361275eccbe9aca80af (diff) | |
| download | emacs-1882aa387874f0ac0965fa7bec1c5760dc37e48f.tar.gz emacs-1882aa387874f0ac0965fa7bec1c5760dc37e48f.zip | |
* emacs.c, eval.c: Use bool for boolean.
* emacs.c (initialized, inhibit_window_system, running_asynch_code):
(malloc_using_checking) [DOUG_LEA_MALLOC]:
(display_arg) [HAVE_X_WINDOWS || HAVE_NS]:
(noninteractive, no_site_lisp, fatal_error_in_progress, argmatch)
(main, decode_env_path, Fdaemon_initialized):
* eval.c (call_debugger, Finteractive_p, interactive_p):
(unwind_to_catch, Fsignal, wants_debugger, skip_debugger)
(maybe_call_debugger, Fbacktrace):
* process.c (read_process_output, exec_sentinel):
Use bool for booleans.
* emacs.c (shut_down_emacs): Omit unused boolean argument NO_X.
All callers changed.
* eval.c (interactive_p): Omit always-true boolean argument
EXCLUDE_SUBRS_P. All callers changed.
* dispextern.h, lisp.h: Reflect above API changes.
* firstfile.c (dummy): Use the address of 'main', whose signature
won't change, instead of the address of 'initialize', whose
signature just changed from int to bool.
* lisp.h (fatal_error_in_progress): New decl of boolean, moved here ...
* msdos.c (fatal_error_in_progress): ... from here.
* xdisp.c (redisplaying_p): Now a boolean. Set it to 1 instead
of incrementing it.
(redisplay_internal, unwind_redisplay): Simply clear
REDISPLAYING_P when unwinding, instead of saving its previous,
always-false value and then restoring it.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index 81fa98a028d..04b6abe50a7 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5194,7 +5194,7 @@ read_process_output (Lisp_Object proc, register int channel) | |||
| 5194 | if (!NILP (outstream)) | 5194 | if (!NILP (outstream)) |
| 5195 | { | 5195 | { |
| 5196 | Lisp_Object text; | 5196 | Lisp_Object text; |
| 5197 | int outer_running_asynch_code = running_asynch_code; | 5197 | bool outer_running_asynch_code = running_asynch_code; |
| 5198 | int waiting = waiting_for_user_input_p; | 5198 | int waiting = waiting_for_user_input_p; |
| 5199 | 5199 | ||
| 5200 | /* No need to gcpro these, because all we do with them later | 5200 | /* No need to gcpro these, because all we do with them later |
| @@ -6558,9 +6558,9 @@ static void | |||
| 6558 | exec_sentinel (Lisp_Object proc, Lisp_Object reason) | 6558 | exec_sentinel (Lisp_Object proc, Lisp_Object reason) |
| 6559 | { | 6559 | { |
| 6560 | Lisp_Object sentinel, odeactivate; | 6560 | Lisp_Object sentinel, odeactivate; |
| 6561 | register struct Lisp_Process *p = XPROCESS (proc); | 6561 | struct Lisp_Process *p = XPROCESS (proc); |
| 6562 | ptrdiff_t count = SPECPDL_INDEX (); | 6562 | ptrdiff_t count = SPECPDL_INDEX (); |
| 6563 | int outer_running_asynch_code = running_asynch_code; | 6563 | bool outer_running_asynch_code = running_asynch_code; |
| 6564 | int waiting = waiting_for_user_input_p; | 6564 | int waiting = waiting_for_user_input_p; |
| 6565 | 6565 | ||
| 6566 | if (inhibit_sentinels) | 6566 | if (inhibit_sentinels) |