diff lisp/erc/ChangeLog @ 92148:f991f10f15ec

Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
author Miles Bader <miles@gnu.org>
date Sun, 24 Feb 2008 10:09:07 +0000
parents 84357f6e06d1 f5910be081e5
children 908993cbed5e
line wrap: on
line diff
--- a/lisp/erc/ChangeLog	Sun Feb 24 06:43:15 2008 +0000
+++ b/lisp/erc/ChangeLog	Sun Feb 24 10:09:07 2008 +0000
@@ -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