summaryrefslogtreecommitdiff
path: root/src/w32fns.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-11-28 22:55:31 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2014-11-28 23:07:16 -0800
commit0cce3623b169732a51f055a86fc926313b11a5ee (patch)
tree17154977d6e77f604ede0b82f89b2aeb6925310a /src/w32fns.c
parent9875d23d86c0668b1e697b67a394560d66c7826d (diff)
parent6b765b8facbdbb03f28028007885236601652515 (diff)
downloademacs-0cce3623b169732a51f055a86fc926313b11a5ee.tar.gz
emacs-0cce3623b169732a51f055a86fc926313b11a5ee.tar.bz2
emacs-0cce3623b169732a51f055a86fc926313b11a5ee.zip
Merge branch 'emacs-24'.
Diffstat (limited to 'src/w32fns.c')
-rw-r--r--src/w32fns.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index e5149704335..fc10e74cdff 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7011,7 +7011,14 @@ a ShowWindow flag:
Lisp_Object absdoc_encoded = ENCODE_FILE (absdoc);
if (faccessat (AT_FDCWD, SSDATA (absdoc_encoded), F_OK, AT_EACCESS) == 0)
- document = absdoc_encoded;
+ {
+ /* ShellExecute fails if DOCUMENT is a UNC with forward
+ slashes (expand-file-name above converts all backslashes
+ to forward slashes). Now that we know DOCUMENT is a
+ file, we can mirror all forward slashes into backslashes. */
+ unixtodos_filename (SSDATA (absdoc_encoded));
+ document = absdoc_encoded;
+ }
else
document = ENCODE_FILE (document);
}