Merge from emacs-23 branch

2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f9236f159cd..cc149458e02 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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-25  Chong Yidong  <cyd@gnu.org>
 
         * eval.c (Fuser_variable_p): Doc fix; mention custom-variable-p.
diff --git a/src/coding.c b/src/coding.c
index 5c3048f95e8..15e8572edb3 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -855,7 +855,7 @@ static void coding_alloc_by_making_gap (struct coding_system *,
 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 @@ encode_invocation_designation (struct charset *charset,
    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)