[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b25770a: Improve recent change to emacsclient on Cy
From: |
Ken Brown |
Subject: |
[Emacs-diffs] master b25770a: Improve recent change to emacsclient on Cygwin |
Date: |
Tue, 07 Jul 2015 14:34:14 +0000 |
branch: master
commit b25770ab64f121a6c8f358c3b7b64936adc55ab6
Author: Ken Brown <address@hidden>
Commit: Ken Brown <address@hidden>
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.
---
lisp/server.el | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lisp/server.el b/lisp/server.el
index ce19b3c..b6b0e97 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b25770a: Improve recent change to emacsclient on Cygwin,
Ken Brown <=