diff options
| author | Miles Bader <miles@gnu.org> | 2008-02-24 10:09:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-02-24 10:09:07 +0000 |
| commit | b03f96dc5a6651d1dc84b81b2a15cad6908b9809 (patch) | |
| tree | 699d727fdfb007a12a07d1e1f2e172617cc159ef /lisp/erc | |
| parent | 52bec650ae314402c242ce700bb09be42ef8ae55 (diff) | |
| parent | 20ca5ee4f7d897d79416a6fdd084db1eabb392b0 (diff) | |
| download | emacs-b03f96dc5a6651d1dc84b81b2a15cad6908b9809.tar.gz emacs-b03f96dc5a6651d1dc84b81b2a15cad6908b9809.tar.bz2 emacs-b03f96dc5a6651d1dc84b81b2a15cad6908b9809.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/erc/erc-button.el | 2 | ||||
| -rw-r--r-- | lisp/erc/erc-match.el | 2 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 1a0b49676ae..fc230ddbe0e 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -2,6 +2,12 @@ * erc.el (erc-notice-face): Fix this face for Emacs 21 users. +2008-02-05 Juanma Barranquero <lekktu@gmail.com> + + * erc.el (erc-valid-nick-regexp): + * erc-button.el (erc-button-syntax-table): + * erc-match.el (erc-match-syntax-table): Replace `legal' with `valid'. + 2008-02-04 Jeremy Maitin-Shepard <jbms@cmu.edu> * erc.el (erc-cmd-QUERY): Bind the value of `erc-auto-query' to diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 7e45c6cd4ea..a1e072ca191 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -239,7 +239,7 @@ PAR is a number of a regexp grouping whose text will be passed to (modify-syntax-entry ?\\ "w" table) table) "Syntax table used when buttonizing messages. -This syntax table should make all the legal nick characters word +This syntax table should make all the valid nick characters word constituents.") (defvar erc-button-keys-added nil diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index a98b1d92f4a..3e525588e66 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -256,7 +256,7 @@ current-nick, keyword, pal, dangerous-host, fool" (modify-syntax-entry ?\\ "w" table) table) "Syntax table used when highlighting messages. -This syntax table should make all the legal nick characters word +This syntax table should make all the valid nick characters word constituents.") ;; Faces: diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 6cbf5f0b7a0..a085336f9a1 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2428,7 +2428,7 @@ If STRING is nil, the function does nothing." (setq list (cdr list)))))) (defvar erc-valid-nick-regexp "[]a-zA-Z^[;\\`_{}|][]^[;\\`_{}|a-zA-Z0-9-]*" - "Regexp which matches all legal characters in a IRC nickname.") + "Regexp which matches all valid characters in a IRC nickname.") (defun erc-is-valid-nick-p (nick) "Check if NICK is a valid IRC nickname." |