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

diff --git a/src/ChangeLog b/src/ChangeLog
index ba460cafa22b4e3b3ad3dde35effc67e557431cf..7c619c2ce576c4f9fdff46e09f8eff1bfab7f9c2 100644 (file)
--- 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 69f6cc34c2989a7bad676e0ecec43aa3a438314f..570f305397574f7fc8d8220ff2a5f3a45ef16809 100644 (file)
--- 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))
          {