diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/ChangeLog.1 | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog.1')
| -rw-r--r-- | src/ChangeLog.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index efe77648458..7fef45f36da 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 | |||
| @@ -2237,7 +2237,7 @@ | |||
| 2237 | 2237 | ||
| 2238 | * data.c (Fset): | 2238 | * data.c (Fset): |
| 2239 | If Vautoload_queue non-nil, record function and old definition | 2239 | If Vautoload_queue non-nil, record function and old definition |
| 2240 | by consing onto Vautoload_qeueue. | 2240 | by consing onto Vautoload_queue. |
| 2241 | 2241 | ||
| 2242 | * fns.c (Fprovide): | 2242 | * fns.c (Fprovide): |
| 2243 | If Vautoload_queue is non-nil, record old value of Vfeatures. | 2243 | If Vautoload_queue is non-nil, record old value of Vfeatures. |