Mercurial > emacs
comparison lisp/url/url-vars.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-vars.el --- Variables for Uniform Resource Locator tool | 1 ;;; url-vars.el --- Variables for Uniform Resource Locator tool |
| 2 ;; Author: $Author: fx $ | 2 ;; Author: $Author: monnier $ |
| 3 ;; Created: $Date: 2002/04/22 09:25:02 $ | 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, hypermedia | 5 ;; Keywords: comm, data, processes, hypermedia |
| 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. |
| 430 (defun url-vars-unload-hook () | 430 (defun url-vars-unload-hook () |
| 431 (remove-hook 'set-language-environment-hook 'url-set-mime-charset-string)) | 431 (remove-hook 'set-language-environment-hook 'url-set-mime-charset-string)) |
| 432 | 432 |
| 433 (provide 'url-vars) | 433 (provide 'url-vars) |
| 434 | 434 |
| 435 ;;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49 | |
| 435 ;;; url-vars.el ends here | 436 ;;; url-vars.el ends here |