aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn2009-07-25 07:43:08 +0000
committerKen Raeburn2009-07-25 07:43:08 +0000
commit8890e5f53ce4cbf32452638d5e7f059a4df1f505 (patch)
tree5155a620a44bff9d34d9ddcb9d7173962b1abb3e /src
parent2baf5e7610491eedb042b89056324d7f79e8a288 (diff)
downloademacs-8890e5f53ce4cbf32452638d5e7f059a4df1f505.tar.gz
emacs-8890e5f53ce4cbf32452638d5e7f059a4df1f505.zip
* coding.h (decode_coding_string, encode_coding_string): Use
SCHARS macro.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/coding.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 00cc2e38a88..27df9aa1af5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12009-07-25 Ken Raeburn <raeburn@raeburn.org> 12009-07-25 Ken Raeburn <raeburn@raeburn.org>
2 2
3 * coding.h (decode_coding_string, encode_coding_string): Use
4 SCHARS macro.
5
3 * lread.c: Rewrite 2009-07-21 changes. 6 * lread.c: Rewrite 2009-07-21 changes.
4 (load_depth): Deleted. 7 (load_depth): Deleted.
5 (Qload_in_progress): New variable. 8 (Qload_in_progress): New variable.
diff --git a/src/coding.h b/src/coding.h
index 450433fda96..3e89ff10421 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -734,11 +734,11 @@ extern void encode_coding_object P_ ((struct coding_system *,
734 734
735 735
736#define decode_coding_string(coding, string, nocopy) \ 736#define decode_coding_string(coding, string, nocopy) \
737 decode_coding_object (coding, string, 0, 0, XSTRING (string)->size, \ 737 decode_coding_object (coding, string, 0, 0, SCHARS (string), \
738 STRING_BYTES (XSTRING (string)), Qt) 738 STRING_BYTES (XSTRING (string)), Qt)
739 739
740#define encode_coding_string(coding, string, nocopy) \ 740#define encode_coding_string(coding, string, nocopy) \
741 (encode_coding_object (coding, string, 0, 0, XSTRING (string)->size, \ 741 (encode_coding_object (coding, string, 0, 0, SCHARS (string), \
742 STRING_BYTES (XSTRING (string)), Qt), \ 742 STRING_BYTES (XSTRING (string)), Qt), \
743 (coding)->dst_object) 743 (coding)->dst_object)
744 744