diff options
| author | HIROSHI OOTA <nil@mad.dog.cx> | 2012-01-25 13:35:05 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-01-25 13:35:05 +0800 |
| commit | 55a0f718c4c37044e19392bc83eac389eb4ea773 (patch) | |
| tree | 4d7829c257589862fa6e779ddcd19c148a7f9d02 | |
| parent | f62b5c612145f8eee1d799f3a3fb4719cc4e2205 (diff) | |
| download | emacs-EMACS_23_4.tar.gz | |
* src/coding.c (encode_designation_at_bol): Change return value to EMACS_INT.EMACS_23_4
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/coding.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fa13fe7f1a1..e44ec5fde6b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,12 @@ -2012-01-19 Chong Yidong <cyd@gnu.org> +2012-01-25 Chong Yidong <cyd@gnu.org> * Version 23.4 released. +2012-01-25 HIROSHI OOTA <nil@mad.dog.cx> (tiny change) + + * coding.c (encode_designation_at_bol): Change return value to + EMACS_INT. + 2012-01-19 Paul Eggert <eggert@cs.ucla.edu> * coding.c (encode_designation_at_bol): Don't use uninitialized diff --git a/src/coding.c b/src/coding.c index 898bfd71f43..8e96db1f521 100644 --- a/src/coding.c +++ b/src/coding.c @@ -944,7 +944,7 @@ static void coding_alloc_by_making_gap P_ ((struct coding_system *, static unsigned char *alloc_destination P_ ((struct coding_system *, EMACS_INT, unsigned char *)); static void setup_iso_safe_charsets P_ ((Lisp_Object)); -static int encode_designation_at_bol P_ ((struct coding_system *, +static EMACS_INT encode_designation_at_bol P_ ((struct coding_system *, int *, int *, unsigned char *)); static int detect_eol P_ ((const unsigned char *, EMACS_INT, enum coding_category)); @@ -4509,7 +4509,7 @@ encode_invocation_designation (charset, coding, dst, p_nchars) If the current block ends before any end-of-line, we may fail to find all the necessary designations. */ -static int +static EMACS_INT encode_designation_at_bol (coding, charbuf, charbuf_end, dst) struct coding_system *coding; int *charbuf, *charbuf_end; |