[Emacs-diffs] /srv/bzr/emacs/trunk r102442: * src/xfaces.c (lookup_face): Make static.

[Andreas Schwab]

------------------------------------------------------------
revno: 102442
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2010-11-20 11:07:00 +0100
message:
  * 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.
modified:
  src/ChangeLog
  src/dispextern.h
  src/dispnew.c
  src/syntax.c
  src/xfaces.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-19 16:34:22 +0000
+++ b/src/ChangeLog     2010-11-20 10:07:00 +0000
@@ -1,3 +1,11 @@
+2010-11-20  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (set_cursor_from_row): Display cursor after all the

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2010-11-13 13:29:31 +0000
+++ b/src/dispextern.h  2010-11-20 10:07:00 +0000
@@ -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);

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2010-11-17 02:37:45 +0000
+++ b/src/dispnew.c     2010-11-20 10:07:00 +0000
@@ -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];

=== modified file 'src/syntax.c'
--- a/src/syntax.c      2010-09-24 15:24:47 +0000
+++ b/src/syntax.c      2010-11-20 10:07:00 +0000
@@ -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))

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2010-10-24 01:48:39 +0000
+++ b/src/xfaces.c      2010-11-20 10:07:00 +0000
@@ -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);