Simplify log ready for merge into trunk. On merge, date to be

replaced with merge date.

1 files changed, 54 insertions, 91 deletions

diff --git a/lib-src/ChangeLog.multi-tty b/lib-src/ChangeLog.multi-tty
index 1caebb4ddc3..8afea8e5d9b 100644
--- a/lib-src/ChangeLog.multi-tty
+++ b/lib-src/ChangeLog.multi-tty
@@ -1,98 +1,61 @@
-2007-05-26  Dan Nicolaescu  <dann@ics.uci.edu>
-
-        * emacsclient.c (main): Avoid having a declaration after a
-        statement.
-
-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.
-
-2007-05-17  Dan Nicolaescu  <dann@ics.uci.edu>
-
-        * emacsclient.c (handle_sigtstp): Use the new name for the
-          socket variable.
-
-2007-05-16  Dan Nicolaescu  <dann@ics.uci.edu>
-
-        * emacsclient.c (decode_options): Don't use a tty on windows.
-        * makefile.w32-in (VERSION): Update.
-
-2007-05-16  Jason Rumney  <jasonr@gnu.org>
-
-        * emacsclient.c (emacs_socket): Rename from s.
-        Move definition below includes it depends on.
-        (SEND_STRING, SEND_QUOTED): Remove obfuscation macros.
+0000-00-00  A. N. Other  <none@example.com>
+
+        (main_argc, main_argv, current_frame, window_system, tty): New
+        variables.
+        (longopts): Add tty, current-frame.
+        (xmalloc, xstrdup): New functions.
+        (decode_options): Set display from environment.  Add tty and
+        current_frame options.
+        (print_help_and_exit): Document tty and current-frame options.
+        (fail): Change arguments to void.
+        (main): When sockets are not defined, set main_argc, main_argv,
+        and call fail() with no arguments.
+        (quote_file_name): Rename to quote_argument.
+        (quote_argument): New name for old quote_file_name.
+        (unquote_argument, strprefix, pass_signal_to_emacs)
+        (handle_sigcont, handle_sigtstp, init_signals): New functions.
+        (set_local_socket): Initialize saved_errno to 0.  If socket-name
+        is too long, call `fail' rather than `exit'.
+        (main): Set main_argc, main_argv.  New var `str'.  Don't need a
+        filename or argument if tty or window_system set.  Call fail with
+        no arguments.  Send version number to Emacs for verification.
+        If tty is set, check TERM, and pass name and type to Emacs.
+        Pass window_system to Emacs.  Move sending of eval to optind
+        loop.  Send -position, -file to Emacs.  Call fsync after fflush.
+        Check for a client/server version match. Handle -emacs-pid,
+        -print, -error, -suspend.
+
+0000-00-00  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacsclient.c (w32_execvp): Move definition before use.
+        (decode_options): Don't use a tty on mac carbon or windows.
+
+0000-00-00  Jason Rumney  <jasonr@gnu.org>
+
+        * emacsclient.c (SEND_STRING, SEND_QUOTED): Remove obfuscation
+        macros.
         (quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp):
         (main): Expand removed macros inline.
-
-2007-05-16  Dan Nicolaescu  <dann@ics.uci.edu>
-
-        * emacsclient.c (s): Restore.
-        (main): Don't define s here.
-        (w32_execvp): Move definition before use.
-
-2007-05-16  Jason Rumney  <jasonr@gnu.org>
-
-        * emacsclient.c (s): Remove.
-        (main): Define here instead.
-        (main) [WINDOWSNT]: Don't call ttyname.
-        Don't recognize -suspend option.
+        (main) [WINDOWSNT]: Don't call ttyname.  Don't recognize -suspend
+        option.
         (main) [NO_SOCKETS_IN_FILE_SYSTEM]: Don't call init_signals.
-        (strprefix): Define unconditionally.
-
-2007-01-01  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c (in, out): Remove.
-        (s): New variable (moved out from main).
-        (handle_sigcont, handle_sigtstp): Use SEND_STRING.
-        (main): Fix typos.
-
-2006-04-01  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c: Copy IS_*_SEP definitions from lisp.h.
-
-2006-03-28  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c: Include sys/stat.h.
-
-2006-03-26  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c (get_current_dir_name): New function, copied here
-        from sysdep.c.
-        (main): Use it to send over the current directory.
-
-2005-11-19  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c (main): Send environment only when a new display
-        is created.
-
-2005-09-10  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c (decode_options): Make --no-wait imply
-        --current-frame, except when it is the only option given.  Make
-        sure no frame is opened when --current-frame is set.
-        (main): Pass --current-frame to server.el.
-
-2005-07-13  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c (handle_sigcont): Reestablish signal handler. (Dan
-        Nicolaescu)
-
-2005-02-04  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c (main): Handle -window-system-unsupported
-        command.  Doc update.
-
-2004-07-03  Karoly Lorentey  <lorentey@elte.hu>
-
-        * emacsclient.c (main): Don't exit prematurely on --no-wait,
-        let Emacs close the connection for us.
 
+0000-00-00  Karoly Lorentey  <lorentey@elte.hu>
+
+        * emacsclient.c (signal.h): New include.
+        (sys/stat.h, errno.h): Always include, even on WINDOWSNT.
+        (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP, IS_ANY_SEP): Copy
+        definitions here from src/lisp.h.
+        (get_current_dir_name): New function, copied from src/sysdep.c.
+        (decode_options): Make --no-wait imply --current-frame, except
+        when it is the only option given.  Make sure no frame is opened
+        when --current-frame is set.
+        (emacs_socket): New variable (moved out from main `s').
+        (main): Use get_current_dir_name to send over the current
+        directory.  Handle -window-system-unsupported command.  Doc
+        update.  Don't exit prematurely on --no-wait, let Emacs close the
+        connection for us.  When creating a new frame, send environment
+        and pwd to Emacs.  Send current-frame to Emacs.
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit