[Emacs-diffs] /srv/bzr/emacs/trunk r107890: Adapt browse-url.el to improvements in Cygwin's cygstart utility.

[Ken Brown]

------------------------------------------------------------
revno: 107890
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Fri 2012-04-13 11:15:42 -0400
message:
  Adapt browse-url.el to improvements in Cygwin's cygstart utility.
  
  * lisp/net/browse-url.el (browse-url-file-url): Remove Cygwin hack;
  this is no longer needed now that cygstart understands file://
  URLs.
  (browse-url-filename-alist): For the same reason, don't modify
  file:// URLs on Cygwin.
modified:
  lisp/ChangeLog
  lisp/net/browse-url.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-13 13:32:37 +0000
+++ b/lisp/ChangeLog    2012-04-13 15:15:42 +0000
@@ -1,3 +1,11 @@
+2012-04-13  Ken Brown  <address@hidden>
+
+       * net/browse-url.el (browse-url-file-url): Remove Cygwin hack;
+       this is no longer needed now that cygstart understands file://
+       URLs.
+       (browse-url-filename-alist): For the same reason, don't modify
+       file:// URLs on Cygwin.
+
 2012-04-13  Stefan Monnier  <address@hidden>
 
        * emulation/cua-base.el (cua--pre-command-handler-1): Don't activate

=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el    2012-02-28 08:17:21 +0000
+++ b/lisp/net/browse-url.el    2012-04-13 15:15:42 +0000
@@ -467,7 +467,7 @@
     ;; it in anonymous cases.  If it's not anonymous the next regexp
     ;; applies.
     ("^/\\([^:@address@hidden)?\\([^:]+\\):/*" . "ftp://\\1\\2/";)
-    ,@(if (memq system-type '(windows-nt ms-dos cygwin))
+    ,@(if (memq system-type '(windows-nt ms-dos))
           '(("^\\([a-zA-Z]:\\)[\\/]" . "file:///\\1/")
             ("^[\\/][\\/]+" . "file://")))
     ("^/+" . "file:///"))
@@ -724,12 +724,6 @@
 (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))))