Mercurial > emacs
comparison lisp/erc/erc.el @ 74484:e9bc018298b2
Update from erc--emacs--22
Highlights:
- Remove contributions from someone who has not assigned changes yet.
- Merge in a couple of bug-fixes from the main branch.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-546
Creator: Michael Olson <mwolson@gnu.org>
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 08 Dec 2006 07:13:33 +0000 |
parents | f4da74a146c7 |
children | e6b28ccae7d8 |
comparison
equal
deleted
inserted
replaced
74483:00d6850d1b3e | 74484:e9bc018298b2 |
---|---|
1 ;; erc.el --- An Emacs Internet Relay Chat client | 1 ;; erc.el --- An Emacs Internet Relay Chat client |
2 | 2 |
3 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, | 3 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, |
4 ;; 2006 Free Software Foundation, Inc. | 4 ;; 2006 Free Software Foundation, Inc. |
5 ;; Copyright (C) 2004 Brian Palmer | |
6 | 5 |
7 ;; Author: Alexander L. Belikoff (alexander@belikoff.net) | 6 ;; Author: Alexander L. Belikoff (alexander@belikoff.net) |
8 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu), | 7 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu), |
9 ;; Mario Lang (mlang@delysid.org), | 8 ;; Mario Lang (mlang@delysid.org), |
10 ;; Alex Schroeder (alex@gnu.org) | 9 ;; Alex Schroeder (alex@gnu.org) |
1759 (mapcar (lambda (m) (or (cdr (assoc m transforms)) m)) | 1758 (mapcar (lambda (m) (or (cdr (assoc m transforms)) m)) |
1760 mods)))) | 1759 mods)))) |
1761 | 1760 |
1762 (defcustom erc-modules '(netsplit fill button match track completion readonly | 1761 (defcustom erc-modules '(netsplit fill button match track completion readonly |
1763 ring autojoin noncommands irccontrols | 1762 ring autojoin noncommands irccontrols |
1764 stamp list) | 1763 stamp) |
1765 "A list of modules which ERC should enable. | 1764 "A list of modules which ERC should enable. |
1766 If you set the value of this without using `customize' remember to call | 1765 If you set the value of this without using `customize' remember to call |
1767 \(erc-update-modules) after you change it. When using `customize', modules | 1766 \(erc-update-modules) after you change it. When using `customize', modules |
1768 removed from the list will be disabled." | 1767 removed from the list will be disabled." |
1769 :get (lambda (sym) | 1768 :get (lambda (sym) |
1790 (const :tag "Buttonize URLs, nicknames, and other text" button) | 1789 (const :tag "Buttonize URLs, nicknames, and other text" button) |
1791 (const :tag "Wrap long lines" fill) | 1790 (const :tag "Wrap long lines" fill) |
1792 (const :tag "Launch an identd server on port 8113" identd) | 1791 (const :tag "Launch an identd server on port 8113" identd) |
1793 (const :tag "Highlight or remove IRC control characters" | 1792 (const :tag "Highlight or remove IRC control characters" |
1794 irccontrols) | 1793 irccontrols) |
1795 (const :tag "List channels in a separate buffer" list) | |
1796 (const :tag "Save buffers in logs" log) | 1794 (const :tag "Save buffers in logs" log) |
1797 (const :tag "Highlight pals, fools, and other keywords" match) | 1795 (const :tag "Highlight pals, fools, and other keywords" match) |
1798 (const :tag "Detect netsplits" netsplit) | 1796 (const :tag "Detect netsplits" netsplit) |
1799 (const :tag "Don't display non-IRC commands after evaluation" | 1797 (const :tag "Don't display non-IRC commands after evaluation" |
1800 noncommands) | 1798 noncommands) |