diff options
| author | Joakim Verona | 2011-07-15 04:39:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-15 04:39:29 +0200 |
| commit | 4f616a2e7ed1db28da98df90266e9751a8ae9ee1 (patch) | |
| tree | 74a9dcbe13e945e712ae04a4a94c2202ca720591 /src/coding.c | |
| parent | ff2be00005c3aeda6e11d7ed264ce86f02b60958 (diff) | |
| parent | ec2bc542a4d0127425625e8cb458684bd825675a (diff) | |
| download | emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.tar.gz emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.zip | |
merge from upstream
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 | ||