From 0dbae9ec6c4f7bd8179e08fc11715a68fa888676 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 26 Dec 2009 17:55:04 +0100 Subject: [PATCH] Rename struct Lisp_Buffer_Local_Value `cdrs' member to `thread_data'. --- src/alloc.c | 4 ++-- src/data.c | 18 +++++++++--------- src/lisp.h | 26 +++++++++++++------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/alloc.c b/src/alloc.c index 47912ea40d9..01317dae23b 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -5578,8 +5578,8 @@ mark_object (arg) register struct Lisp_Buffer_Local_Value *ptr = XBUFFER_LOCAL_VALUE (obj); mark_object (ptr->realvalue); - mark_object (ptr->cdrs); - obj = BLOCAL_CDRS (ptr); + mark_object (ptr->thread_data); + obj = BLOCAL_THREAD_DATA (ptr); goto loop; } diff --git a/src/data.c b/src/data.c index e0bec30e645..11e192680e9 100644 --- a/src/data.c +++ b/src/data.c @@ -96,13 +96,13 @@ static Lisp_Object swap_in_symval_forwarding P_ ((Lisp_Object, Lisp_Object)); Lisp_Object impl_Vmost_positive_fixnum, impl_Vmost_negative_fixnum; Lisp_Object -blocal_get_cdrs (struct Lisp_Buffer_Local_Value *l) +blocal_get_thread_data (struct Lisp_Buffer_Local_Value *l) { - Lisp_Object ret = assq_no_quit (get_current_thread (), l->cdrs); + Lisp_Object ret = assq_no_quit (get_current_thread (), l->thread_data); if (NILP (ret)) { /* FIXME: use the parent, not the first element. (or not?) */ - Lisp_Object tem, len, parent = XCDR (XCAR (l->cdrs)); + Lisp_Object tem, len, parent = XCDR (XCAR (l->thread_data)); XSETFASTINT (len, 4); ret = Fmake_vector (len, Qnil); @@ -115,16 +115,16 @@ blocal_get_cdrs (struct Lisp_Buffer_Local_Value *l) XSETCAR (tem, tem); BLOCAL_CDR_VEC (ret) = tem; - l->cdrs = Fcons (Fcons (get_current_thread (), ret), l->cdrs); + l->thread_data = Fcons (Fcons (get_current_thread (), ret), l->thread_data); } return XCDR (ret); } void -blocal_set_cdrs (struct Lisp_Buffer_Local_Value *l, Lisp_Object obj) +blocal_set_thread_data (struct Lisp_Buffer_Local_Value *l, Lisp_Object obj) { - l->cdrs = Fcons (Fcons (get_current_thread (), obj), Qnil); + l->thread_data = Fcons (Fcons (get_current_thread (), obj), Qnil); } Lisp_Object * @@ -1631,7 +1631,7 @@ The function `default-value' gets the default value and `set-default' sets it. BLOCAL_FRAME_VEC (val_vec) = Qnil; BLOCAL_CDR_VEC (val_vec) = tem; XBUFFER_LOCAL_VALUE (newval)->check_frame = 0; - BLOCAL_SET_CDRS (XBUFFER_LOCAL_VALUE (newval), val_vec); + BLOCAL_SET_THREAD_DATA (XBUFFER_LOCAL_VALUE (newval), val_vec); sym->value = newval; } XBUFFER_LOCAL_VALUE (newval)->local_if_set = 1; @@ -1702,7 +1702,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */) BLOCAL_CDR_VEC (val_vec) = tem; XBUFFER_LOCAL_VALUE (newval)->local_if_set = 0; XBUFFER_LOCAL_VALUE (newval)->check_frame = 0; - BLOCAL_SET_CDRS (XBUFFER_LOCAL_VALUE (newval), val_vec); + BLOCAL_SET_THREAD_DATA (XBUFFER_LOCAL_VALUE (newval), val_vec); sym->value = newval; } /* Make sure this buffer has its own value of symbol. */ @@ -1863,7 +1863,7 @@ frame-local bindings). */) BLOCAL_CDR_VEC (val_vec) = tem; XBUFFER_LOCAL_VALUE (newval)->local_if_set = 0; XBUFFER_LOCAL_VALUE (newval)->check_frame = 1; - BLOCAL_SET_CDRS (XBUFFER_LOCAL_VALUE (newval), val_vec); + BLOCAL_SET_THREAD_DATA (XBUFFER_LOCAL_VALUE (newval), val_vec); sym->value = newval; return variable; } diff --git a/src/lisp.h b/src/lisp.h index efe4d250657..69e64a4469a 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1361,12 +1361,12 @@ struct Lisp_Buffer_Local_Value points to itself. */ /* Lisp_Object cdr; */ - Lisp_Object cdrs; + Lisp_Object thread_data; }; -Lisp_Object blocal_get_cdrs (struct Lisp_Buffer_Local_Value *l); +Lisp_Object blocal_get_thread_data (struct Lisp_Buffer_Local_Value *l); Lisp_Object *blocal_get_realvalue (struct Lisp_Buffer_Local_Value *l); -void blocal_set_cdrs (struct Lisp_Buffer_Local_Value *l, Lisp_Object o); +void blocal_set_thread_data (struct Lisp_Buffer_Local_Value *l, Lisp_Object o); #define BLOCAL_GET_REALVALUE(A) (*blocal_get_realvalue (A)) #define BLOCAL_CLEAR_FLAGS_VEC(VEC) XSETFASTINT (AREF ((VEC), 0), 0) @@ -1377,16 +1377,16 @@ void blocal_set_cdrs (struct Lisp_Buffer_Local_Value *l, Lisp_Object o); #define BLOCAL_BUFFER_VEC(VEC) (AREF ((VEC), 1)) #define BLOCAL_FRAME_VEC(VEC) (AREF ((VEC), 2)) #define BLOCAL_CDR_VEC(VEC) (AREF ((VEC), 3)) -#define BLOCAL_CDRS(A) (blocal_get_cdrs (A)) -#define BLOCAL_SET_CDRS(A, B) (blocal_set_cdrs (A, B)) -#define BLOCAL_CLEAR_FLAGS(A) (BLOCAL_CLEAR_FLAGS_VEC (BLOCAL_CDRS (A))) -#define BLOCAL_FOUND_FOR_BUFFER(A) (BLOCAL_FOUND_FOR_BUFFER_VEC (BLOCAL_CDRS (A))) -#define BLOCAL_SET_FOUND_FOR_BUFFER(A) (BLOCAL_SET_FOUND_FOR_BUFFER_VEC (BLOCAL_CDRS (A))) -#define BLOCAL_FOUND_FOR_FRAME(A) (BLOCAL_FOUND_FOR_FRAME_VEC (BLOCAL_CDRS (A))) -#define BLOCAL_SET_FOUND_FOR_FRAME(A) (BLOCAL_SET_FOUND_FOR_FRAME_VEC (BLOCAL_CDRS (A))) -#define BLOCAL_BUFFER(A) (BLOCAL_BUFFER_VEC (BLOCAL_CDRS (A))) -#define BLOCAL_FRAME(A) (BLOCAL_FRAME_VEC (BLOCAL_CDRS (A))) -#define BLOCAL_CDR(A) (BLOCAL_CDR_VEC (BLOCAL_CDRS (A))) +#define BLOCAL_THREAD_DATA(A) (blocal_get_thread_data (A)) +#define BLOCAL_SET_THREAD_DATA(A, B) (blocal_set_thread_data (A, B)) +#define BLOCAL_CLEAR_FLAGS(A) (BLOCAL_CLEAR_FLAGS_VEC (BLOCAL_THREAD_DATA (A))) +#define BLOCAL_FOUND_FOR_BUFFER(A) (BLOCAL_FOUND_FOR_BUFFER_VEC (BLOCAL_THREAD_DATA (A))) +#define BLOCAL_SET_FOUND_FOR_BUFFER(A) (BLOCAL_SET_FOUND_FOR_BUFFER_VEC (BLOCAL_THREAD_DATA (A))) +#define BLOCAL_FOUND_FOR_FRAME(A) (BLOCAL_FOUND_FOR_FRAME_VEC (BLOCAL_THREAD_DATA (A))) +#define BLOCAL_SET_FOUND_FOR_FRAME(A) (BLOCAL_SET_FOUND_FOR_FRAME_VEC (BLOCAL_THREAD_DATA (A))) +#define BLOCAL_BUFFER(A) (BLOCAL_BUFFER_VEC (BLOCAL_THREAD_DATA (A))) +#define BLOCAL_FRAME(A) (BLOCAL_FRAME_VEC (BLOCAL_THREAD_DATA (A))) +#define BLOCAL_CDR(A) (BLOCAL_CDR_VEC (BLOCAL_THREAD_DATA (A))) /* START and END are markers in the overlay's buffer, and -- 2.11.4.GIT