Mercurial > emacs
changeset 99158:d1d986962044
* emacs.c (daemon_name): New variable.
(main): Deal with --daemon=SERVER_NAME.
(Fdaemonp): Return a name if one was passed to --daemon.
* startup.el (server-name): Pacify byte compiler.
(command-line): If --daemon=SERVER_NAME was used, set server-name
before calling server-start.
* cmdargs.texi (Initial Options): Document -daemon=SERVER_NAME.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 27 Oct 2008 07:02:30 +0000 |
| parents | 5421f3e36aca |
| children | b0dce7f34dda |
| files | doc/emacs/ChangeLog doc/emacs/cmdargs.texi lisp/ChangeLog lisp/startup.el src/ChangeLog src/emacs.c |
| diffstat | 6 files changed, 43 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Mon Oct 27 05:43:17 2008 +0000 +++ b/doc/emacs/ChangeLog Mon Oct 27 07:02:30 2008 +0000 @@ -1,3 +1,7 @@ +2008-10-27 Dan Nicolaescu <dann@ics.uci.edu> + + * cmdargs.texi (Initial Options): Document -daemon=SERVER_NAME. + 2008-10-23 Chong Yidong <cyd@stupidchicken.com> * custom.texi (Function Keys): Note that modified keypad keys are not
--- a/doc/emacs/cmdargs.texi Mon Oct 27 05:43:17 2008 +0000 +++ b/doc/emacs/cmdargs.texi Mon Oct 27 07:02:30 2008 +0000 @@ -286,6 +286,10 @@ connect and create graphical or terminal frames using @code{emacsclient}. +@item -daemon=@var{SERVER-NAME} +Start emacs in background as a daemon, and start the server with the +name set to @var{SERVER-NAME}. + @item --no-splash @opindex --no-splash @vindex inhibit-startup-screen
--- a/lisp/ChangeLog Mon Oct 27 05:43:17 2008 +0000 +++ b/lisp/ChangeLog Mon Oct 27 07:02:30 2008 +0000 @@ -1,3 +1,9 @@ +2008-10-27 Dan Nicolaescu <dann@ics.uci.edu> + + * startup.el (server-name): Pacify byte compiler. + (command-line): If --daemon=SERVER_NAME was used, set server-name + before calling server-start. + 2008-10-26 Romain Francoise <romain@orebokech.com> * startup.el (command-line): Call daemon-initialized after
--- a/lisp/startup.el Mon Oct 27 05:43:17 2008 +0000 +++ b/lisp/startup.el Mon Oct 27 07:02:30 2008 +0000 @@ -693,6 +693,8 @@ (declare-function tool-bar-mode "tool-bar" (&optional arg)) (declare-function tool-bar-setup "tool-bar") +(defvar server-name) + (defun command-line () (setq before-init-time (current-time) after-init-time nil @@ -1212,9 +1214,11 @@ ;; This is done after loading the user's init file and after ;; processing all command line arguments to allow e.g. `server-name' ;; to be changed before the server starts. - (when (daemonp) - (server-start) - (daemon-initialized)) + (let ((dn (daemonp))) + (when dn + (when (stringp dn) (setq server-name dn)) + (server-start) + (daemon-initialized))) ;; Run emacs-session-restore (session management) if started by ;; the session manager and we have a session manager connection.
--- a/src/ChangeLog Mon Oct 27 05:43:17 2008 +0000 +++ b/src/ChangeLog Mon Oct 27 07:02:30 2008 +0000 @@ -1,3 +1,9 @@ +2008-10-27 Dan Nicolaescu <dann@ics.uci.edu> + + * emacs.c (daemon_name): New variable. + (main): Deal with --daemon=SERVER_NAME. + (Fdaemonp): Return a name if one was passed to --daemon. + 2008-10-26 Romain Francoise <romain@orebokech.com> * emacs.c (daemon_pipe): New variable.
--- a/src/emacs.c Mon Oct 27 05:43:17 2008 +0000 +++ b/src/emacs.c Mon Oct 27 07:02:30 2008 +0000 @@ -237,6 +237,8 @@ /* Nonzero means Emacs was started as a daemon. */ int is_daemon = 0; +/* Name for the server started by the daemon.*/ +static char *daemon_name; /* Pipe used to send exit notification to the daemon parent at startup. */ @@ -796,6 +798,7 @@ #endif int no_loadup = 0; char *junk = 0; + char *dname_arg = 0; #if GC_MARK_STACK extern Lisp_Object *stack_base; @@ -1074,7 +1077,8 @@ exit (0); } - if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args)) + if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args) + || argmatch (argv, argc, "-daemon", "--daemon", 5, &dname_arg, &skip_args)) { #ifndef DOS_NT pid_t f; @@ -1123,6 +1127,8 @@ exit (1); } + if (dname_arg) + daemon_name = xstrdup (dname_arg); /* Close unused reading end of the pipe. */ close (daemon_pipe[0]); is_daemon = 1; @@ -2419,10 +2425,17 @@ } DEFUN ("daemonp", Fdaemonp, Sdaemonp, 0, 0, 0, - doc: /* Return t if the current emacs process is a daemon. */) + doc: /* Return non-nil if the current emacs process is a daemon. +If the daemon was given a name argument, return that name. */) () { - return is_daemon ? Qt : Qnil; + if (is_daemon) + if (daemon_name) + return build_string (daemon_name); + else + return Qt; + else + return Qnil; } DEFUN ("daemon-initialized", Fdaemon_initialized, Sdaemon_initialized, 0, 0, 0,