* pldap.el (ldap/ldif-safe-string-p): macro to function.

* elmo-imap4.el (elmo-imap4-detect-search-charset): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 41d3773..6efc9eb 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+       * pldap.el (ldap/ldif-safe-string-p): macro to function.
+       * elmo-imap4.el (elmo-imap4-detect-search-charset): Ditto.
+
        * elmo.el (elmo-folder-info-make-hashtb): Use `mapc' instead of
        `mapcar'; Suppress compile warning.
        * elmo-imap4.el (elmo-network-initialize-session-buffer)

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 8a79d8b..0eb9b56 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -2201,10 +2201,10 @@ If optional argument REMOVE is non-nil, remove FLAG."
       (elmo-imap4-send-command session "expunge"))
     t))
 
-(defmacro elmo-imap4-detect-search-charset (string)
-  `(with-temp-buffer
-     (insert ,string)
-     (detect-mime-charset-region (point-min) (point-max))))
+(defun elmo-imap4-detect-search-charset (string)
+  (with-temp-buffer
+    (insert string)
+    (detect-mime-charset-region (point-min) (point-max))))
 
 (defun elmo-imap4-search-internal-primitive (folder session filter from-msgs)
   (let ((search-key (elmo-filter-key filter))

diff --git a/elmo/pldap.el b/elmo/pldap.el
index 540a2e3..bc8fc2e 100644 (file)
--- a/elmo/pldap.el
+++ b/elmo/pldap.el
@@ -78,10 +78,10 @@
   (concat "\n" ldap-ldif-field-name-regexp ":")
   "A Regexp for next field head.")
 
-(defmacro ldap/ldif-safe-string-p (string)
+(defun 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"