ChangeLog fix.

[gnu-emacs] / lisp / url / url-handlers.el

diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 8477771d6e4575458ae7f7988e05b2be72802cac..fef0ef15e95a0e82ef558482ca09040615fb7cbe 100644 (file)
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -1,7 +1,6 @@
 ;;; url-handlers.el --- file-name-handler stuff for URL loading
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2011  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -132,7 +131,7 @@ the arguments that would have been passed to OPERATION."
        (hooked nil))
     (if (and fn (fboundp fn))
        (setq hooked t
-             val (apply fn args))
+             val (save-match-data (apply fn args)))
       (setq hooked nil
            val (url-run-real-handler operation args)))
     (url-debug 'handlers "%s %S%S => %S" (if hooked "Hooked" "Real")
@@ -215,7 +214,8 @@ the arguments that would have been passed to OPERATION."
 
 ;; The actual implementation
 ;;;###autoload
-(defun url-copy-file (url newname &optional ok-if-already-exists keep-time)
+(defun url-copy-file (url newname &optional ok-if-already-exists
+                         keep-time preserve-uid-gid)
   "Copy URL to NEWNAME.  Both args must be strings.
 Signals a `file-already-exists' error if file NEWNAME already exists,
 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.
@@ -223,6 +223,7 @@ A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
 Fourth arg KEEP-TIME non-nil means give the new file the same
 last-modified time as the old one.  (This works on only some systems.)
+Fifth arg PRESERVE-UID-GID is ignored.
 A prefix arg makes KEEP-TIME non-nil."
   (if (and (file-exists-p newname)
           (not ok-if-already-exists))
@@ -323,5 +324,4 @@ They count bytes from the beginning of the body."
 
 (provide 'url-handlers)
 
-;; arch-tag: 7300b99c-cc83-42ff-9147-79b2723c62ac
 ;;; url-handlers.el ends here