diff options
| author | Kenichi Handa | 2011-07-07 08:28:00 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-07-07 08:28:00 +0900 |
| commit | d2a0a50628933d3cdb09818eee2e17f55e22531f (patch) | |
| tree | d19c8e71eb63eb6ccd204c2f36f406e4cf853154 /src/coding.c | |
| parent | c805dec0b5fa81b5c9f2b724e2ec12a17d723aca (diff) | |
| parent | 354cf0ba0b20108c9776be1d868458893bc2cd54 (diff) | |
| download | emacs-d2a0a50628933d3cdb09818eee2e17f55e22531f.tar.gz emacs-d2a0a50628933d3cdb09818eee2e17f55e22531f.zip | |
merge trunk
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 9939774ea82..65c8a767c2b 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -9000,7 +9000,7 @@ not fully specified.) */) | |||
| 9000 | (Lisp_Object string, Lisp_Object coding_system, Lisp_Object nocopy, Lisp_Object buffer) | 9000 | (Lisp_Object string, Lisp_Object coding_system, Lisp_Object nocopy, Lisp_Object buffer) |
| 9001 | { | 9001 | { |
| 9002 | return code_convert_string (string, coding_system, buffer, | 9002 | return code_convert_string (string, coding_system, buffer, |
| 9003 | 1, ! NILP (nocopy), 1); | 9003 | 1, ! NILP (nocopy), 0); |
| 9004 | } | 9004 | } |
| 9005 | 9005 | ||
| 9006 | 9006 | ||