diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-07 17:35:27 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-07 17:35:27 -0700 |
| commit | 36cf8493aff99b652b2ad8c9e4d55a18688e8484 (patch) | |
| tree | f8ff499c2ee5e91b20d8576841f0e6bf91d1ba34 /src/callproc.c | |
| parent | 2be772ff45057215c1c70252008c1f9703ef3bff (diff) | |
| parent | da8de2908c35ad1fd5c437486d2ea5f6ebb75ca3 (diff) | |
| download | emacs-36cf8493aff99b652b2ad8c9e4d55a18688e8484.tar.gz | |
Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c index 38cde017187..9fbc7e5b713 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -805,8 +805,10 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, /* Now NREAD is the total amount of data in the buffer. */ immediate_quit = 0; - if (NILP (BVAR (current_buffer, enable_multibyte_characters)) - && ! CODING_MAY_REQUIRE_DECODING (&process_coding)) + if (!nread) + ; + else if (NILP (BVAR (current_buffer, enable_multibyte_characters)) + && ! CODING_MAY_REQUIRE_DECODING (&process_coding)) insert_1_both (buf, nread, nread, 0, 1, 0); else { /* We have to decode the input. */ @@ -814,6 +816,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, ptrdiff_t count1 = SPECPDL_INDEX (); XSETBUFFER (curbuf, current_buffer); + /* FIXME: Call signal_after_change! */ prepare_to_modify_buffer (PT, PT, NULL); /* We cannot allow after-change-functions be run during decoding, because that might modify the |