* data.c (do_blv_forwarding, do_symval_forwarding): Remove; unused.

diff --git a/src/ChangeLog b/src/ChangeLog
index db04fe3..31b4ee9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,6 +9,7 @@
        (store_symval_forwarding): Rename local to avoid shadowing.
        (Fmake_variable_buffer_local, Fmake_local_variable): Mark
        variables as initialized.
+       (do_blv_forwarding, do_symval_forwarding): Remove; unused.
 
        * alloc.c (check_cons_list): Do not define unless GC_CHECK_CONS_LIST.
        (Fmake_vector, Fvector, Fmake_byte_code, Fgarbage_collect):

diff --git a/src/data.c b/src/data.c
index 6599d8f..01aafbc 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -818,9 +818,6 @@ variable chain of symbols.  */)
    This does not handle buffer-local variables; use
    swap_in_symval_forwarding for that.  */
 
-#define do_blv_forwarding(blv) \
-  ((blv)->forwarded ? do_symval_forwarding (BLV_FWD (blv)) : BLV_VALUE (blv))
-
 Lisp_Object
 do_symval_forwarding (register union Lisp_Fwd *valcontents)
 {
@@ -867,14 +864,6 @@ do_symval_forwarding (register union Lisp_Fwd *valcontents)
    BUF non-zero means set the value in buffer BUF instead of the
    current buffer.  This only plays a role for per-buffer variables.  */
 
-#define store_blv_forwarding(blv, newval, buf)                 \
-  do {                                                         \
-    if ((blv)->forwarded)                                      \
-      store_symval_forwarding (BLV_FWD (blv), (newval), (buf));        \
-    else                                                       \
-      SET_BLV_VALUE (blv, newval);                             \
-  } while (0)
-
 static void
 store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf)
 {