X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-globals.el;h=c49590da9adeeb9c371c28ac244c3a308be4a7a4;hp=a1410a5b63c755bddb825490f5a7ede58a1eca8e;hb=ce6d7f3e5ad810b0f72c81b8e2a4c3d7ce078a7a;hpb=be2acc33c38d2001a6e0342de584dfb361bb4f65

diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index a1410a5..c49590d 100644
--- 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.")