Cleanup. Tested in -nw and verified that bug #7616 didn't become worse.

 src/bidi.c (bidi_fetch_char_advance): Remove unused and
 unimplemented function.

2 files changed, 5 insertions, 25 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 12c0bde290b..066a1564431 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_fetch_char_advance): Remove unused and
+        unimplemented function.
+
 2011-05-28  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (set_cursor_from_row): Set start and stop points
diff --git a/src/bidi.c b/src/bidi.c
index 17cb1214c73..de189f0cb13 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -630,31 +630,6 @@ bidi_fetch_char (EMACS_INT bytepos, EMACS_INT charpos, EMACS_INT *disp_pos,
   return ch;
 }
 
-/* Looks like we won't need this one.  */
-#if 0
-/* Fetch character at CHARPOS/BYTEPOS.  Return the character, and
-   advance CHARPOS and BYTEPOS to the next character in logical
-   order.  */
-static INLINE int
-bidi_fetch_char_advance (EMACS_INT *charpos, EMACS_INT *bytepos)
-{
-  int ch;
-
-  /* FIXME: Support strings in addition to buffers.  */
-  FETCH_CHAR_ADVANCE_NO_CHECK (ch, charpos, bytepos);
-
-#if 0
-  if (...)
-    {
-      /* FIXME: Support characters covered by display strings.  */
-      ch = 0xFFFC;
-    }
-#endif
-
-  return ch;
-}
-#endif
-
 /* Find the beginning of this paragraph by looking back in the buffer.
    Value is the byte position of the paragraph's beginning.  */
 static EMACS_INT