X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-globals.el;h=73d60c0ad3ebea182af28b3117eae21e87fa4e6c;hb=f15cbe12cae76dde3d7abe27d183bc8de58bbbc7;hp=c3fc949c7899d10fbc828e24c096e94498a7ac17;hpb=56f55f8902c6603989cd6b03d28bc9ea72959678;p=riece

diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index c3fc949..73d60c0 100644
--- a/lisp/riece-globals.el
+++ b/lisp/riece-globals.el
@@ -26,13 +26,13 @@
 
 ;;; Constants:
 (defconst riece-channel-regexp
-  "\\([+&#]\\|![A-Z0-9]\\{5\\}\\)[^\0\7\r\n ,:]*\\(:[^\0\7\r\n ,:]*\\)?")
+  "\\([+&#]\\|![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\\}")
 
-;;; Miscellaneous global variables:
-(defvar riece-process-list nil
-  "List of processes opened in the current session.")
+;;; Global variables:
+(defvar riece-server-process-alist nil
+  "An alist mapping server names to processes.")
 
 (defvar riece-current-channel nil
   "The channel you currently have joined.")
@@ -109,10 +109,10 @@ Local to the channel buffers.")
 ;;; Modeline indicators:
 (defvar riece-channel-indicator "None"
   "A modeline indicator of the current channel.")
+(defvar riece-long-channel-indicator "None"
+  "A modeline indicator of the current channel.")
 (defvar riece-channel-list-indicator "No channel"
   "A modeline indicator of the current joined channels.")
-(defvar riece-short-channel-indicator "None"
-  "A modeline indicator of the current channel.")
 (defvar riece-user-indicator nil)
 
 (defvar riece-away-indicator "-")
@@ -120,23 +120,19 @@ Local to the channel buffers.")
 (defvar riece-freeze-indicator "-")
 
 ;;; Buffers:
-(defvar riece-command-buffer "*Commands*"
-  "Name of command input buffer.")
-(defvar riece-dialogue-buffer "*Dialogue*"
-  "Name of dialogue output buffer.")
-(defvar riece-private-buffer "*Private*"
-  "Name of private message buffer.")
-(defvar riece-others-buffer "*Others*"
-  "Name of others message buffer.")
+(defvar riece-command-buffer nil
+  "The command buffer.")
+(defvar riece-dialogue-buffer nil
+  "Buffer for whole conversation.")
+(defvar riece-others-buffer nil
+  "Buffer for other messages.")
+(defvar riece-channel-list-buffer nil
+  "Buffer for channel list.")
+(defvar riece-user-list-buffer nil
+  "Buffer for user list.")
+
 (defvar riece-channel-buffer nil
-  "Name of channel message buffer.")
-(defvar riece-channel-buffer-format "*Channel:%s*"
-  "Format of channel message buffer.")
-(defvar riece-channel-list-buffer "*Channels*"
-  "Name of channel list buffer.")
-(defvar riece-user-list-buffer " *Users*"
-  "Name of user list buffer.")
-(defvar riece-wallops-buffer " *WALLOPS*")
+  "Buffer for messages arrived in the current channel.")
 
 (defvar riece-buffer-list nil)
 (defvar riece-overriding-server-name nil)