Mercurial > emacs
comparison lisp/url/url-util.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-util.el --- Miscellaneous helper routines for URL library | 1 ;;; url-util.el --- Miscellaneous helper routines for URL library |
2 ;; Author: Bill Perry <wmperry@gnu.org> | 2 ;; Author: Bill Perry <wmperry@gnu.org> |
3 ;; Created: $Date: 2002/04/22 09:16:11 $ | 3 ;; Created: $Date: 2004/04/04 01:21:46 $ |
4 ;; Version: $Revision: 1.14 $ | 4 ;; Version: $Revision: 1.1.1.1 $ |
5 ;; Keywords: comm, data, processes | 5 ;; Keywords: comm, data, processes |
6 | 6 |
7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
8 ;;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu> | 8 ;;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu> |
9 ;;; Copyright (c) 1996, 97, 98, 99, 2001 Free Software Foundation, Inc. | 9 ;;; Copyright (c) 1996, 97, 98, 99, 2001 Free Software Foundation, Inc. |
483 (unless url-current-mime-headers | 483 (unless url-current-mime-headers |
484 (set (make-local-variable 'url-current-mime-headers) | 484 (set (make-local-variable 'url-current-mime-headers) |
485 (mail-header-extract))))) | 485 (mail-header-extract))))) |
486 | 486 |
487 (provide 'url-util) | 487 (provide 'url-util) |
488 | |
489 ;;; arch-tag: 24352abc-5a5a-412e-90cd-313b26bed5c9 |