diff options
| author | K. Handa | 2016-06-01 08:07:18 +0900 |
|---|---|---|
| committer | K. Handa | 2016-06-01 08:07:18 +0900 |
| commit | 4efef3db2fb1c3a20b83a67948e614d9b0c258dd (patch) | |
| tree | c0c08fc308869f7ba3d988594e4a51b69a70325b /src/coding.c | |
| parent | 694d5e5b56a9d55023ffc292188bd88f6f6cbca6 (diff) | |
| parent | 01030eed9395f5004e7d0721394697d1ca90cc2f (diff) | |
| download | emacs-4efef3db2fb1c3a20b83a67948e614d9b0c258dd.tar.gz emacs-4efef3db2fb1c3a20b83a67948e614d9b0c258dd.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c index 55a4cea7c0b..a28fec1efe4 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -8008,12 +8008,12 @@ decode_coding_object (struct coding_system *coding, | |||
| 8008 | Lisp_Object dst_object) | 8008 | Lisp_Object dst_object) |
| 8009 | { | 8009 | { |
| 8010 | ptrdiff_t count = SPECPDL_INDEX (); | 8010 | ptrdiff_t count = SPECPDL_INDEX (); |
| 8011 | unsigned char *destination IF_LINT (= NULL); | 8011 | unsigned char *destination; |
| 8012 | ptrdiff_t dst_bytes IF_LINT (= 0); | 8012 | ptrdiff_t dst_bytes; |
| 8013 | ptrdiff_t chars = to - from; | 8013 | ptrdiff_t chars = to - from; |
| 8014 | ptrdiff_t bytes = to_byte - from_byte; | 8014 | ptrdiff_t bytes = to_byte - from_byte; |
| 8015 | Lisp_Object attrs; | 8015 | Lisp_Object attrs; |
| 8016 | ptrdiff_t saved_pt = -1, saved_pt_byte IF_LINT (= 0); | 8016 | ptrdiff_t saved_pt = -1, saved_pt_byte; |
| 8017 | bool need_marker_adjustment = 0; | 8017 | bool need_marker_adjustment = 0; |
| 8018 | Lisp_Object old_deactivate_mark; | 8018 | Lisp_Object old_deactivate_mark; |
| 8019 | 8019 | ||
| @@ -8191,7 +8191,7 @@ encode_coding_object (struct coding_system *coding, | |||
| 8191 | ptrdiff_t chars = to - from; | 8191 | ptrdiff_t chars = to - from; |
| 8192 | ptrdiff_t bytes = to_byte - from_byte; | 8192 | ptrdiff_t bytes = to_byte - from_byte; |
| 8193 | Lisp_Object attrs; | 8193 | Lisp_Object attrs; |
| 8194 | ptrdiff_t saved_pt = -1, saved_pt_byte IF_LINT (= 0); | 8194 | ptrdiff_t saved_pt = -1, saved_pt_byte; |
| 8195 | bool need_marker_adjustment = 0; | 8195 | bool need_marker_adjustment = 0; |
| 8196 | bool kill_src_buffer = 0; | 8196 | bool kill_src_buffer = 0; |
| 8197 | Lisp_Object old_deactivate_mark; | 8197 | Lisp_Object old_deactivate_mark; |