changeset 83625:188795a4ee84

*** empty log message ***
author Juanma Barranquero <lekktu@gmail.com>
date Mon, 21 May 2007 12:16:07 +0000
parents 3b1222f7b28a
children 7489e9d44b85
files lib-src/ChangeLog.multi-tty
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lib-src/ChangeLog.multi-tty	Mon May 21 12:15:52 2007 +0000
+++ b/lib-src/ChangeLog.multi-tty	Mon May 21 12:16:07 2007 +0000
@@ -1,3 +1,8 @@
+2007-05-21  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.c (print_help_and_exit): Restore and adapt trunk
+	change from 2006-11-23 which was lost in the merge.
+
 2007-05-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* emacsclient.c (decode_options): Don't use a tty on mac carbon.
@@ -14,7 +19,7 @@
 
 2007-05-16  Jason Rumney  <jasonr@gnu.org>
 
-	* emacsclient.c: (emacs_socket): Rename from s.
+	* emacsclient.c (emacs_socket): Rename from s.
 	Move definition below includes it depends on.
 	(SEND_STRING, SEND_QUOTED): Remove obfuscation macros.
 	(quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp):