# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1259009935 0
# Node ID c89e7ab6a9d617022c3ff0c62d8c09931014320d
# Parent  936dfb675acf017bb14eeadee3c06d3476e5c843
* net/browse-url.el (browse-url-filename-alist): On Windows, add
two slashes to the "file:" prefix.
(browse-url-file-url): De-munge Cygwin filenames before passing
them to Windows browser.
(browse-url-default-windows-browser): Use call-process.

diff -r 936dfb675acf -r c89e7ab6a9d6 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 23 20:34:53 2009 +0000
+++ b/lisp/ChangeLog	Mon Nov 23 20:58:55 2009 +0000
@@ -1,3 +1,11 @@
+2009-11-23  Ken Brown  <kbrown@cornell.edu>  (tiny change)
+
+	* net/browse-url.el (browse-url-filename-alist): On Windows, add
+	two slashes to the "file:" prefix.
+	(browse-url-file-url): De-munge Cygwin filenames before passing
+	them to Windows browser.
+	(browse-url-default-windows-browser): Use call-process.
+
 2009-11-23  Juri Linkov  <juri@jurta.org>
 
 	Implement DocView Continuous mode.  (Bug#4896)
diff -r 936dfb675acf -r c89e7ab6a9d6 lisp/net/browse-url.el
--- a/lisp/net/browse-url.el	Mon Nov 23 20:34:53 2009 +0000
+++ b/lisp/net/browse-url.el	Mon Nov 23 20:58:55 2009 +0000
@@ -444,7 +444,7 @@
     ;; applies.
     ("^/\\([^:@]+@\\)?\\([^:]+\\):/*" . "ftp://\\1\\2/")
     ,@(if (memq system-type '(windows-nt ms-dos cygwin))
-          '(("^\\([a-zA-Z]:\\)[\\/]" . "file:\\1/")
+          '(("^\\([a-zA-Z]:\\)[\\/]" . "file:///\\1/")
             ("^[\\/][\\/]+" . "file://")))
     ("^/+" . "file:///"))
   "An alist of (REGEXP . STRING) pairs used by `browse-url-of-file'.
@@ -699,6 +699,12 @@
 (defun browse-url-file-url (file)
   "Return the URL corresponding to FILE.
 Use variable `browse-url-filename-alist' to map filenames to URLs."
+  ;; De-munge Cygwin filenames before passing them to Windows browser.
+  (if (eq system-type 'cygwin)
+      (let ((winfile (with-output-to-string
+		       (call-process "cygpath" nil standard-output
+				     nil "-m" file))))
+	(setq file (substring winfile 0 -1))))
   (let ((coding (and (default-value 'enable-multibyte-characters)
 		     (or file-name-coding-system
 			 default-file-name-coding-system))))
@@ -835,7 +841,7 @@
 	     (shell-command (concat "start " (shell-quote-argument url)))
 	   (error "Browsing URLs is not supported on this system")))
 	((eq system-type 'cygwin)
-	 (shell-command (concat "cygstart " (shell-quote-argument url))))
+	 (call-process "cygstart" nil nil nil url))
 	(t (w32-shell-execute "open" url))))
 
 (defun browse-url-default-macosx-browser (url &optional new-window)