Merge from emacs-23 branch

[gnu-emacs] / lisp / nxml / rng-uri.el

diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index c37ac32710ad62378215edba6b2f5e2e165bb0f0..2b367b20072555ac303bff26bba61dbdd736ac73 100644 (file)
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -1,6 +1,6 @@
 ;;; rng-uri.el --- URI parsing and manipulation
 
-;; Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML
@@ -26,7 +26,7 @@
 
 (defun rng-file-name-uri (f)
   "Return a URI for the filename F.
-Multibyte characters are left as is. Use `rng-uri-escape-multibyte' to
+Multibyte characters are left as is.  Use `rng-uri-escape-multibyte' to
 escape them using %HH."
   (setq f (expand-file-name f))
   (let ((url
@@ -102,7 +102,7 @@ Signal an error if URI is not a valid file URL."
       (setq path (substring path 1)))
     (when (and pattern (string-match "\\`\\./" path))
       (setq path (substring path 2)))
-    (setq path 
+    (setq path
          (cond ((eq pattern 'match)
                 (rng-uri-unescape-unibyte-match path))
                ((eq pattern 'replace)
@@ -162,7 +162,7 @@ Signal an error if URI is not a valid file URL."
              (cons scheme
                    (cons ":" parts))))
       (apply 'concat parts))))
-                       
+
 (defun rng-uri-resolve (uri-ref base-uri)
   "Resolve a possibly relative URI reference into absolute form.
 URI-REF is the URI reference to be resolved.
@@ -308,7 +308,7 @@ Both FULL and BASE must be absolute URIs."
                                (mapcar (lambda (h) (string-to-number h 16))
                                        (split-string str "%")))
                         'utf-8))
-    
+
 (defun rng-uri-unescape-unibyte (str)
   (replace-regexp-in-string "%[0-7][0-9a-fA-F]"
                            (lambda (h)
@@ -352,5 +352,4 @@ Both FULL and BASE must be absolute URIs."
 
 (provide 'rng-uri)
 
-;; arch-tag: c7b7b8b8-61d1-48ec-82bc-7001c70b2e9d
 ;;; rng-uri.el ends here