diff options
| author | Paul Eggert | 2011-05-30 22:24:53 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-30 22:24:53 -0700 |
| commit | aa1a7eb834c4671e3c49a97d72ca7e03f2a840a2 (patch) | |
| tree | 895009402041b60dcc2f4896067f34cd0e4d6826 /src/ChangeLog | |
| parent | 333d54dade1e7005d5a97612907158fe5ec3d310 (diff) | |
| parent | 738db17859465a4adaaf1d43bbb1d1eed307e712 (diff) | |
| download | emacs-aa1a7eb834c4671e3c49a97d72ca7e03f2a840a2.tar.gz emacs-aa1a7eb834c4671e3c49a97d72ca7e03f2a840a2.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 880cafc05a4..fa8022b0d4d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -9,6 +9,15 @@ | |||
| 9 | * gmalloc.c (register_heapinfo): Use inline unconditionally. | 9 | * gmalloc.c (register_heapinfo): Use inline unconditionally. |
| 10 | * lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__. | 10 | * lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__. |
| 11 | 11 | ||
| 12 | 2011-05-31 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 13 | |||
| 14 | Make it possible to run ./temacs. | ||
| 15 | |||
| 16 | * callproc.c (set_initial_environment): Remove CANNOT_DUMP code, | ||
| 17 | syms_of_callproc does the same thing. Remove test for | ||
| 18 | "initialized", do it in the caller. | ||
| 19 | * emacs.c (main): Avoid calling set_initial_environment when dumping. | ||
| 20 | |||
| 12 | 2011-05-31 Stefan Monnier <monnier@iro.umontreal.ca> | 21 | 2011-05-31 Stefan Monnier <monnier@iro.umontreal.ca> |
| 13 | 22 | ||
| 14 | * minibuf.c (Finternal_complete_buffer): Return `category' metadata. | 23 | * minibuf.c (Finternal_complete_buffer): Return `category' metadata. |