From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 24 Oct 2010 21:37:38 +0000 (-0400)
Subject: Merge changes from emacs-23 branch.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/d414c7133f4a19c1ae8120a317cca35758b58c9a

Merge changes from emacs-23 branch.
---

d414c7133f4a19c1ae8120a317cca35758b58c9a
diff --cc src/ChangeLog
index 4c7711e34b,a6d19d40b1..98ae8a2ad0
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,14 +1,14 @@@
+ 2010-10-24  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* xterm.c (x_connection_closed): Kill Emacs unconditionally.
+ 
 -2010-10-22  Eli Zaretskii  <eliz@gnu.org>
++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".