* data.c (store_symval_forwarding): Rename local to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index 37e2183ef70adfe59e5bbbdaedcd6f416aa3d9d6..261805a8484d4134058713d5c2147151c0acc78e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
        * data.c (Findirect_variable): Name an expression, to avoid
        gcc -Wbad-function-cast warning.
        (default_value, arithcompare, arith_driver, arith_error): Now static.
+       (store_symval_forwarding): Rename local to avoid shadowing.
 
        * 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 81c16fff4895a1f509854f16b0ba0165a46125f9..50a6ac219c4a572844b6c9130298dc7325426f60 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -910,12 +910,12 @@ store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva
 
          for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
            {
-             Lisp_Object buf;
+             Lisp_Object lbuf;
              struct buffer *b;
 
-             buf = Fcdr (XCAR (tail));
-             if (!BUFFERP (buf)) continue;
-             b = XBUFFER (buf);
+             lbuf = Fcdr (XCAR (tail));
+             if (!BUFFERP (lbuf)) continue;
+             b = XBUFFER (lbuf);
 
              if (! PER_BUFFER_VALUE_P (b, idx))
                PER_BUFFER_VALUE (b, offset) = newval;