X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-globals.el;h=852426a4f0e7dbd7d25717016281d01281b452c4;hp=73d60c0ad3ebea182af28b3117eae21e87fa4e6c;hb=2dfe0101ccd973cb006b0038e5225ef6bf201943;hpb=39c4f84168d76428e2b30cd2aba03692f9c3269d

diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index 73d60c0..852426a 100644
--- a/lisp/riece-globals.el
+++ b/lisp/riece-globals.el
@@ -24,11 +24,17 @@
 
 ;;; Code:
 
+(require 'riece-compat)			;riece-make-interval-regexp
+
 ;;; Constants:
 (defconst riece-channel-regexp
-  "\\([+&#]\\|![A-Z0-9]\\{5\\}\\|!!\\)[^\0\7\r\n ,:]*\\(:[^\0\7\r\n ,:]*\\)?")
+  (concat "\\([+&#]\\|!"
+	  (riece-make-interval-regexp "[A-Z0-9]" 5)
+	  "\\|!!\\)[^\0\7\r\n ,:]*\\(:[^\0\7\r\n ,:]*\\)?"))
+
 (defconst riece-user-regexp
-  "[][\\\\`_^{|}A-Za-z][][\\\\`_^{|}A-Za-z0-9-]\\{0,8\\}")
+  (concat "[][\\\\`_^{|}A-Za-z]"
+	  (riece-make-interval-regexp "[][\\\\`_^{|}A-Za-z0-9-]" 0 8)))
 
 ;;; Global variables:
 (defvar riece-server-process-alist nil