diff options
| author | Miles Bader | 2007-01-01 03:21:06 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-01-01 03:21:06 +0000 |
| commit | 4c34eeeee5886d14f3e60b77fb563cb549c8896f (patch) | |
| tree | af17010f0864173dd6416585f08d686377791412 /src/data.c | |
| parent | 76acf92ebe73e35528c5966a21328305ba7b5aef (diff) | |
| parent | db6292445840e2795f35ebad62a14314fc3c7c21 (diff) | |
| download | emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.gz emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 563-582)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 177-185)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c index 00ef0b1c822..120a92d66d7 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1264,7 +1264,7 @@ set_internal (symbol, newval, buf, bindflag) | |||
| 1264 | XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, | 1264 | XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, |
| 1265 | tem1); | 1265 | tem1); |
| 1266 | 1266 | ||
| 1267 | /* Set `buffer' and `frame' slots for thebinding now loaded. */ | 1267 | /* Set `buffer' and `frame' slots for the binding now loaded. */ |
| 1268 | XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, buf); | 1268 | XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, buf); |
| 1269 | XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame; | 1269 | XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame; |
| 1270 | } | 1270 | } |