* riece-alias.el (riece-alias-alternate-separator): Set to "@".

[riece] / lisp / riece-alias.el

diff --git a/lisp/riece-alias.el b/lisp/riece-alias.el
index 0575db8..f935d11 100644 (file)
--- a/lisp/riece-alias.el
+++ b/lisp/riece-alias.el
@@ -50,7 +50,7 @@
   :type 'boolean
   :group 'riece-alias)
 
   :type 'boolean
   :group 'riece-alias)
 

-(defcustom riece-alias-alternate-separator nil
+(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)


@@ -101,22 +101,22 @@
 (defun riece-alias-expand-alternate-separator (string)
   (let ((index 0)
        prefix
 (defun riece-alias-expand-alternate-separator (string)
   (let ((index 0)
        prefix

-       server
-       length)
+       server)

     (while (and (null prefix)
                (string-match
     (while (and (null prefix)
                (string-match

-                (concat (regexp-quote riece-alias-alternate-separator) "+")
+                (concat (regexp-quote riece-alias-alternate-separator)
+                        (regexp-quote riece-alias-alternate-separator)
+                        "\\|\\("
+                        (regexp-quote riece-alias-alternate-separator)
+                        "\\)")

                 string index))
                 string index))

-      (setq length (- (match-end 0) (match-beginning 0))
-           string (replace-match
-                   (mapconcat #'identity
-                              (make-list (/ length 2)
-                                         riece-alias-alternate-separator)
-                              "")
-                   nil t string)
-           index (+ (match-beginning 0) (/ length 2)))
-      (unless (zerop (% length 2))
-       (setq prefix (substring string 0 index))))
+      (if (match-beginning 1)          ;found a separator
+         (setq prefix (substring string 0 (match-beginning 1))
+               index (match-end 1))
+       (setq string (replace-match riece-alias-alternate-separator
+                                   nil t string)
+             index (- (match-end 0)
+                      (length riece-alias-alternate-separator)))))

     (if (null prefix)
        string
       (setq server (substring string index)
     (if (null prefix)
        string
       (setq server (substring string index)


@@ -126,10 +126,10 @@
                                (concat riece-alias-alternate-separator
                                        riece-alias-alternate-separator))
                               server index)
                                (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))))
+           (setq server (replace-match riece-alias-alternate-separator
+                                       nil t server)
+                 index (- (match-end 0)
+                          (length riece-alias-alternate-separator))))

        (concat prefix " " server)))))
 
 (defun riece-alias-abbrev-identity-string (string)
        (concat prefix " " server)))))
 
 (defun riece-alias-abbrev-identity-string (string)


@@ -138,25 +138,25 @@
   (if riece-alias-alternate-separator
       (setq string (riece-alias-abbrev-alternate-separator string)))
   (let ((alist riece-alias-alist))
   (if riece-alias-alternate-separator
       (setq string (riece-alias-abbrev-alternate-separator string)))
   (let ((alist riece-alias-alist))

-    (catch 'done
-      (while alist
-       (if (equal (car (car alist)) string)
-           (throw 'done (cdr (car alist))))
-       (setq alist (cdr alist)))
-      string)))
+    (while alist
+      (if (equal (car (car alist)) string)
+         (setq string (cdr (car alist))
+               alist nil)
+       (setq alist (cdr alist)))))
+  (copy-sequence string))

 
 (defun riece-alias-expand-identity-string (string)
 
 (defun riece-alias-expand-identity-string (string)

-  (if riece-alias-enable-percent-hack
-      (setq string (riece-alias-expand-percent-hack string)))
+  (let ((alist riece-alias-alist))
+    (while alist
+      (if (equal (cdr (car alist)) string)
+         (setq string (car (car alist))
+               alist nil)
+       (setq alist (cdr alist)))))

   (if riece-alias-alternate-separator
       (setq string (riece-alias-expand-alternate-separator string)))
   (if riece-alias-alternate-separator
       (setq string (riece-alias-expand-alternate-separator string)))

-  (let ((alist riece-alias-alist))
-    (catch 'done
-      (while alist
-       (if (equal (cdr (car alist)) string)
-           (throw 'done (car (car alist))))
-       (setq alist (cdr alist)))
-      string)))
+  (if riece-alias-enable-percent-hack
+      (setq string (riece-alias-expand-percent-hack string)))
+  (copy-sequence string))

 
 (defun riece-alias-insinuate ()
   )
 
 (defun riece-alias-insinuate ()
   )