Merge from emacs-24; up to 2014-07-28T02:47:29Z!fgallina@gnu.org

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

diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 6e4191ae7b56923a7de6ebeef2ce102dd02676f1..6adb2d978af18cf398c3fc2078ddcf58f50b0f5b 100644 (file)
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -1,9 +1,9 @@
 ;;; url-dav.el --- WebDAV support
 
-;; Copyright (C) 2001, 2004-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004-2014 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
-;; Maintainer: Bill Perry <wmperry@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: url, vc
 
 ;; This file is part of GNU Emacs.
@@ -32,10 +32,12 @@
 (require 'xml)
 (require 'url-util)
 (require 'url-handlers)
+(require 'url-http)
 
 (defvar url-dav-supported-protocols '(1 2)
   "List of supported DAV versions.")
 
+;; Dynamically bound.
 (defvar url-http-content-type)
 (defvar url-http-response-status)
 (defvar url-http-end-of-headers)
@@ -621,8 +623,6 @@ Returns t if the lock was successfully released."
         (url-debug 'dav "Unrecognized DAV:locktype (%S)" (car lock)))))
     modes))
 
-(autoload 'url-http-head-file-attributes "url-http")
-
 (defun url-dav-file-attributes (url &optional id-format)
   (let ((properties (cdar (url-dav-get-properties url))))
     (if (and properties