X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-alias.el;h=e6c8bb4303f88abee3ee7655ce0e06bd7a99abfa;hb=50d8c07c17ad31feea207eb3ee384e7e6cbeb3ea;hp=aa1266dfb949a1e71e4ac687a16b93f07c2f4b01;hpb=2e8d72b091af0ce1e3673f90d8024739328a0d7c;p=elisp%2Friece.git

diff --git a/lisp/riece-alias.el b/lisp/riece-alias.el
index aa1266d..e6c8bb4 100644
--- a/lisp/riece-alias.el
+++ b/lisp/riece-alias.el
@@ -51,7 +51,7 @@
   :type 'boolean
   :group 'riece-alias)
 
-(defcustom riece-alias-alternate-separator "@"
+(defcustom riece-alias-alternate-separator "%"
   "A string to separate prefix and server."
   :type '(choice (const nil) string)
   :group 'riece-alias)
@@ -61,8 +61,6 @@
   :type 'list
   :group 'riece-alias)
 
-(defvar riece-alias-enabled nil)
-
 (defconst riece-alias-description
   "Define aliases for IRC names.")
 
@@ -140,7 +138,7 @@
       (setq string (riece-alias-abbrev-alternate-separator string)))
   (let ((alist riece-alias-alist))
     (while alist
-      (if (equal (car (car alist)) string)
+      (if (equal (downcase (car (car alist))) (downcase string))
 	  (setq string (cdr (car alist))
 		alist nil)
 	(setq alist (cdr alist)))))
@@ -149,7 +147,7 @@
 (defun riece-alias-expand-identity-string (string)
   (let ((alist riece-alias-alist))
     (while alist
-      (if (equal (cdr (car alist)) string)
+      (if (equal (downcase (cdr (car alist))) (downcase string))
 	  (setq string (car (car alist))
 		alist nil)
 	(setq alist (cdr alist)))))
@@ -167,14 +165,12 @@
 	#'riece-alias-abbrev-identity-string
 	riece-expand-identity-string-function
 	#'riece-alias-expand-identity-string)
-  (riece-emit-signal 'channel-list-changed)
-  (setq riece-alias-enabled t))
+  (riece-emit-signal 'channel-list-changed))
 
 (defun riece-alias-disable ()
   (setq riece-abbrev-identity-string-function nil
 	riece-expand-identity-string-function nil)
-  (riece-emit-signal 'channel-list-changed)
-  (setq riece-alias-enabled nil))
+  (riece-emit-signal 'channel-list-changed))
 
 (provide 'riece-alias)