aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-10-01 02:06:55 +0000
committerGlenn Morris2009-10-01 02:06:55 +0000
commitf9c9a2395c78871467101da8b0305672fd8bd975 (patch)
treeb027d0251035feb1080609cdcad48c8ed8efe793
parent3d9842c67e18fc78db3aeffba7b99a4e99320b97 (diff)
downloademacs-f9c9a2395c78871467101da8b0305672fd8bd975.tar.gz
emacs-f9c9a2395c78871467101da8b0305672fd8bd975.zip
(url-dav-file-attributes): Fix declaration.
-rw-r--r--lisp/url/ChangeLog4
-rw-r--r--lisp/url/url-http.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 7b38fb7ed11..e1c5970678d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
12009-10-01 Glenn Morris <rgm@gnu.org>
2
3 * url-http.el (url-dav-file-attributes): Fix declaration.
4
12009-09-13 Chong Yidong <cyd@stupidchicken.com> 52009-09-13 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * url-handlers.el (url-copy-file): Add fifth arg for compatibility 7 * url-handlers.el (url-copy-file): Add fifth arg for compatibility
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 0bcc6341961..d9be187328f 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,7 +1,7 @@
1;;; url-http.el --- HTTP retrieval routines 1;;; url-http.el --- HTTP retrieval routines
2 2
3;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007, 3;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007, 2008,
4;; 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: Bill Perry <wmperry@gnu.org> 6;; Author: Bill Perry <wmperry@gnu.org>
7;; Keywords: comm, data, processes 7;; Keywords: comm, data, processes
@@ -1272,7 +1272,7 @@ CBARGS as the arguments."
1272 nil nil nil) ;whether gid would change ; inode ; device. 1272 nil nil nil) ;whether gid would change ; inode ; device.
1273 (kill-buffer buffer))))) 1273 (kill-buffer buffer)))))
1274 1274
1275(declare-function url-dav-file-attributes (url &optional id-format)) 1275(declare-function url-dav-file-attributes "url-dav" (url &optional id-format))
1276 1276
1277;;;###autoload 1277;;;###autoload
1278(defun url-http-file-attributes (url &optional id-format) 1278(defun url-http-file-attributes (url &optional id-format)