From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 15 Mar 2011 23:07:15 +0000 (-0700)
Subject: * data.c (store_symval_forwarding): Rename local to avoid shadowing.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/b9b84fa9b19f892520aa9fe3479d3da03a9b0da6

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 37e2183ef7..261805a848 100644
--- 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 81c16fff48..50a6ac219c 100644
--- 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;