Re: Cygwin patches

[Ken Brown <kbrown@cornell.edu>]

[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]

On 11/22/2009 9:09 PM, Ken Brown wrote:
> On 11/22/2009 8:50 PM, Chong Yidong wrote:
>> Ken Brown <kbrown@cornell.edu> writes:
>>
>>> So are you saying that "file:" (with no slashes) is added by design?
>>> It doesn't work for me.  (After the call to cygpath, I have a path of
>>> the form C:/blah/blah/blah.html; I need to add "file://", since
>>> otherwise only "file:" gets added and I don't have a valid URL.)
>>
>> Does this change (instead of the other patches we've been considering)
>> do the right thing on Cygwin?
> 
> No.  It still just adds "file:" to the windows path I get after the call 
> to cygpath.  And I can't omit the call to cygpath; if I do that, I'll 
> have a URL with the right number of slashes, but it won't be one that 
> the Windows browser will understand.

On the other hand, if we adopt part of the patch that Lennart proposed in

   http://lists.gnu.org/archive/html/bug-gnu-emacs/2009-11/msg00343.html

then it does work on cygwin.  And, I gather from Lennart's post, this 
also solves a problem on Windows.  The combined patch is attached. 
[I've also taken the opportunity to make a slight improvement in 
browse-url-default-windows-browser by using call-process instead of 
shell-command.]

Does this look OK?

Ken

[-- Attachment #2: browse-url.el.patch --]
[-- Type: text/plain, Size: 1425 bytes --]

--- browse-url.el.orig	2009-11-20 16:49:49.000000000 -0500
+++ browse-url.el	2009-11-23 14:33:01.843750000 -0500
@@ -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,10 @@
 (defun browse-url-file-url (file)
   "Return the URL corresponding to FILE.
 Use variable `browse-url-filename-alist' to map filenames to URLs."
+  (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 +839,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)