Mercurial > emacs
comparison lisp/url/url-methods.el @ 54699:7784ae10206d
Resolve CVS conflicts
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 04 Apr 2004 04:44:10 +0000 |
parents | ee631551cb0a |
children | e8824c4f5f7e 1029206e72f2 |
comparison
equal
deleted
inserted
replaced
54698:ee631551cb0a | 54699:7784ae10206d |
---|---|
1 ;;; url-methods.el --- Load URL schemes as needed | 1 ;;; url-methods.el --- Load URL schemes as needed |
2 ;; Author: $Author: monnier $ | 2 ;; Author: $Author: monnier $ |
3 ;; Created: $Date: 2004/04/04 01:21:46 $ | 3 ;; Created: $Date: 2004/04/04 03:10:58 $ |
4 ;; Version: $Revision: 1.1.1.1 $ | 4 ;; Version: $Revision: 1.2 $ |
5 ;; Keywords: comm, data, processes, hypermedia | 5 ;; Keywords: comm, data, processes, hypermedia |
6 | 6 |
7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
8 ;;; Copyright (c) 1993 - 1996, 2004 by William M. Perry <wmperry@cs.indiana.edu> | 8 ;;; Copyright (c) 1993 - 1996, 2004 by William M. Perry <wmperry@cs.indiana.edu> |
9 ;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. | 9 ;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. |
144 (puthash scheme desc url-scheme-registry))))) | 144 (puthash scheme desc url-scheme-registry))))) |
145 (or (plist-get desc property) | 145 (or (plist-get desc property) |
146 (plist-get url-scheme-default-properties property)))) | 146 (plist-get url-scheme-default-properties property)))) |
147 | 147 |
148 (provide 'url-methods) | 148 (provide 'url-methods) |
149 | |
150 ;;; arch-tag: 336863f8-5a07-4906-9be5-b3c6bcebbe67 |