Mercurial > emacs
comparison lisp/url/url-http.el @ 54699:7784ae10206d
Resolve CVS conflicts
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 04 Apr 2004 04:44:10 +0000 |
| parents | 3fb37923e567 |
| children | e8824c4f5f7e 1029206e72f2 |
comparison
equal
deleted
inserted
replaced
| 54698:ee631551cb0a | 54699:7784ae10206d |
|---|---|
| 1 ;;; url-http.el --- HTTP retrieval routines | 1 ;;; url-http.el --- HTTP retrieval routines |
| 2 ;; Author: Bill Perry <wmperry@gnu.org> | 2 ;; Author: Bill Perry <wmperry@gnu.org> |
| 3 ;; Version: $Revision: 1.39 $ | 3 ;; Version: $Revision: 1.1.1.1 $ |
| 4 ;; Keywords: comm, data, processes | 4 ;; Keywords: comm, data, processes |
| 5 | 5 |
| 6 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 6 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 7 ;;; Copyright (c) 1999, 2001 Free Software Foundation, Inc. | 7 ;;; Copyright (c) 1999, 2001 Free Software Foundation, Inc. |
| 8 ;;; | 8 ;;; |
| 1218 (if buffer (kill-buffer buffer)) | 1218 (if buffer (kill-buffer buffer)) |
| 1219 options)) | 1219 options)) |
| 1220 | 1220 |
| 1221 (provide 'url-http) | 1221 (provide 'url-http) |
| 1222 | 1222 |
| 1223 ;;; arch-tag: ba7c59ae-c0f4-4a31-9617-d85f221732ee | |
| 1223 ;;; url-http.el ends here | 1224 ;;; url-http.el ends here |