mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-18 03:40:47 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-23 branch

Browse source
This commit is contained in:
Chong Yidong 2012-01-25 13:55:01 +08:00
parent 0b21c100be
commit 14af5f7fc4
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/coding.c
View file

@ -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)