summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-09-25 08:21:22 +0000
committerGerd Moellmann <gerd@gnu.org>2001-09-25 08:21:22 +0000
commit452294c2bf34b33ea8c2fa9d9b750a7c33599d6d (patch)
tree43b60f5ff59a32df1b6efe0e987fa670917ea135
parentab750f9c1977a0e8a530d5c9eb3f6879b7a5ec40 (diff)
downloademacs-452294c2bf34b33ea8c2fa9d9b750a7c33599d6d.tar.gz
(send_process): Disable composition if from_byte < 0.
From Kenichi Handa <handa@etl.go.jp>.
-rw-r--r--src/process.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index 751bf1bdc29..474b21f2476 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3324,8 +3324,13 @@ send_process (proc, buf, len, object)
to = string_byte_to_char (object, from_byte + len);
}
- if (from_byte >= 0 && coding->composing != COMPOSITION_DISABLED)
- coding_save_composition (coding, from, to, object);
+ if (coding->composing != COMPOSITION_DISABLED)
+ {
+ if (from_byte >= 0)
+ coding_save_composition (coding, from, to, object);
+ else
+ coding->composing = COMPOSITION_DISABLED;
+ }
if (STRING_BYTES (XSTRING (XPROCESS (proc)->encoding_buf)) < require)
XPROCESS (proc)->encoding_buf = make_uninit_string (require);