* riece-globals.el (riece-strict-channel-regexp): Renamed from

riece-channel-regexp.
(riece-strict-user-regexp): Renamed from riece-user-regexp.
(riece-laxed-channel-regexp): New constant.
(riece-laxed-user-regexp): New constant.
(riece-channel-regexp): Define as variable (its default value is
set to riece-laxed-channel-regexp).
(riece-user-regexp): Define as variable (its default value is set
to riece-laxed-user-regexp).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b9b03b..e7b0cb0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2004-05-12  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-globals.el (riece-strict-channel-regexp): Renamed from
+       riece-channel-regexp.
+       (riece-strict-user-regexp): Renamed from riece-user-regexp.
+       (riece-laxed-channel-regexp): New constant.
+       (riece-laxed-user-regexp): New constant.
+       (riece-channel-regexp): Define as variable (its default value is
+       set to riece-laxed-channel-regexp).
+       (riece-user-regexp): Define as variable (its default value is set
+       to riece-laxed-user-regexp).
+
 2004-05-10  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-ctlseq.el (riece-ctlseq-scan-region): Abolish.

diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index a1410a5..c49590d 100644 (file)
--- a/lisp/riece-globals.el
+++ b/lisp/riece-globals.el
@@ -27,15 +27,24 @@
 (require 'riece-compat)                        ;riece-make-interval-regexp
 
 ;;; Constants:
-(defconst riece-channel-regexp
+(defconst riece-strict-channel-regexp
   (concat "\\([+&#]\\|!"
          (riece-make-interval-regexp "[A-Z0-9]" 5)
          "\\|!!\\)[^\0\7\r\n ,:]*\\(:[^\0\7\r\n ,:]*\\)?"))
 
-(defconst riece-user-regexp
+(defconst riece-strict-user-regexp
   (concat "[][\\\\`_^{|}A-Za-z]"
          (riece-make-interval-regexp "[][\\\\`_^{|}A-Za-z0-9-]" 0 8)))
 
+(defconst riece-laxed-channel-regexp
+  "[+&#!][^\0\7\r\n ,:]*\\(:[^\0\7\r\n ,:]*\\)?")
+
+(defconst riece-laxed-user-regexp
+  "[][\\\\`_^{|}A-Za-z][][\\\\`_^{|}A-Za-z0-9-]*")
+
+(defvar riece-channel-regexp riece-laxed-channel-regexp)
+(defvar riece-user-regexp riece-laxed-user-regexp)
+
 ;;; Global variables:
 (defvar riece-server-process-alist nil
   "An alist mapping server names to processes.")