aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-03-02 20:07:36 +0200
committerEli Zaretskii2019-03-02 20:07:36 +0200
commitd2b5f445c1a5f9e105eb65e10b28a40645516656 (patch)
tree7152c6b9e6031941e22464cbc18681c0e6fb3fc4
parent7523a9e8b26f763eecd50981a3f2d6e705284324 (diff)
downloademacs-d2b5f445c1a5f9e105eb65e10b28a40645516656.tar.gz
emacs-d2b5f445c1a5f9e105eb65e10b28a40645516656.zip
Fix DND on MS-Windows with files from UNC directories
* lisp/dnd.el (dnd-get-local-file-uri): Always return nil on MS-Windows, as this method cannot possibly work there: URIs that begin with the local system's name are UNCs, where the //SERVER part cannot be removed. (Bug#34675)
-rw-r--r--lisp/dnd.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 73703863e6b..459a7238dcd 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -130,6 +130,7 @@ Return nil if URI is not a local file."
130 (match-string 0 sysname) 130 (match-string 0 sysname)
131 sysname)))) 131 sysname))))
132 (when (and hostname 132 (when (and hostname
133 (not (eq system-type 'windows-nt))
133 (or (string-equal "localhost" hostname) 134 (or (string-equal "localhost" hostname)
134 (string-equal (downcase sysname) hostname) 135 (string-equal (downcase sysname) hostname)
135 (string-equal sysname-no-dot hostname))) 136 (string-equal sysname-no-dot hostname)))