diff options
| author | Miles Bader <miles@gnu.org> | 2004-04-04 04:44:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-04-04 04:44:10 +0000 |
| commit | e5566bd545c8557083a84f651b02a6090316dfed (patch) | |
| tree | 75532668fb9a7ba34639f4ad1289d357ccd5f072 /lisp/url/url-expand.el | |
| parent | 1051f1d82c3484c3197916ce6c16b40c7c147b8c (diff) | |
| download | emacs-e5566bd545c8557083a84f651b02a6090316dfed.tar.gz | |
Resolve CVS conflicts
Diffstat (limited to 'lisp/url/url-expand.el')
| -rw-r--r-- | lisp/url/url-expand.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index 49048dd323e..8fe9683acda 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -1,7 +1,7 @@ ;;; url-expand.el --- expand-file-name for URLs -;; Author: $Author: wmperry $ -;; Created: $Date: 1999/12/05 08:09:15 $ -;; Version: $Revision: 1.3 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -141,3 +141,5 @@ path components followed by `..' are removed, along with the `..' itself." (url-set-filename urlobj (if query (concat file sepchar query) file)))))) (provide 'url-expand) + +;;; arch-tag: 7b5f744b-b721-49da-be47-484631680a5a |