Mercurial > emacs
comparison lisp/url/url.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.el --- Uniform Resource Locator retrieval tool | 1 ;;; url.el --- Uniform Resource Locator retrieval tool |
2 ;; Author: Bill Perry <wmperry@gnu.org> | 2 ;; Author: Bill Perry <wmperry@gnu.org> |
3 ;; Version: $Revision: 1.15 $ | 3 ;; Version: $Revision: 1.1.1.1 $ |
4 ;; Keywords: comm, data, processes, hypermedia | 4 ;; Keywords: comm, data, processes, hypermedia |
5 | 5 |
6 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 6 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
7 ;;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu> | 7 ;;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu> |
8 ;;; Copyright (c) 1996, 97, 98, 99, 2001 Free Software Foundation, Inc. | 8 ;;; Copyright (c) 1996, 97, 98, 99, 2001 Free Software Foundation, Inc. |
264 (insert (format "(%s/%s) %s\n" class (or level 'warning) message))) | 264 (insert (format "(%s/%s) %s\n" class (or level 'warning) message))) |
265 (display-buffer (current-buffer)))))) | 265 (display-buffer (current-buffer)))))) |
266 | 266 |
267 (provide 'url) | 267 (provide 'url) |
268 | 268 |
269 ;;; arch-tag: bc182f1f-d187-4f10-b961-47af2066579a | |
269 ;;; url.el ends here | 270 ;;; url.el ends here |