Fixed error location.

[riece] / lisp / riece-globals.el

diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index a1410a5..814d41f 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.")
@@ -56,8 +65,11 @@
 (defvar riece-reconnect-with-password nil
   "If non-nil, attempt to reconnect with password.")
 
-(defvar riece-obarray-size 1327
-  "The size of obarray used by riece on channelname and username space.")
+(defvar riece-user-obarray-size 1327
+  "The size of obarray used by riece on username space.")
+
+(defvar riece-channel-obarray-size 103
+  "The size of obarray used by riece on channelname space.")
 
 ;;; Variables local to the server buffers:
 (defvar riece-server-name nil
@@ -99,8 +111,20 @@ Local to the server buffers.")
 (defvar riece-read-point nil
   "Point at the last input was seen.
 Local to the server buffers.")
-(defvar riece-obarray nil
-  "Namespace of the IRC world.
+(defvar riece-send-queue nil
+  "Send queue for avoiding client flood.
+Local to the server buffers.")
+(defvar riece-send-size nil
+  "Size of the last send.
+Local to the server buffers.")
+(defvar riece-last-send-time nil
+  "Timestamp of the last send.
+Local to the server buffers.")
+(defvar riece-user-obarray nil
+  "USER namespace of the IRC world.
+Local to the server buffers.")
+(defvar riece-channel-obarray nil
+  "Channel namespace of the IRC world.
 Local to the server buffers.")
 (defvar riece-coding-system nil
   "Coding system for process I/O.
@@ -117,6 +141,10 @@ Local to the channel buffers.")
 channel buffer is locked.
 Local to the channel buffers.")
 
+(defvar riece-channel-buffer-window-point nil
+  "Last value of point in window which displayed the channel buffer.
+Local to the channel buffers.")
+
 ;;; Modeline indicators:
 (defvar riece-channel-indicator "None"
   "String displayed on the modeline to indicate the current channel.")
@@ -134,7 +162,10 @@ riece-channel-indicator.")
 user is away.")
 (defvar riece-operator-indicator "-"
   "String displayed on the modeline to allow the user to tell if the
-user is a operator.")
+user is an operator.")
+(defvar riece-channel-status-indicator "-"
+  "String displayed on the modeline to allow the user to tell if the
+user's status on the current channel.")
 
 ;;; Buffers:
 (defvar riece-command-buffer nil
@@ -147,9 +178,12 @@ user is a operator.")
   "Buffer for channel list.")
 (defvar riece-user-list-buffer nil
   "Buffer for user list.")
-
 (defvar riece-channel-buffer nil
   "Buffer for messages arrived in the current channel.")
+(defvar riece-temp-buffer nil
+  "Buffer for temporally use.")
+(defvar riece-debug-buffer nil
+  "Buffer for debug output.")
 
 (defvar riece-buffer-list nil)
 (defvar riece-overriding-server-name nil)