From a2fb94a59028537b99c7be5c5f3f79795e7b2609 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 31 Dec 2009 14:42:56 +0100 Subject: [PATCH] Avoid a double symval forwarding --- src/data.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data.c b/src/data.c index 941ded20a15..43257cb8de3 100644 --- a/src/data.c +++ b/src/data.c @@ -1001,7 +1001,7 @@ do_symval_forwarding (valcontents) + (char *)FRAME_KBOARD (SELECTED_FRAME ())); case Lisp_Misc_ThreadLocal: - return do_symval_forwarding (*find_variable_location (&valcontents)); + return *find_variable_location (&valcontents); } return valcontents; } @@ -1112,7 +1112,7 @@ store_symval_forwarding (symbol, valcontents, newval, buf) { Lisp_Object val = indirect_variable (XSYMBOL (symbol))->value; ensure_thread_local (&val); - *find_variable_location (&val) = newval; + *find_variable_location (&val) = newval; } else SET_SYMBOL_VALUE (symbol, newval); @@ -1391,7 +1391,7 @@ set_internal (symbol, newval, buf, bindflag) XSETBUFFER (BLOCAL_BUFFER (XBUFFER_LOCAL_VALUE (valcontents)), buf); BLOCAL_FRAME (XBUFFER_LOCAL_VALUE (valcontents)) = selected_frame; } - innercontents = XBUFFER_LOCAL_VALUE (valcontents)->realvalue; + innercontents = BLOCAL_REALVALUE (XBUFFER_LOCAL_VALUE (valcontents)); /* Store the new value in the cons-cell. */ XSETCDR (XCAR (BLOCAL_CDR (XBUFFER_LOCAL_VALUE (valcontents))), newval); -- 2.11.4.GIT