aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorMatthew Leach2018-02-12 12:52:43 -0800
committerPaul Eggert2018-02-12 12:57:58 -0800
commite1ca0ea87222e70710b3878ac80ed01f2378f050 (patch)
treecc79162baa9b968066aafc8d5f2279c5755e5316 /src/lisp.h
parentb3f45140ec441bf88fa25f4e615b18e076d51342 (diff)
downloademacs-e1ca0ea87222e70710b3878ac80ed01f2378f050.tar.gz
emacs-e1ca0ea87222e70710b3878ac80ed01f2378f050.zip
Fix `server-name' and `server-socket-dir' for (Bug#24218)
* lisp/server.el: (server-external-socket-initialised): New (server-name): Compute server name from `get-external-sockname'. (server-socket-dir): Compute socket dir from `get-external-sockname'. (server-start): Don't check for existing server when an uninitialised external socket has been passed to Emacs. * src/emacs.c: (main): Obtain socket name via getsockname and pass to `init_process_emacs'. * src/lisp.h: (init_process_emacs): Add second parameter. * src/process.c: (external_sock_name): New. (get-external-sockname): New. (init_process_emacs): Set `external_sock_name' to `sockname' parameter.
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h
index a7f0a1d78ff..0bd0e5e53cf 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4316,7 +4316,7 @@ extern void delete_keyboard_wait_descriptor (int);
4316extern void add_gpm_wait_descriptor (int); 4316extern void add_gpm_wait_descriptor (int);
4317extern void delete_gpm_wait_descriptor (int); 4317extern void delete_gpm_wait_descriptor (int);
4318#endif 4318#endif
4319extern void init_process_emacs (int); 4319extern void init_process_emacs (int, char *);
4320extern void syms_of_process (void); 4320extern void syms_of_process (void);
4321extern void setup_process_coding_systems (Lisp_Object); 4321extern void setup_process_coding_systems (Lisp_Object);
4322 4322