procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

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

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)