diff options
| author | Kenichi Handa | 2000-10-11 23:56:30 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2000-10-11 23:56:30 +0000 |
| commit | 57bb5c37d7810eddecc1b70d92fa415440696207 (patch) | |
| tree | e8dd2e6b5ecfeb0dc9da7a4e7c1d373c44f9b298 /src/process.c | |
| parent | 3b95d6bb544e2027781109d9abd98e144de4b3e2 (diff) | |
| download | emacs-57bb5c37d7810eddecc1b70d92fa415440696207.tar.gz emacs-57bb5c37d7810eddecc1b70d92fa415440696207.zip | |
(read_process_output): Cancel previous change.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/process.c b/src/process.c index edae85f95f5..b36fbc79108 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -3086,8 +3086,6 @@ read_process_output (proc, channel) | |||
| 3086 | if (! (BEGV <= PT && PT <= ZV)) | 3086 | if (! (BEGV <= PT && PT <= ZV)) |
| 3087 | Fwiden (); | 3087 | Fwiden (); |
| 3088 | 3088 | ||
| 3089 | /* Insert before markers in case we are inserting where | ||
| 3090 | the buffer's mark is, and the user's next command is Meta-y. */ | ||
| 3091 | text = decode_coding_string (make_unibyte_string (chars, nbytes), | 3089 | text = decode_coding_string (make_unibyte_string (chars, nbytes), |
| 3092 | coding, 0); | 3090 | coding, 0); |
| 3093 | Vlast_coding_system_used = coding->symbol; | 3091 | Vlast_coding_system_used = coding->symbol; |
| @@ -3112,10 +3110,12 @@ read_process_output (proc, channel) | |||
| 3112 | if (NILP (current_buffer->enable_multibyte_characters) | 3110 | if (NILP (current_buffer->enable_multibyte_characters) |
| 3113 | != ! STRING_MULTIBYTE (text)) | 3111 | != ! STRING_MULTIBYTE (text)) |
| 3114 | text = (STRING_MULTIBYTE (text) | 3112 | text = (STRING_MULTIBYTE (text) |
| 3115 | ? string_make_unibyte (text) | 3113 | ? Fstring_as_unibyte (text) |
| 3116 | : string_make_multibyte (text)); | 3114 | : Fstring_as_multibyte (text)); |
| 3117 | nbytes = STRING_BYTES (XSTRING (text)); | 3115 | nbytes = STRING_BYTES (XSTRING (text)); |
| 3118 | nchars = XSTRING (text)->size; | 3116 | nchars = XSTRING (text)->size; |
| 3117 | /* Insert before markers in case we are inserting where | ||
| 3118 | the buffer's mark is, and the user's next command is Meta-y. */ | ||
| 3119 | insert_from_string_before_markers (text, 0, 0, nchars, nbytes, 0); | 3119 | insert_from_string_before_markers (text, 0, 0, nchars, nbytes, 0); |
| 3120 | signal_after_change (before, 0, PT - before); | 3120 | signal_after_change (before, 0, PT - before); |
| 3121 | update_compositions (before, PT, CHECK_BORDER); | 3121 | update_compositions (before, PT, CHECK_BORDER); |