[Emacs-diffs] emacs/lisp ChangeLog net/browse-url.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/11/23 20:58:59

Modified files:
        lisp           : ChangeLog 
        lisp/net       : browse-url.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16709&r2=1.16710
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/browse-url.el?cvsroot=emacs&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16709
retrieving revision 1.16710
diff -u -b -r1.16709 -r1.16710
--- ChangeLog   23 Nov 2009 20:34:54 -0000      1.16709
+++ ChangeLog   23 Nov 2009 20:58:55 -0000      1.16710
@@ -1,3 +1,11 @@
+2009-11-23  Ken Brown  <address@hidden>  (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  <address@hidden>
 
        Implement DocView Continuous mode.  (Bug#4896)

Index: net/browse-url.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- net/browse-url.el   20 Nov 2009 21:49:49 -0000      1.86
+++ net/browse-url.el   23 Nov 2009 20:58:59 -0000      1.87
@@ -444,7 +444,7 @@
     ;; applies.
     ("^/\\([^:@address@hidden)?\\([^:]+\\):/*" . "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)