Mercurial > emacs
diff lisp/url/url-http.el @ 83104:625059157bad
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221
Restore deleted tagline in etc/TUTORIAL.ru
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-223
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-224
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-225
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-144
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 18 Apr 2004 01:40:02 +0000 |
| parents | eb7e8d483840 fd6856033c18 |
| children | 549734260e34 |
line wrap: on
line diff
--- a/lisp/url/url-http.el Sun Apr 18 01:34:11 2004 +0000 +++ b/lisp/url/url-http.el Sun Apr 18 01:40:02 2004 +0000 @@ -4,6 +4,7 @@ ;; Author: Bill Perry <wmperry@gnu.org> ;; Keywords: comm, data, processes + ;; This file is part of GNU Emacs. ;; ;; GNU Emacs is free software; you can redistribute it and/or modify @@ -1120,7 +1121,7 @@ ;;;###autoload (defalias 'url-http-file-readable-p 'url-http-file-exists-p) -(defun url-http-head-file-attributes (url) +(defun url-http-head-file-attributes (url &optional id-format) (let ((buffer (url-http-head url)) (attributes nil)) (when buffer @@ -1136,10 +1137,10 @@ attributes)) ;;;###autoload -(defun url-http-file-attributes (url) +(defun url-http-file-attributes (url &optional id-format) (if (url-dav-supported-p url) - (url-dav-file-attributes url) - (url-http-head-file-attributes url))) + (url-dav-file-attributes url id-format) + (url-http-head-file-attributes url id-format))) ;;;###autoload (defun url-http-options (url)