* riece.el (riece): Connect to servers in riece-startup-server-list.

[riece] / lisp / riece-globals.el

diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index ef5f3bc..852426a 100644 (file)
--- 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