Fixed.

[riece] / lisp / riece-alias.el

diff --git a/lisp/riece-alias.el b/lisp/riece-alias.el
index a617687..c55d045 100644 (file)
--- a/lisp/riece-alias.el
+++ b/lisp/riece-alias.el
@@ -50,9 +50,9 @@
   :type 'boolean
   :group 'riece-alias)
 
-(defcustom riece-alias-use-atmark nil
-  "If non-nil, use atmark to separate prefix and server."
-  :type 'boolean
+(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
@@ -79,48 +79,69 @@
                     nil nil string)
     string))
 
-(defun riece-alias-escape-atmark (string)
+(defun riece-alias-escape-alternate-separator (string)
   (let ((index 0))
-    (while (string-match "@" string index)
+    (while (string-match (regexp-quote riece-alias-alternate-separator)
+                        string index)
       (setq index (1+ (match-end 0))
-           string (replace-match "@@" nil nil string)))
+           string (replace-match (concat riece-alias-alternate-separator
+                                         riece-alias-alternate-separator)
+                                 nil t string)))
     string))
 
-(defun riece-alias-abbrev-atmark (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-atmark prefix) "@"
-               (riece-alias-escape-atmark server)))
-    (concat (riece-alias-escape-atmark string) "@")))
+       (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-atmark (string)
+(defun riece-alias-expand-alternate-separator (string)
   (let ((index 0)
        prefix
        server
        length)
     (while (and (null prefix)
-               (string-match "@+" string index))
-      (setq length (- (match-end 0) (match-beginning 0))
-           string (replace-match (make-string (/ length 2) ?@)
-                                 nil nil string)
-           index (+ (match-beginning 0) (/ length 2)))
+               (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))))
-    (setq server (substring string index)
-         index 0)
-    (if (equal server "")
-       prefix
-      (while (string-match "@@" server index)
-       (setq server (replace-match "@" nil nil server)
-             index (1- (match-end 0))))
-      (concat prefix " " server))))
+    (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-use-atmark
-      (setq string (riece-alias-abbrev-atmark string)))
+  (if riece-alias-alternate-separator
+      (setq string (riece-alias-abbrev-alternate-separator string)))
   (let ((alist riece-alias-alist))
     (catch 'done
       (while alist
@@ -132,8 +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-use-atmark
-      (setq string (riece-alias-expand-atmark string)))
+  (if riece-alias-alternate-separator
+      (setq string (riece-alias-expand-alternate-separator string)))
   (let ((alist riece-alias-alist))
     (catch 'done
       (while alist