[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/url/url-handlers.el, v [EMACS_22_BAS
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/url/url-handlers.el, v [EMACS_22_BASE] |
Date: |
Mon, 21 Jan 2008 17:16:53 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Stefan Monnier <monnier> 08/01/21 17:16:53
Index: url-handlers.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-handlers.el,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -u -b -r1.20.2.3 -r1.20.2.4
--- url-handlers.el 7 Jan 2008 06:52:19 -0000 1.20.2.3
+++ url-handlers.el 21 Jan 2008 17:16:52 -0000 1.20.2.4
@@ -153,6 +153,7 @@
(put 'file-name-absolute-p 'url-file-handlers (lambda (&rest ignored) t))
(put 'expand-file-name 'url-file-handlers 'url-handler-expand-file-name)
(put 'directory-file-name 'url-file-handlers 'url-handler-directory-file-name)
+(put 'unhandled-file-name-directory 'url-file-handlers
'url-handler-unhandled-file-name-directory)
;; (put 'file-name-as-directory 'url-file-handlers
'url-handler-file-name-as-directory)
;; These are operations that we do not support yet (DAV!!!)
@@ -184,6 +185,13 @@
(if (string-match "//\\'" dir) dir
(url-run-real-handler 'directory-file-name (list dir))))
+(defun url-handler-unhandled-file-name-directory (filename)
+ ;; Copied from tramp.el. This is used as the cwd for subprocesses:
+ ;; without it running call-process or start-process in a URL directory
+ ;; signals an error.
+ ;; FIXME: we can do better if `filename' is a "file://" URL.
+ (expand-file-name "~/"))
+
;; The actual implementation
;;;###autoload
(defun url-copy-file (url newname &optional ok-if-already-exists keep-time)