[Emacs-diffs] /srv/bzr/emacs/trunk r101772: Cosmetic changes for some lisp/url files.

[Glenn Morris]

------------------------------------------------------------
revno: 101772
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-03 14:37:41 -0700
message:
  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.
modified:
  lisp/url/ChangeLog
  lisp/url/url-cache.el
  lisp/url/url-util.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2010-10-03 12:43:12 +0000
+++ b/lisp/url/ChangeLog        2010-10-03 21:37:41 +0000
@@ -1,3 +1,13 @@
+2010-10-03  Glenn Morris  <address@hidden>
+
+       * url-util.el (url-get-url-filename-chars): Don't eval-and-compile.
+       (url-get-url-at-point): Don't use eval-when-compile.
+
+       * url-cache.el (url-cache-create-filename-human-readable)
+       (url-cache-create-filename-using-md5):
+       * url-util.el (url-file-directory, url-file-nondirectory):
+       Don't use eval-when-compile and regexp-quote.
+
 2010-10-03  Lars Magne Ingebrigtsen  <address@hidden>
 
        * url-vars.el (url-mime-charset-string): Changed the default to

=== modified file 'lisp/url/url-cache.el'
--- a/lisp/url/url-cache.el     2010-09-25 20:59:05 +0000
+++ b/lisp/url/url-cache.el     2010-10-03 21:37:41 +0000
@@ -103,8 +103,7 @@
               (user-real-login-name)
               (cons (or protocol "file")
                     (reverse (split-string (or hostname "localhost")
-                                           (eval-when-compile
-                                             (regexp-quote ".")))))))
+                                           "\\.")))))
             (fname    (url-filename urlobj)))
        (if (and fname (/= (length fname) 0) (= (aref fname 0) ?/))
            (setq fname (substring fname 1 nil)))
@@ -164,8 +163,7 @@
                     (nreverse
                      (delq nil
                            (split-string (or hostname "localhost")
-                                         (eval-when-compile
-                                           (regexp-quote "."))))))))
+                                         "\\."))))))
             (fname    (url-filename urlobj)))
        (and fname
             (expand-file-name checksum

=== modified file 'lisp/url/url-util.el'
--- a/lisp/url/url-util.el      2010-10-02 12:34:02 +0000
+++ b/lisp/url/url-util.el      2010-10-03 21:37:41 +0000
@@ -248,7 +248,7 @@
   "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 @@
   "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 @@
        (url-recreate-url url-current-object)
       (message "%s" (url-recreate-url url-current-object)))))
 
-(eval-and-compile
-  (defvar url-get-url-filename-chars "address@hidden()_/:~=&"
-    "Valid characters in a URL.")
-  )
+(defvar url-get-url-filename-chars "address@hidden()_/:~=&"
+  "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 @@
                  (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)