aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2010-10-24 17:37:38 -0400
committerChong Yidong2010-10-24 17:37:38 -0400
commitd414c7133f4a19c1ae8120a317cca35758b58c9a (patch)
treeeb52545967a13b139167f6575da5fa413b7a50fc /src/ChangeLog
parentd77d0953b5ddb05ea7ad19556f37a5f5c4d3a67b (diff)
parent0c382083b6b550c26fad8ac7f59b1ba09663e728 (diff)
downloademacs-d414c7133f4a19c1ae8120a317cca35758b58c9a.tar.gz
emacs-d414c7133f4a19c1ae8120a317cca35758b58c9a.zip
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c7711e34b9..98ae8a2ad04 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
12010-10-24 Chong Yidong <cyd@stupidchicken.com>
2
3 * xterm.c (x_connection_closed): Kill Emacs unconditionally.
4
52010-10-24 Eli Zaretskii <eliz@gnu.org>
6
7 * frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.
8
9 * dispnew.c (syms_of_display) <initial-window-system, window-system>:
10 Deprecate use as a boolean flag.
11
12010-10-24 Jim Meyering <jim@meyering.net> 122010-10-24 Jim Meyering <jim@meyering.net>
2 13
3 * emacs.c (argmatch): Don't treat "--" as "--chdir". 14 * emacs.c (argmatch): Don't treat "--" as "--chdir".