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
f998bbe7
Commit
f998bbe7
authored
Feb 08, 2012
by
Glenn Morris
Browse files
Merge from emacs-23; up to 2010-06-29T18:17:31Z!cyd@stupidchicken.com.
parents
9fcfcdef
5c1ca13d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
src/ChangeLog
src/ChangeLog
+4
-0
src/coding.c
src/coding.c
+3
-3
No files found.
src/ChangeLog
View file @
f998bbe7
2012-02-09 Kenichi Handa <handa@m17n.org>
* coding.c (produce_chars): Fix updating of src_end (Bug#10701).
2012-02-07 Chong Yidong <cyd@gnu.org>
* buffer.c (Fbuffer_local_variables)
...
...
src/coding.c
View file @
f998bbe7
...
...
@@ -6849,7 +6849,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
dst_end = coding->destination + coding->dst_bytes;
coding_set_source (coding);
src = coding->source + offset;
src_end = coding->source + coding->
src_bytes
;
src_end = coding->source + coding->
consumed
;
if (EQ (coding->src_object, coding->dst_object))
dst_end = (unsigned char *) src;
}
...
...
@@ -6883,7 +6883,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
dst_end = coding->destination + coding->dst_bytes;
coding_set_source (coding);
src = coding->source + offset;
src_end = coding->source + coding->
src_bytes
;
src_end = coding->source + coding->
consumed
;
if (EQ (coding->src_object, coding->dst_object))
dst_end = (unsigned char *) src;
}
...
...
@@ -6904,7 +6904,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
dst = alloc_destination (coding, require, dst);
coding_set_source (coding);
src = coding->source + offset;
src_end = coding->source + coding->
src_bytes
;
src_end = coding->source + coding->
consumed
;
}
}
produced_chars = coding->consumed_char;
...
...
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