diff options
| author | Kazuhiro Ito | 2011-07-01 13:03:55 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-01 13:03:55 +0200 |
| commit | 4550efdf3fcf700f67efc0f40b6476dc3cc5fe58 (patch) | |
| tree | 1c9af310eb6d600b08d46760182905ac0c32e505 /src | |
| parent | 5bd35902628b1b227cd82ff306f84acb8abdb7f9 (diff) | |
| download | emacs-4550efdf3fcf700f67efc0f40b6476dc3cc5fe58.tar.gz emacs-4550efdf3fcf700f67efc0f40b6476dc3cc5fe58.zip | |
* coding.c (Fencode_coding_string): Record the last coding system
used, as the function doc string says.
Fixes: debbugs:8738
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/coding.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bf9f7be831e..2f7e192fbac 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-01 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny patch) | ||
| 2 | |||
| 3 | * coding.c (Fencode_coding_string): Record the last coding system | ||
| 4 | used, as the function doc string says (bug#8738). | ||
| 5 | |||
| 1 | 2011-07-01 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2011-07-01 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * xsettings.c (store_monospaced_changed): Take new font as arg and | 8 | * xsettings.c (store_monospaced_changed): Take new font as arg and |
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 | ||