Remove redundant or unused things here and there.

* lisp.h (CYCLE_CHECK, CHAR_TABLE_TRANSLATE): Remove.
* conf_post.h (RE_TRANSLATE): Use char_table_translate.
* editfns.c (Fcompare_buffer_substrings): Likewise.
* frame.h (struct terminal, struct font_driver_list):
Remove redundant declarations.
* window.h (Qleft, Qright): Likewise.

6 files changed, 13 insertions, 42 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a0c3f3537bb..96e3fdd5b45 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2012-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        Remove redundant or unused things here and there.
+        * lisp.h (CYCLE_CHECK, CHAR_TABLE_TRANSLATE): Remove.
+        * conf_post.h (RE_TRANSLATE): Use char_table_translate.
+        * editfns.c (Fcompare_buffer_substrings): Likewise.
+        * frame.h (struct terminal, struct font_driver_list):
+        Remove redundant declarations.
+        * window.h (Qleft, Qright): Likewise.
+
+2012-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
         Do not mark objects from deleted buffers, windows and frames.
         * alloc.c (mark_buffer): Mark just the buffer if it is dead.
         (mark_object): Likewise for windows and frames.
diff --git a/src/conf_post.h b/src/conf_post.h
index ead7298e98d..cef55863752 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -167,7 +167,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #ifdef emacs /* Don't do this for lib-src.  */
 /* Tell regex.c to use a type compatible with Emacs.  */
 #define RE_TRANSLATE_TYPE Lisp_Object
-#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C)
+#define RE_TRANSLATE(TBL, C) char_table_translate (TBL, C)
 #ifdef make_number
 /* If make_number is a macro, use it.  */
 #define RE_TRANSLATE_P(TBL) (!EQ (TBL, make_number (0)))
diff --git a/src/editfns.c b/src/editfns.c
index 2d1a3cbfa0c..65baaf4e3f8 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2783,8 +2783,8 @@ determines whether case is significant or ignored.  */)
 
       if (!NILP (trt))
         {
-          c1 = CHAR_TABLE_TRANSLATE (trt, c1);
-          c2 = CHAR_TABLE_TRANSLATE (trt, c2);
+          c1 = char_table_translate (trt, c1);
+          c2 = char_table_translate (trt, c2);
         }
       if (c1 < c2)
         return make_number (- 1 - chars);
diff --git a/src/frame.h b/src/frame.h
index 94498e9efcf..661ea2ea67c 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -81,9 +81,6 @@ enum fullscreen_type
 #define FRAME_FOREGROUND_PIXEL(f) ((f)->foreground_pixel)
 #define FRAME_BACKGROUND_PIXEL(f) ((f)->background_pixel)
 
-struct terminal;
-
-struct font_driver_list;
 
 struct frame
 {
diff --git a/src/lisp.h b/src/lisp.h
index a8ed4b6cabc..bc622ba5212 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -909,14 +909,6 @@ enum
   (ASCII_CHAR_P (IDX) ? CHAR_TABLE_REF_ASCII ((CT), (IDX))      \
    : char_table_ref ((CT), (IDX)))
 
-/* Almost equivalent to Faref (CT, IDX).  However, if the result is
-   not a character, return IDX.
-
-   For these characters, do not check validity of CT
-   and do not follow parent.  */
-#define CHAR_TABLE_TRANSLATE(CT, IDX)   \
-  char_table_translate (CT, IDX)
-
 /* Equivalent to Faset (CT, IDX, VAL) with optimization for ASCII and
    8-bit European characters.  Do not check validity of CT.  */
 #define CHAR_TABLE_SET(CT, IDX, VAL)                                    \
@@ -3556,32 +3548,6 @@ extern void init_system_name (void);
 #define make_fixnum_or_float(val) \
    (FIXNUM_OVERFLOW_P (val) ? make_float (val) : make_number (val))
 
-
-/* Checks the `cycle check' variable CHECK to see if it indicates that
-   EL is part of a cycle; CHECK must be either Qnil or a value returned
-   by an earlier use of CYCLE_CHECK.  SUSPICIOUS is the number of
-   elements after which a cycle might be suspected; after that many
-   elements, this macro begins consing in order to keep more precise
-   track of elements.
-
-   Returns nil if a cycle was detected, otherwise a new value for CHECK
-   that includes EL.
-
-   CHECK is evaluated multiple times, EL and SUSPICIOUS 0 or 1 times, so
-   the caller should make sure that's ok.  */
-
-#define CYCLE_CHECK(check, el, suspicious)      \
-  (NILP (check)                                 \
-   ? make_number (0)                            \
-   : (INTEGERP (check)                          \
-      ? (XFASTINT (check) < (suspicious)        \
-         ? make_number (XFASTINT (check) + 1)   \
-         : Fcons (el, Qnil))                    \
-      : (!NILP (Fmemq ((el), (check)))          \
-         ? Qnil                                 \
-         : Fcons ((el), (check)))))
-
-
 /* SAFE_ALLOCA normally allocates memory on the stack, but if size is
    larger than MAX_ALLOCA, use xmalloc to avoid overflowing the stack.  */
 
diff --git a/src/window.h b/src/window.h
index f0a3a15f442..a70bc55bac5 100644
--- a/src/window.h
+++ b/src/window.h
@@ -27,8 +27,6 @@ INLINE_HEADER_BEGIN
 # define WINDOW_INLINE INLINE
 #endif
 
-extern Lisp_Object Qleft, Qright;
-
 /* Windows are allocated as if they were vectors, but then the
 Lisp data type is changed to Lisp_Window.  They are garbage
 collected along with the vectors.