diff options
| author | Kim F. Storm | 2004-06-17 08:33:27 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-06-17 08:33:27 +0000 |
| commit | 1891f34803c8ff687d5f1e48b5a00af2b4b55bfb (patch) | |
| tree | 1018c8c14c865f08f6c46f37ac4251f92091fe60 /src | |
| parent | f4af98d88f50c4afc245f80089c1d9b8938e575c (diff) | |
| download | emacs-1891f34803c8ff687d5f1e48b5a00af2b4b55bfb.tar.gz emacs-1891f34803c8ff687d5f1e48b5a00af2b4b55bfb.zip | |
Undo 2004-06-16T15:10:55Z!storm@cua.dk changes (committed accidentally)
except for the copyright year update.
Diffstat (limited to 'src')
| -rw-r--r-- | src/callproc.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/callproc.c b/src/callproc.c index 10e98ad1a36..c3345eb3707 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -130,8 +130,6 @@ int synch_process_termsig; | |||
| 130 | this is exit code of synchronous subprocess. */ | 130 | this is exit code of synchronous subprocess. */ |
| 131 | int synch_process_retcode; | 131 | int synch_process_retcode; |
| 132 | 132 | ||
| 133 | extern Lisp_Object Qredisplay_dont_pause; | ||
| 134 | |||
| 135 | extern Lisp_Object Vdoc_file_name; | 133 | extern Lisp_Object Vdoc_file_name; |
| 136 | 134 | ||
| 137 | extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system; | 135 | extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system; |
| @@ -222,7 +220,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 222 | int fd[2]; | 220 | int fd[2]; |
| 223 | int filefd; | 221 | int filefd; |
| 224 | register int pid; | 222 | register int pid; |
| 225 | char buf[16384*4]; | 223 | char buf[16384]; |
| 226 | char *bufptr = buf; | 224 | char *bufptr = buf; |
| 227 | int bufsize = sizeof buf; | 225 | int bufsize = sizeof buf; |
| 228 | int count = SPECPDL_INDEX (); | 226 | int count = SPECPDL_INDEX (); |
| @@ -773,7 +771,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 773 | 771 | ||
| 774 | if (this_read == 0) | 772 | if (this_read == 0) |
| 775 | { | 773 | { |
| 776 | // fprintf(stderr, "read 0, total=%d\n", total_read); | ||
| 777 | process_coding.mode |= CODING_MODE_LAST_BLOCK; | 774 | process_coding.mode |= CODING_MODE_LAST_BLOCK; |
| 778 | break; | 775 | break; |
| 779 | } | 776 | } |
| @@ -781,8 +778,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 781 | nread += this_read; | 778 | nread += this_read; |
| 782 | total_read += this_read; | 779 | total_read += this_read; |
| 783 | 780 | ||
| 784 | // fprintf(stderr, "read %d+%d of %d, total=%d\n", nread, this_read, bufsize, total_read); | ||
| 785 | |||
| 786 | if (display_on_the_fly) | 781 | if (display_on_the_fly) |
| 787 | break; | 782 | break; |
| 788 | } | 783 | } |
| @@ -835,8 +830,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 835 | continue; | 830 | continue; |
| 836 | } | 831 | } |
| 837 | 832 | ||
| 838 | // fprintf(stderr, "produced %d\n", process_coding.produced); | ||
| 839 | |||
| 840 | if (process_coding.produced > 0) | 833 | if (process_coding.produced > 0) |
| 841 | insert_1_both (decoding_buf, process_coding.produced_char, | 834 | insert_1_both (decoding_buf, process_coding.produced_char, |
| 842 | process_coding.produced, 0, 1, 0); | 835 | process_coding.produced, 0, 1, 0); |
| @@ -936,15 +929,10 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 936 | 929 | ||
| 937 | if (!NILP (display) && INTERACTIVE) | 930 | if (!NILP (display) && INTERACTIVE) |
| 938 | { | 931 | { |
| 939 | extern int windows_or_buffers_changed; | ||
| 940 | int count = SPECPDL_INDEX (); | ||
| 941 | |||
| 942 | if (first) | 932 | if (first) |
| 943 | prepare_menu_bars (); | 933 | prepare_menu_bars (); |
| 944 | first = 0; | 934 | first = 0; |
| 945 | specbind (Qredisplay_dont_pause, Qt); | ||
| 946 | redisplay_preserve_echo_area (1); | 935 | redisplay_preserve_echo_area (1); |
| 947 | unbind_to (count, Qnil); | ||
| 948 | } | 936 | } |
| 949 | immediate_quit = 1; | 937 | immediate_quit = 1; |
| 950 | QUIT; | 938 | QUIT; |