summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/data.c7
-rw-r--r--src/lisp.h11
3 files changed, 5 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 57c5be9a7e2..1fbc25e07c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-12 Paul Eggert <eggert@cs.ucla.edu>
+
+ * lisp.h (circular_list_error, FOREACH): Remove; unused.
+ * data.c (circular_list_error): Remove.
+
2011-04-11 Paul Eggert <eggert@cs.ucla.edu>
* commands.h (last_point_position, last_point_position_buffer):
diff --git a/src/data.c b/src/data.c
index 68ceff4d23e..ca246b60dd4 100644
--- a/src/data.c
+++ b/src/data.c
@@ -101,13 +101,6 @@ Lisp_Object Qinteractive_form;
static void swap_in_symval_forwarding (struct Lisp_Symbol *, struct Lisp_Buffer_Local_Value *);
-void
-circular_list_error (Lisp_Object list)
-{
- xsignal (Qcircular_list, list);
-}
-
-
Lisp_Object
wrong_type_argument (register Lisp_Object predicate, register Lisp_Object value)
{
diff --git a/src/lisp.h b/src/lisp.h
index fc924b7b1dc..ce6a3c58858 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2320,7 +2320,6 @@ extern Lisp_Object Qinteger;
extern Lisp_Object Qfont_spec, Qfont_entity, Qfont_object;
-extern void circular_list_error (Lisp_Object) NO_RETURN;
EXFUN (Finteractive_form, 1);
EXFUN (Fbyteorder, 0);
@@ -3521,16 +3520,6 @@ extern void init_system_name (void);
? 0 \
: (wrong_type_argument (Qlistp, (list))), 1))
-#define FOREACH(hare, list, tortoise, n) \
- for (tortoise = hare = (list), n = 0; \
- !LIST_END_P (list, hare); \
- (hare = XCDR (hare), ++n, \
- ((n & 1) != 0 \
- ? (tortoise = XCDR (tortoise), \
- (EQ (hare, tortoise) \
- && (circular_list_error ((list)), 1))) \
- : 0)))
-
/* Use this to suppress gcc's `...may be used before initialized' warnings. */
#ifdef lint
# define IF_LINT(Code) Code