Mercurial > emacs
comparison lisp/url/url-irc.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-irc.el --- IRC URL interface | 1 ;;; url-irc.el --- IRC URL interface |
| 2 ;; Author: $Author: wmperry $ | 2 ;; Author: $Author: monnier $ |
| 3 ;; Created: $Date: 1999/12/24 12:13:33 $ | 3 ;; Created: $Date: 2004/04/04 01:21:46 $ |
| 4 ;; Version: $Revision: 1.2 $ | 4 ;; Version: $Revision: 1.1.1.1 $ |
| 5 ;; Keywords: comm, data, processes | 5 ;; Keywords: comm, data, processes |
| 6 | 6 |
| 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 8 ;;; Copyright (c) 1996 by William M. Perry <wmperry@cs.indiana.edu> | 8 ;;; Copyright (c) 1996 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. |
| 74 (setq chan nil)) | 74 (setq chan nil)) |
| 75 (funcall url-irc-function host port chan user pass) | 75 (funcall url-irc-function host port chan user pass) |
| 76 nil)) | 76 nil)) |
| 77 | 77 |
| 78 (provide 'url-irc) | 78 (provide 'url-irc) |
| 79 | |
| 80 ;;; arch-tag: 2e5eecf8-9eb3-436b-9fbd-c26f2fb2bf3e |