1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-30 11:09:23 +00:00

Improve recent change to emacsclient on Cygwin

* lisp/server.el (server-process-filter): Remove redundant check
that 'cygwin-convert-file-name-from-windows' is defined as a
function on Cygwin.  Don't call that function unless its argument
starts with a drive letter.
This commit is contained in:
Ken Brown 2015-07-07 10:24:09 -04:00
parent 1ffd9abcd7
commit b25770ab64

View File

@ -1167,8 +1167,11 @@ The following commands are accepted by the client:
(let ((file (pop args-left)))
(if coding-system
(setq file (decode-coding-string file coding-system)))
;; 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))
(string-match "\\`[A-Za-z]:" file))
(setq file (cygwin-convert-file-name-from-windows file)))
(setq file (expand-file-name file dir))
(push (cons file filepos) files)