* riece-alias.el (riece-alias-alternate-separator): Changed from

[elisp/riece.git] / lisp / riece-alias.el

diff --git a/lisp/riece-alias.el b/lisp/riece-alias.el
index 0e63e58..e6c8bb4 100644 (file)
--- a/lisp/riece-alias.el
+++ b/lisp/riece-alias.el
@@ -1,4 +1,4 @@
-;;; riece-alias.el --- define aliases of names
+;;; riece-alias.el --- define aliases for IRC names

 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>

@@ -21,14 +21,15 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 

-;; This add-on allows you to define aliases for IRC names.
+;;; Commentary:
+
+;; NOTE: This is an add-on module for Riece.

 
 

-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-alias)
+;; This add-on allows you to define aliases for IRC names.

 
 

-;; For example, if you want to define an alias `#l' for `#Liece', you
+;; For example, if you want to define an alias `#r' for `#riece', you

 ;; can customize riece-alias-alist as follows:
 ;; can customize riece-alias-alist as follows:

-;; (setq riece-alias-alist '(("#Liece" . "#l")))
+;; (setq riece-alias-alist '(("#riece" . "#r")))

 
 ;;; Code:
 
 
 ;;; Code:
 

@@ -50,7 +51,7 @@
   :type 'boolean
   :group 'riece-alias)
 
   :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)
   "A string to separate prefix and server."
   :type '(choice (const nil) string)
   :group 'riece-alias)

@@ -60,10 +61,8 @@
   :type 'list
   :group 'riece-alias)
 
   :type 'list
   :group 'riece-alias)
 

-(defvar riece-alias-enabled nil)
-

 (defconst riece-alias-description
 (defconst riece-alias-description

-  "Define aliases of channel/user names")
+  "Define aliases for IRC names.")

 
 (defun riece-alias-abbrev-percent-hack (string)
   (if (string-match (concat "^#\\([^ ]+\\):"
 
 (defun riece-alias-abbrev-percent-hack (string)
   (if (string-match (concat "^#\\([^ ]+\\):"

@@ -139,7 +138,7 @@
       (setq string (riece-alias-abbrev-alternate-separator string)))
   (let ((alist riece-alias-alist))
     (while alist
       (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)))))
          (setq string (cdr (car alist))
                alist nil)
        (setq alist (cdr alist)))))

@@ -148,7 +147,7 @@
 (defun riece-alias-expand-identity-string (string)
   (let ((alist riece-alias-alist))
     (while alist
 (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)))))
          (setq string (car (car alist))
                alist nil)
        (setq alist (cdr alist)))))

@@ -166,14 +165,12 @@
        #'riece-alias-abbrev-identity-string
        riece-expand-identity-string-function
        #'riece-alias-expand-identity-string)
        #'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)
 
 (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)
 
 
 (provide 'riece-alias)