Mercurial > emacs
comparison lisp/url/url.el @ 83429:ec395f552d45
Merged from miles@gnu.org--gnu-2005 (patch 681)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-681
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-469
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Thu, 29 Dec 2005 04:46:59 +0000 |
| parents | d0eee3282e6b 5a29e54d6794 |
| children | c69d44922688 |
comparison
equal
deleted
inserted
replaced
| 83428:d0eee3282e6b | 83429:ec395f552d45 |
|---|---|
| 45 (require 'url-proxy) | 45 (require 'url-proxy) |
| 46 (require 'url-parse) | 46 (require 'url-parse) |
| 47 (require 'url-util) | 47 (require 'url-util) |
| 48 | 48 |
| 49 ;; Fixme: customize? convert-standard-filename? | 49 ;; Fixme: customize? convert-standard-filename? |
| 50 ;;;###autoload | |
| 51 (defvar url-configuration-directory | 50 (defvar url-configuration-directory |
| 52 (cond | 51 (cond |
| 53 ((file-directory-p "~/.url") "~/.url") | 52 ((file-directory-p "~/.url") "~/.url") |
| 54 ((file-directory-p "~/.emacs.d") "~/.emacs.d/url") | 53 ((file-directory-p "~/.emacs.d") "~/.emacs.d/url") |
| 55 (t "~/.url"))) | 54 (t "~/.url"))) |