diff src/ChangeLog @ 111164:547e7258d492

Merge changes from emacs-23 branch.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 24 Oct 2010 17:37:38 -0400
parents bf6806de6892
children 93d41f7676cf
line wrap: on
line diff
--- a/src/ChangeLog	Sun Oct 24 22:47:22 2010 +0200
+++ b/src/ChangeLog	Sun Oct 24 17:37:38 2010 -0400
@@ -1,3 +1,14 @@
+2010-10-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xterm.c (x_connection_closed): Kill Emacs unconditionally.
+
+2010-10-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.
+
+	* dispnew.c (syms_of_display) <initial-window-system, window-system>:
+	Deprecate use as a boolean flag.
+
 2010-10-24  Jim Meyering  <jim@meyering.net>
 
 	* emacs.c (argmatch): Don't treat "--" as "--chdir".