From 8dc6ce814700c41586b8606afbacf6e69ae67070 Mon Sep 17 00:00:00 2001 From: kaoru Date: Mon, 11 Feb 2008 07:41:59 +0000 Subject: [PATCH] * pldap.el (ldap-static-if): New backquote style. (ldap/ldif-safe-string-p): Ditto. (ldap/ldif-insert-field): Ditto. --- elmo/ChangeLog | 4 ++++ elmo/pldap.el | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index c315796..a125bdf 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,9 @@ 2008-02-11 TAKAHASHI Kaoru + * 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 diff --git a/elmo/pldap.el b/elmo/pldap.el index 1d6d65f..b6ae29a 100644 --- 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. -- 1.7.10.4