diff options
| author | Glenn Morris | 2014-09-07 23:00:58 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-09-07 23:00:58 -0700 |
| commit | c04714f7c87956eb49e803d69290793f15fdaa90 (patch) | |
| tree | bf673719000a4e8d20178433870c1759d1759020 /src/data.c | |
| parent | 4612d1eab721a1010312382d1048c8b3a67b18fa (diff) | |
| parent | 6e82d877a4a59feb4390baeb2ccc57e7cd03593d (diff) | |
| download | emacs-c04714f7c87956eb49e803d69290793f15fdaa90.tar.gz emacs-c04714f7c87956eb49e803d69290793f15fdaa90.zip | |
Merge from emacs-24; up to 2014-07-08T06:24:07Z!eggert@cs.ucla.edu
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/data.c b/src/data.c index a155fe6f84a..fd515af5003 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1311,10 +1311,10 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, | |||
| 1311 | 1311 | ||
| 1312 | /* Find the new binding. */ | 1312 | /* Find the new binding. */ |
| 1313 | XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ | 1313 | XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ |
| 1314 | tem1 = Fassq (symbol, | 1314 | tem1 = assq_no_quit (symbol, |
| 1315 | (blv->frame_local | 1315 | (blv->frame_local |
| 1316 | ? XFRAME (where)->param_alist | 1316 | ? XFRAME (where)->param_alist |
| 1317 | : BVAR (XBUFFER (where), local_var_alist))); | 1317 | : BVAR (XBUFFER (where), local_var_alist))); |
| 1318 | set_blv_where (blv, where); | 1318 | set_blv_where (blv, where); |
| 1319 | blv->found = 1; | 1319 | blv->found = 1; |
| 1320 | 1320 | ||