aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2008-03-27 20:04:37 +0000
committerStefan Monnier2008-03-27 20:04:37 +0000
commita1567c45444f4eecf007d8c95c49914aafce5202 (patch)
tree7344ce28ac07604797091a8d3d4b2402ff90af6c /src
parent30076589d34c643f3e750078fcbb5bb085eaf0c9 (diff)
downloademacs-a1567c45444f4eecf007d8c95c49914aafce5202.tar.gz
emacs-a1567c45444f4eecf007d8c95c49914aafce5202.zip
(decode_coding_object): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/coding.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c04ca11131c..e38d0935031 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-03-27 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * coding.c (decode_coding_object): Fix last change.
4
12008-03-27 Jason Rumney <jasonr@gnu.org> 52008-03-27 Jason Rumney <jasonr@gnu.org>
2 6
3 * w32fns.c (start_hourglass): Suppress hourglass on tty frames. 7 * w32fns.c (start_hourglass): Suppress hourglass on tty frames.
diff --git a/src/coding.c b/src/coding.c
index 6848fa674d3..01a678e2eaf 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7030,10 +7030,10 @@ decode_coding_object (coding, src_object, from, from_byte, to, to_byte,
7030 || (! NILP (CODING_ATTR_POST_READ (attrs)) 7030 || (! NILP (CODING_ATTR_POST_READ (attrs))
7031 && NILP (dst_object))) 7031 && NILP (dst_object)))
7032 { 7032 {
7033 coding->dst_object = code_conversion_save (1, 1); 7033 coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding);
7034 coding->dst_object = code_conversion_save (1, coding->dst_multibyte);
7034 coding->dst_pos = BEG; 7035 coding->dst_pos = BEG;
7035 coding->dst_pos_byte = BEG_BYTE; 7036 coding->dst_pos_byte = BEG_BYTE;
7036 coding->dst_multibyte = !CODING_FOR_UNIBYTE (coding);
7037 } 7037 }
7038 else if (BUFFERP (dst_object)) 7038 else if (BUFFERP (dst_object))
7039 { 7039 {