X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ce7ef5b5e02ba2ed7899ef95c3b44791dc1575ae..7f02dedfcae6ba0e3a646c1367c908af9b3dbe1d:/lisp/server.el diff --git a/lisp/server.el b/lisp/server.el index 20fa27c20b..e4cf431257 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1,6 +1,6 @@ ;;; server.el --- Lisp code for GNU Emacs running as server process -*- lexical-binding: t -*- -;; Copyright (C) 1986-1987, 1992, 1994-2015 Free Software Foundation, +;; Copyright (C) 1986-1987, 1992, 1994-2016 Free Software Foundation, ;; Inc. ;; Author: William Sommerfeld @@ -255,6 +255,7 @@ This means that the server should not kill the buffer when you say you are done with it in the server.") (make-variable-buffer-local 'server-existing-buffer) +;;;###autoload (defcustom server-name "server" "The name of the Emacs server, if this Emacs process creates one. The command `server-start' makes use of this. It should not be @@ -655,6 +656,7 @@ server or call `\\[server-force-delete]' to forcibly disconnect it.")) :noquery t :sentinel #'server-sentinel :filter #'server-process-filter + :use-external-socket t ;; We must receive file names without being decoded. ;; Those are decoded by server-process-filter according ;; to file-name-coding-system. Also don't get @@ -1172,8 +1174,7 @@ The following commands are accepted by the client: ;; Allow Cygwin's emacsclient to be used as a file ;; handler on MS-Windows, in which case FILENAME ;; might start with a drive letter. - (when (and (eq system-type 'cygwin) - (fboundp 'cygwin-convert-file-name-from-windows) + (when (and (fboundp 'cygwin-convert-file-name-from-windows) (string-match "\\`[A-Za-z]:" file)) (setq file (cygwin-convert-file-name-from-windows file))) (setq file (expand-file-name file dir))