diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-03 14:37:41 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-03 14:37:41 -0700 |
| commit | 5589b70e5789a355d1aa88b469acdaac423ccbbb (patch) | |
| tree | aceb1a1b48499945e398a74df67264c1ce09d741 /lisp/url/url-util.el | |
| parent | e2afe435ea7392d67fcbbb50147de4791b9996df (diff) | |
| download | emacs-5589b70e5789a355d1aa88b469acdaac423ccbbb.tar.gz | |
Cosmetic changes for some lisp/url files.
* lisp/url/url-util.el (url-get-url-filename-chars): Don't eval-and-compile.
(url-get-url-at-point): Don't use eval-when-compile.
* lisp/url/url-cache.el (url-cache-create-filename-human-readable)
(url-cache-create-filename-using-md5):
* lisp/url/url-util.el (url-file-directory, url-file-nondirectory):
Don't use eval-when-compile and regexp-quote.
Diffstat (limited to 'lisp/url/url-util.el')
| -rw-r--r-- | lisp/url/url-util.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index 95fdcfb369c..62a9a75f2db 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -248,7 +248,7 @@ Will not do anything if `url-show-status' is nil." "Return the directory part of FILE, for a URL." (cond ((null file) "") - ((string-match (eval-when-compile (regexp-quote "?")) file) + ((string-match "\\?" file) (file-name-directory (substring file 0 (match-beginning 0)))) (t (file-name-directory file)))) @@ -257,7 +257,7 @@ Will not do anything if `url-show-status' is nil." "Return the nondirectory part of FILE, for a URL." (cond ((null file) "") - ((string-match (eval-when-compile (regexp-quote "?")) file) + ((string-match "\\?" file) (file-name-nondirectory (substring file 0 (match-beginning 0)))) (t (file-name-nondirectory file)))) @@ -436,10 +436,8 @@ This uses `url-current-object', set locally to the buffer." (url-recreate-url url-current-object) (message "%s" (url-recreate-url url-current-object))))) -(eval-and-compile - (defvar url-get-url-filename-chars "-%.?@a-zA-Z0-9()_/:~=&" - "Valid characters in a URL.") - ) +(defvar url-get-url-filename-chars "-%.?@a-zA-Z0-9()_/:~=&" + "Valid characters in a URL.") (defun url-get-url-at-point (&optional pt) "Get the URL closest to point, but don't change position. @@ -457,8 +455,7 @@ Has a preference for looking backward when not directly on a symbol." (if (not (bobp)) (backward-char 1))))) (if (and (char-after (point)) - (string-match (eval-when-compile - (concat "[" url-get-url-filename-chars "]")) + (string-match (concat "[" url-get-url-filename-chars "]") (char-to-string (char-after (point))))) (progn (skip-chars-backward url-get-url-filename-chars) |