diff options
| author | HIROSHI OOTA | 2012-01-25 13:35:05 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-01-25 13:35:05 +0800 |
| commit | 5f53d2441abf6eafe8e14f29d73e14afe8bec35f (patch) | |
| tree | 34d0569cbd3942d42541c1cf4db826faaa198871 /src | |
| parent | 8fd538931d07df87b6346c7183f02eee60543541 (diff) | |
| download | emacs-5f53d2441abf6eafe8e14f29d73e14afe8bec35f.tar.gz emacs-5f53d2441abf6eafe8e14f29d73e14afe8bec35f.zip | |
* src/coding.c (encode_designation_at_bol): Change return value to EMACS_INT.emacs-23.4
Diffstat (limited to 'src')
| -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 2331a30cd79..8e20731bc3a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,7 +1,12 @@ | |||
| 1 | 2012-01-19 Chong Yidong <cyd@gnu.org> | 1 | 2012-01-25 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * Version 23.4 released. | 3 | * Version 23.4 released. |
| 4 | 4 | ||
| 5 | 2012-01-25 HIROSHI OOTA <nil@mad.dog.cx> (tiny change) | ||
| 6 | |||
| 7 | * coding.c (encode_designation_at_bol): Change return value to | ||
| 8 | EMACS_INT. | ||
| 9 | |||
| 5 | 2012-01-19 Paul Eggert <eggert@cs.ucla.edu> | 10 | 2012-01-19 Paul Eggert <eggert@cs.ucla.edu> |
| 6 | 11 | ||
| 7 | * coding.c (encode_designation_at_bol): Don't use uninitialized | 12 | * 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 *, | |||
| 944 | static unsigned char *alloc_destination P_ ((struct coding_system *, | 944 | static unsigned char *alloc_destination P_ ((struct coding_system *, |
| 945 | EMACS_INT, unsigned char *)); | 945 | EMACS_INT, unsigned char *)); |
| 946 | static void setup_iso_safe_charsets P_ ((Lisp_Object)); | 946 | static void setup_iso_safe_charsets P_ ((Lisp_Object)); |
| 947 | static int encode_designation_at_bol P_ ((struct coding_system *, | 947 | static EMACS_INT encode_designation_at_bol P_ ((struct coding_system *, |
| 948 | int *, int *, unsigned char *)); | 948 | int *, int *, unsigned char *)); |
| 949 | static int detect_eol P_ ((const unsigned char *, | 949 | static int detect_eol P_ ((const unsigned char *, |
| 950 | EMACS_INT, enum coding_category)); | 950 | EMACS_INT, enum coding_category)); |
| @@ -4509,7 +4509,7 @@ encode_invocation_designation (charset, coding, dst, p_nchars) | |||
| 4509 | If the current block ends before any end-of-line, we may fail to | 4509 | If the current block ends before any end-of-line, we may fail to |
| 4510 | find all the necessary designations. */ | 4510 | find all the necessary designations. */ |
| 4511 | 4511 | ||
| 4512 | static int | 4512 | static EMACS_INT |
| 4513 | encode_designation_at_bol (coding, charbuf, charbuf_end, dst) | 4513 | encode_designation_at_bol (coding, charbuf, charbuf_end, dst) |
| 4514 | struct coding_system *coding; | 4514 | struct coding_system *coding; |
| 4515 | int *charbuf, *charbuf_end; | 4515 | int *charbuf, *charbuf_end; |