diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/server.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index 59fd973115b..35243aeb90e 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1172,7 +1172,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) + (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)) |