martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(encode_coding_string): Don't encode unibyte strings. (Bug#4047)

Browse Source
This commit is contained in:
Eli Zaretskii
2009-08-22 10:26:14 +00:00
parent 8e22fa7efd
commit 729eaddaca
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-08-22 Eli Zaretskii <eliz@gnu.org>
* coding.h (encode_coding_string): Don't encode unibyte strings.
(Bug#4047)
2009-08-22 Michael Albinus <michael.albinus@gmx.de>
* config.in (HAVE_DBUS_WATCH_GET_UNIX_FD): Add.

7
src/coding.h
View File

@@ -738,9 +738,10 @@ extern void encode_coding_object P_ ((struct coding_system *,
SBYTES (string), Qt)
#define encode_coding_string(coding, string, nocopy) \
(encode_coding_object (coding, string, 0, 0, SCHARS (string), \
SBYTES (string), Qt), \
(coding)->dst_object)
(STRING_MULTIBYTE(string) ? \
(encode_coding_object (coding, string, 0, 0, SCHARS (string), \
SBYTES (string), Qt), \
(coding)->dst_object) : (string))
#define decode_coding_c_string(coding, src, bytes, dst_object) \