diff options
| author | Chong Yidong | 2010-10-31 10:40:01 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-10-31 10:40:01 -0400 |
| commit | 2699a55464f7b43171c7b0e64d095640904e9e21 (patch) | |
| tree | d99ebc74b0a108dac964f0fbcd9f9d3592ac5c6f /src/ChangeLog | |
| parent | e6ef5dd9ce13d346c7bbdcd6794b29045b4e0e63 (diff) | |
| parent | 46eadc7aeedf0fe3944291e2631d8604b38fe25f (diff) | |
| download | emacs-2699a55464f7b43171c7b0e64d095640904e9e21.tar.gz emacs-2699a55464f7b43171c7b0e64d095640904e9e21.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d46e42e17b..359869027dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,15 @@ | |||
| 1 | 2010-10-31 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * xterm.c (x_connection_closed): Print informative error message | ||
| 4 | when aborting on GTK. This requires using shut_down_emacs | ||
| 5 | directly instead of Fkill_emacs. | ||
| 6 | |||
| 7 | 2010-10-31 Michael Albinus <michael.albinus@gmx.de> | ||
| 8 | |||
| 9 | * dbusbind.c (Fdbus_call_method_asynchronously) | ||
| 10 | (Fdbus_register_signal, Fdbus_register_method): Check, whether | ||
| 11 | `dbus-registered-objects-table' is initialized. | ||
| 12 | |||
| 1 | 2010-10-29 Eli Zaretskii <eliz@gnu.org> | 13 | 2010-10-29 Eli Zaretskii <eliz@gnu.org> |
| 2 | 14 | ||
| 3 | * emacs.c (main): Call syms_of_filelock unconditionally. | 15 | * emacs.c (main): Call syms_of_filelock unconditionally. |