Re: Patch: file: -> file:/// in w32

[Jason Rumney]

Lennart Borgman wrote:

I believe a file url in w32 should begin with "file:///" not just "file:". (I am unsure about ms-dos here.) A tiny patch is attached for this.

I think the condition used here is wrong. Instead of using system-type, we should test for the actual problem. The actual problem here is that an absolute filename does not start with /, so we need to prepend an extra one to make the URL local. I'm not sure that the current test is doing the right thing for cygwin, for instance, it may depend on some user setting whether the cygwin port uses cygwin paths or native windows paths here.

Index: lisp/net/browse-url.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.53
diff -c -r1.53 browse-url.el
*** lisp/net/browse-url.el	6 Feb 2006 11:33:04 -0000	1.53
--- lisp/net/browse-url.el	16 Feb 2006 23:38:42 -0000
***************
*** 458,464 ****
      ;; applies.
      ("^/\\([^:@address@hidden)?\\([^:]+\\):/*" . "ftp://\\1\\2/")
      (,@ (if (memq system-type '(windows-nt ms-dos cygwin))
! 	    '(("^\\([a-zA-Z]:\\)[\\/]" . "file:\\1/")
                ("^[\\/][\\/]+" . "file://"))))
      ("^/+" . "file:/")))
    "*An alist of (REGEXP . STRING) pairs used by `browse-url-of-file'.
--- 458,464 ----
      ;; applies.
      ("^/\\([^:@address@hidden)?\\([^:]+\\):/*" . "ftp://\\1\\2/")
      (,@ (if (memq system-type '(windows-nt ms-dos cygwin))
! 	    '(("^\\([a-zA-Z]:\\)[\\/]" . "file:///\\1/")
                ("^[\\/][\\/]+" . "file://"))))
      ("^/+" . "file:/")))
    "*An alist of (REGEXP . STRING) pairs used by `browse-url-of-file'.
  

_______________________________________________
Emacs-devel mailing list
address@hidden
http://lists.gnu.org/mailman/listinfo/emacs-devel