diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-25 21:13:19 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-25 21:25:37 -0800 |
| commit | b3a3ed526d2c490c9c5605707f0cd7bff3c88693 (patch) | |
| tree | 096de6603250aafcab11c31876d39faecf1b2db4 /src/callproc.c | |
| parent | 1392ec7420ee23238a1588b759c631d87a677483 (diff) | |
| download | emacs-b3a3ed526d2c490c9c5605707f0cd7bff3c88693.tar.gz emacs-b3a3ed526d2c490c9c5605707f0cd7bff3c88693.tar.bz2 emacs-b3a3ed526d2c490c9c5605707f0cd7bff3c88693.zip | |
Replace QUIT with maybe_quit
There’s no longer need to have QUIT stand for a slug of C statements.
Use the more-obvious function-call syntax instead.
Also, use true and false when setting immediate_quit.
These changes should not affect the generated machine code.
* src/lisp.h (QUIT): Remove. All uses replaced by maybe_quit.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/callproc.c b/src/callproc.c index 90c15de2913..301ccf383b5 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -198,11 +198,11 @@ call_process_cleanup (Lisp_Object buffer) { kill (-synch_process_pid, SIGINT); message1 ("Waiting for process to die...(type C-g again to kill it instantly)"); - immediate_quit = 1; - QUIT; + immediate_quit = true; + maybe_quit (); wait_for_termination (synch_process_pid, 0, 1); synch_process_pid = 0; - immediate_quit = 0; + immediate_quit = false; message1 ("Waiting for process to die...done"); } #endif /* !MSDOS */ @@ -726,8 +726,8 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, process_coding.src_multibyte = 0; } - immediate_quit = 1; - QUIT; + immediate_quit = true; + maybe_quit (); if (0 <= fd0) { @@ -769,7 +769,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, } /* Now NREAD is the total amount of data in the buffer. */ - immediate_quit = 0; + immediate_quit = false; if (!nread) ; @@ -843,7 +843,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, display_on_the_fly = true; } immediate_quit = true; - QUIT; + maybe_quit (); } give_up: ; @@ -860,7 +860,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, wait_for_termination (pid, &status, fd0 < 0); #endif - immediate_quit = 0; + immediate_quit = false; /* Don't kill any children that the subprocess may have left behind when exiting. */ |