Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ebaf11b6
Commit
ebaf11b6
authored
Feb 18, 2010
by
Kenichi Handa
Browse files
Fix handling of CODING_RESULT_INSUFFICIENT_DST.
parent
7fb371fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
src/ChangeLog
src/ChangeLog
+7
-0
src/coding.c
src/coding.c
+6
-1
No files found.
src/ChangeLog
View file @
ebaf11b6
2010-02-18 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change)
* coding.c (record_conversion_result): Handle
CODING_RESULT_INSUFFICIENT_DST.
(decode_coding_object): Record CODING_RESULT_INSUFFICIENT_MEM on
memory allocation error.
2010-02-17 Kenichi Handa <handa@m17n.org>
* coding.c (decode_coding_ccl): Don't setup ccl program here. Fix
...
...
src/coding.c
View file @
ebaf11b6
...
...
@@ -993,6 +993,11 @@ record_conversion_result (struct coding_system *coding,
case CODING_RESULT_INSUFFICIENT_MEM:
Vlast_code_conversion_error = Qinsufficient_memory;
break;
case CODING_RESULT_INSUFFICIENT_DST:
/* Don't record this error in Vlast_code_conversion_error
because it happens just temporarily and is resolved when the
whole conversion is finished. */
break;
case CODING_RESULT_SUCCESS:
break;
default:
...
...
@@ -7865,7 +7870,7 @@ decode_coding_object (coding, src_object, from, from_byte, to, to_byte,
if (! destination)
{
record_conversion_result (coding,
CODING_RESULT_INSUFFICIENT_
DST
);
CODING_RESULT_INSUFFICIENT_
MEM
);
unbind_to (count, Qnil);
return;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment