# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1192284170 0
# Node ID 5299839279f58fbc6263626059a59ccf252ccec3
# Parent  b9dc4d748f64ab436dc1bb8fda4559c72a48bfef
(url-basepath): Function deleted.
(url-file-directory, url-file-nondirectory): New functions
replacing url-basepath.  Callers changed.

diff -r b9dc4d748f64 -r 5299839279f5 lisp/url/url-util.el
--- a/lisp/url/url-util.el	Sat Oct 13 11:34:19 2007 +0000
+++ b/lisp/url/url-util.el	Sat Oct 13 14:02:50 2007 +0000
@@ -259,18 +259,24 @@
     (/ (* x 100) y)))
 
 ;;;###autoload
-(defun url-basepath (file &optional x)
-  "Return the base pathname of FILE, or the actual filename if X is true."
+(defun url-file-directory (file)
+  "Return the directory part of FILE, for a URL."
   (cond
    ((null file) "")
    ((string-match (eval-when-compile (regexp-quote "?")) file)
-    (if x
-	(file-name-nondirectory (substring file 0 (match-beginning 0)))
-      (file-name-directory (substring file 0 (match-beginning 0)))))
-   (x (file-name-nondirectory file))
+    (file-name-directory (substring file 0 (match-beginning 0))))
    (t (file-name-directory file))))
 
 ;;;###autoload
+(defun url-file-nondirectory (file)
+  "Return the nondirectory part of FILE, for a URL."
+  (cond
+   ((null file) "")
+   ((string-match (eval-when-compile (regexp-quote "?")) file)
+    (file-name-nondirectory (substring file 0 (match-beginning 0))))
+   (t (file-name-nondirectory file))))
+
+;;;###autoload
 (defun url-parse-query-string (query &optional downcase allow-newlines)
   (let (retval pairs cur key val)
     (setq pairs (split-string query "&"))
@@ -385,7 +391,7 @@
 If optional variable X is t,
 then return the basename of the file with the extension stripped off."
   (if (and fname
-	   (setq fname (url-basepath fname t))
+	   (setq fname (url-file-nondirectory fname))
 	   (string-match "\\.[^./]+$" fname))
       (if x (substring fname 0 (match-beginning 0))
 	(substring fname (match-beginning 0) nil))