* wl-address.el (wl-ldap-alias-safe-string): Replace '@' to '/'

in email address.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 83bd518..b71045a 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-30  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-address.el (wl-ldap-alias-safe-string): Replace '@' to '/'
+       in email address.
+
 2000-10-07  Yasushi Shoji      <yashi@yashi.com>
 
        * wl-vars.el (wl-subject-prefix-regexp): New variable.

diff --git a/wl/wl-address.el b/wl/wl-address.el
index b0a27b8..178619b 100644 (file)
--- a/wl/wl-address.el
+++ b/wl/wl-address.el
@@ -130,14 +130,15 @@ Returns matched uniq string list."
 (defun wl-ldap-alias-safe-string (str)
   "Modify STR for alias.
 Replace space/tab in STR into '_' char.
-And remove domain part of mail addr."
+Replace '@' in STR into '/' char."
   (while (string-match "[^_a-zA-Z0-9+@%.!\\-/]+" str)
     (setq str (concat (substring str 0 (match-beginning 0))
                      "_"
                      (substring str (match-end 0)))))
-  (if (string-match "@[^/@]+" str)
-      (setq str (concat (substring str 0 (match-beginning 0))
-                       (substring str (match-end 0)))))
+  (if (string-match "\\(@\\)[^/@]+" str)
+      (setq str (concat (substring str 0 (match-beginning 1))
+                       "/"
+                       (substring str (match-end 1)))))
   str)
 
 (defun wl-ldap-register-dn-string (hash dn &optional str dn-list)