diff options
| author | Kenichi Handa | 2011-12-05 16:03:31 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-12-05 16:03:31 +0900 |
| commit | 2ab04b956544fc24132cee405f93c1a757ebca56 (patch) | |
| tree | f8ff3a51bac0430ed69b6497568de699f6d3b904 /lib-src/ChangeLog | |
| parent | a79703f53ccd12623371263d93baf0d1be928ec7 (diff) | |
| parent | 58a70b943c3efcc25e1396c8e67bc440c43a3f0a (diff) | |
| download | emacs-2ab04b956544fc24132cee405f93c1a757ebca56.tar.gz emacs-2ab04b956544fc24132cee405f93c1a757ebca56.zip | |
merge trunk
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index db1464f65d8..922a96ad194 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2011-12-04 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacsclient.c (decode_options) [WINDOWSNT]: Don't force tty = 0; | ||
| 4 | instead, treat both -c and -t as always requesting a new "tty" frame, | ||
| 5 | and let server.el decide which kind is actually required. | ||
| 6 | Reported by Uwe Siart <usenet@siart.de> in this thread: | ||
| 7 | http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00303.html | ||
| 8 | |||
| 9 | 2011-11-30 Chong Yidong <cyd@gnu.org> | ||
| 10 | |||
| 11 | * emacsclient.c (main): Condition last change on WINDOWSNT | ||
| 12 | (Bug#10155). | ||
| 13 | |||
| 1 | 2011-11-27 Eli Zaretskii <eliz@gnu.org> | 14 | 2011-11-27 Eli Zaretskii <eliz@gnu.org> |
| 2 | 15 | ||
| 3 | * makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS). | 16 | * makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS). |