* pldap.el (ldap-static-if): New backquote style.

(ldap/ldif-safe-string-p): Ditto.
(ldap/ldif-insert-field): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index c315796..a125bdf 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+       * pldap.el (ldap-static-if): New backquote style.
+       (ldap/ldif-safe-string-p): Ditto.
+       (ldap/ldif-insert-field): Ditto.
+
        * elmo-version.el (elmo-version): Up to 2.15.6.
 
 2008-01-31  Yoichi NAKAYAMA  <yoichi@geiin.org>

diff --git a/elmo/pldap.el b/elmo/pldap.el
index 1d6d65f..b6ae29a 100644 (file)
--- a/elmo/pldap.el
+++ b/elmo/pldap.el
@@ -42,7 +42,7 @@
   "`if' expression but COND is evaluated at compile-time."
   (if (eval cond)
       then
-    (` (progn  (,@ else)))))
+    `(progn ,@else)))
 
 (ldap-static-if (and (not (featurep 'pldap))
                     (fboundp 'ldap-open))
@@ -81,7 +81,7 @@
 (defmacro ldap/ldif-safe-string-p (string)
   "Return t if STRING is a safe-string for LDIF."
   ;; Need better implentation.
-  (` (string-match ldap-ldif-safe-string-regexp (, string))))
+  `(string-match ldap-ldif-safe-string-regexp ,string))
 
 (defgroup ldap nil
   "Lightweight Directory Access Protocol"
@@ -517,9 +517,9 @@ DN is the distinguished name of the entry to delete."
             (error "%s" (car (split-string ret "\n"))))))))
 
 (defmacro ldap/ldif-insert-field (attr value)
-  (` (if (not (ldap/ldif-safe-string-p (, value)))
-        (insert (, attr) ":: " (base64-encode-string (, value)) "\n")
-       (insert (, attr) ": " (, value) "\n"))))
+  `(if (not (ldap/ldif-safe-string-p ,value))
+       (insert ,attr ":: " (base64-encode-string ,value) "\n")
+     (insert ,attr ": " ,value "\n")))
 
 (defun ldap-modify (ldap dn mods)
   "Add an entry to an LDAP directory.