Fixed.

[riece] / lisp / riece-alias.el

diff --git a/lisp/riece-alias.el b/lisp/riece-alias.el
index dae97f5..c55d045 100644 (file)
--- a/lisp/riece-alias.el
+++ b/lisp/riece-alias.el
@@ -32,6 +32,9 @@
 
 ;;; Code:
 
+(require 'riece-identity)
+(require 'riece-signal)
+
 (defgroup riece-alias nil
   "Define aliases of names"
   :prefix "riece-"
@@ -47,11 +50,21 @@
   :type 'boolean
   :group 'riece-alias)
 
+(defcustom riece-alias-alternate-separator nil
+  "A string to separate prefix and server."
+  :type '(choice (const nil) string)
+  :group 'riece-alias)
+
 (defcustom riece-alias-alist nil
   "An alist mapping aliases to names."
   :type 'list
   :group 'riece-alias)
 
+(defvar riece-alias-enabled nil)
+
+(defconst riece-alias-description
+  "Define aliases of channel/user names")
+
 (defun riece-alias-abbrev-percent-hack (string)
   (if (string-match (concat "^#\\([^ ]+\\):"
                            (regexp-quote riece-alias-percent-hack-mask)
@@ -66,9 +79,69 @@
                     nil nil string)
     string))
 
+(defun riece-alias-escape-alternate-separator (string)
+  (let ((index 0))
+    (while (string-match (regexp-quote riece-alias-alternate-separator)
+                        string index)
+      (setq index (1+ (match-end 0))
+           string (replace-match (concat riece-alias-alternate-separator
+                                         riece-alias-alternate-separator)
+                                 nil t string)))
+    string))
+
+(defun riece-alias-abbrev-alternate-separator (string)
+  (if (string-match " " string)
+      (let ((prefix (substring string 0 (match-beginning 0)))
+           (server (substring string (match-end 0))))
+       (concat (riece-alias-escape-alternate-separator prefix)
+               riece-alias-alternate-separator
+               (riece-alias-escape-alternate-separator server)))
+    (riece-alias-escape-alternate-separator string)))
+
+(defun riece-alias-expand-alternate-separator (string)
+  (let ((index 0)
+       prefix
+       server
+       length)
+    (while (and (null prefix)
+               (string-match
+                (concat "\\("
+                        (regexp-quote riece-alias-alternate-separator)
+                        "\\)+")
+                string index))
+      (setq length (/ (- (match-end 0) (match-beginning 0))
+                     (length riece-alias-alternate-separator))
+           string (replace-match
+                   (mapconcat #'identity
+                              (make-list (/ length 2)
+                                         riece-alias-alternate-separator)
+                              "")
+                   nil t string)
+           index (+ (match-beginning 0)
+                    (* (/ length 2)
+                       (length riece-alias-alternate-separator))))
+      (unless (zerop (% length 2))
+       (setq prefix (substring string 0 index))))
+    (if (null prefix)
+       string
+      (setq server (substring string index)
+           index 0)
+      (if (equal server "")
+         (while (string-match (regexp-quote
+                               (concat riece-alias-alternate-separator
+                                       riece-alias-alternate-separator))
+                              server index)
+           (setq server (replace-match
+                         riece-alias-alternate-separator
+                         nil t server)
+                 index (1- (match-end 0))))
+       (concat prefix " " server)))))
+
 (defun riece-alias-abbrev-identity-string (string)
   (if riece-alias-enable-percent-hack
       (setq string (riece-alias-abbrev-percent-hack string)))
+  (if riece-alias-alternate-separator
+      (setq string (riece-alias-abbrev-alternate-separator string)))
   (let ((alist riece-alias-alist))
     (catch 'done
       (while alist
@@ -80,6 +153,8 @@
 (defun riece-alias-expand-identity-string (string)
   (if riece-alias-enable-percent-hack
       (setq string (riece-alias-expand-percent-hack string)))
+  (if riece-alias-alternate-separator
+      (setq string (riece-alias-expand-alternate-separator string)))
   (let ((alist riece-alias-alist))
     (catch 'done
       (while alist
@@ -89,10 +164,21 @@
       string)))
 
 (defun riece-alias-insinuate ()
+  )
+
+(defun riece-alias-enable ()
   (setq riece-abbrev-identity-string-function
        #'riece-alias-abbrev-identity-string
        riece-expand-identity-string-function
-       #'riece-alias-expand-identity-string))
+       #'riece-alias-expand-identity-string)
+  (riece-emit-signal 'channel-list-changed)
+  (setq riece-alias-enabled t))
+
+(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))
 
 (provide 'riece-alias)