* src/data.c (Flocal_variable_p): Handle variable aliases correctly.

2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ba460cafa22..7c619c2ce57 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-03  Johan Bockgård  <bojohan@gnu.org>
+
+        * data.c (Flocal_variable_p): Handle variable aliases correctly.
+
 2010-08-02  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap
diff --git a/src/data.c b/src/data.c
index 69f6cc34c29..570f3053975 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1866,6 +1866,7 @@ BUFFER defaults to the current buffer.  */)
         Lisp_Object tail, elt, tmp;
         struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
         XSETBUFFER (tmp, buf);
+        XSETSYMBOL (variable, sym); /* Update in case of aliasing.  */
 
         for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
           {