Mercurial > emacs
changeset 111640:8bd4a845ba2a
* src/xfaces.c (lookup_face): Make static.
* src/dispnew.c (copy_row_except_pointers): Likewise.
* src/syntax.c (dec_bytepos): Likewise.
(inc_bytepos): Remove.
* src/dispextern.h (lookup_face): Remove declaration.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sat, 20 Nov 2010 11:07:00 +0100 |
| parents | d94e03b64838 |
| children | 224cc868d181 |
| files | src/ChangeLog src/dispextern.h src/dispnew.c src/syntax.c src/xfaces.c |
| diffstat | 5 files changed, 11 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Nov 20 01:18:17 2010 +0000 +++ b/src/ChangeLog Sat Nov 20 11:07:00 2010 +0100 @@ -1,3 +1,11 @@ +2010-11-20 Andreas Schwab <schwab@linux-m68k.org> + + * xfaces.c (lookup_face): Make static. + * dispnew.c (copy_row_except_pointers): Likewise. + * syntax.c (dec_bytepos): Likewise. + (inc_bytepos): Remove. + * dispextern.h (lookup_face): Remove declaration. + 2010-11-19 Eli Zaretskii <eliz@gnu.org> * xdisp.c (set_cursor_from_row): Display cursor after all the
--- a/src/dispextern.h Sat Nov 20 01:18:17 2010 +0000 +++ b/src/dispextern.h Sat Nov 20 11:07:00 2010 +0100 @@ -3175,7 +3175,6 @@ int ascii_face_of_lisp_face (struct frame *, int); void prepare_face_for_display (struct frame *, struct face *); int xstrcasecmp (const unsigned char *, const unsigned char *); -int lookup_face (struct frame *, Lisp_Object *); int lookup_named_face (struct frame *, Lisp_Object, int); int lookup_basic_face (struct frame *, int); int smaller_face (struct frame *, int, int);
--- a/src/dispnew.c Sat Nov 20 01:18:17 2010 +0000 +++ b/src/dispnew.c Sat Nov 20 11:07:00 2010 +0100 @@ -1180,7 +1180,7 @@ /* Copy glyph row structure FROM to glyph row structure TO, except that glyph pointers in the structures are left unchanged. */ -INLINE void +static INLINE void copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from) { struct glyph *pointers[1 + LAST_AREA];
--- a/src/syntax.c Sat Nov 20 01:18:17 2010 +0000 +++ b/src/syntax.c Sat Nov 20 11:07:00 2010 +0100 @@ -371,23 +371,10 @@ return quoted; } -/* Return the bytepos one character after BYTEPOS. - We assume that BYTEPOS is not at the end of the buffer. */ - -INLINE EMACS_INT -inc_bytepos (EMACS_INT bytepos) -{ - if (NILP (current_buffer->enable_multibyte_characters)) - return bytepos + 1; - - INC_POS (bytepos); - return bytepos; -} - /* Return the bytepos one character before BYTEPOS. We assume that BYTEPOS is not at the start of the buffer. */ -INLINE EMACS_INT +static INLINE EMACS_INT dec_bytepos (EMACS_INT bytepos) { if (NILP (current_buffer->enable_multibyte_characters))
--- a/src/xfaces.c Sat Nov 20 01:18:17 2010 +0000 +++ b/src/xfaces.c Sat Nov 20 11:07:00 2010 +0100 @@ -4540,7 +4540,7 @@ Value is the ID of the face found. If no suitable face is found, realize a new one. */ -INLINE int +static INLINE int lookup_face (struct frame *f, Lisp_Object *attr) { struct face_cache *cache = FRAME_FACE_CACHE (f);