[Emacs-diffs] /srv/bzr/emacs/trunk r106928: HIROSHI OOTA <address@hidden>

[Chong Yidong]

------------------------------------------------------------
revno: 106928 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2012-01-25 13:55:39 +0800
message:
  HIROSHI OOTA <address@hidden>
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-01-25 05:48:11 +0000
+++ b/src/ChangeLog     2012-01-25 05:55:01 +0000
@@ -1,3 +1,8 @@
+2012-01-25  HIROSHI OOTA  <address@hidden>  (tiny change)
+
+       * coding.c (encode_designation_at_bol): Change return value to
+       EMACS_INT.
+
 2012-01-25  Chong Yidong  <address@hidden>
 
        * eval.c (Fuser_variable_p): Doc fix; mention custom-variable-p.

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-01-19 07:21:25 +0000
+++ b/src/coding.c      2012-01-25 05:55:01 +0000
@@ -855,7 +855,7 @@
 static unsigned char *alloc_destination (struct coding_system *,
                                          EMACS_INT, unsigned char *);
 static void setup_iso_safe_charsets (Lisp_Object);
-static int encode_designation_at_bol (struct coding_system *,
+static EMACS_INT encode_designation_at_bol (struct coding_system *,
                                      int *, int *, unsigned char *);
 static int detect_eol (const unsigned char *,
                        EMACS_INT, enum coding_category);
@@ -4351,7 +4351,7 @@
    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 (struct coding_system *coding,
                           int *charbuf, int *charbuf_end,
                           unsigned char *dst)