diff options
| author | Stefan Monnier | 2010-09-30 01:28:20 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-09-30 01:28:20 +0200 |
| commit | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (patch) | |
| tree | 94b28b19c8f1536e76ffe7d5826811b74a79e3a5 /src/callproc.c | |
| parent | cc390e46c7ba95b76ea133d98fd386214cd01709 (diff) | |
| parent | 6b0f7311f16646e0de2045b2410e20921901c616 (diff) | |
| download | emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.tar.gz emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.zip | |
Merge from trunk
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c index 8c1384df6a1..6f70631a484 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -678,9 +678,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 678 | QUIT; | 678 | QUIT; |
| 679 | 679 | ||
| 680 | { | 680 | { |
| 681 | register int nread; | 681 | register EMACS_INT nread; |
| 682 | int first = 1; | 682 | int first = 1; |
| 683 | int total_read = 0; | 683 | EMACS_INT total_read = 0; |
| 684 | int carryover = 0; | 684 | int carryover = 0; |
| 685 | int display_on_the_fly = display_p; | 685 | int display_on_the_fly = display_p; |
| 686 | struct coding_system saved_coding; | 686 | struct coding_system saved_coding; |