This commit was generated by cvs2svn to compensate for changes in r1073,

[chise/xemacs-chise.git.1] / lisp / ldap.el

diff --git a/lisp/ldap.el b/lisp/ldap.el
index bb31a83..31c5be7 100644 (file)
--- a/lisp/ldap.el
+++ b/lisp/ldap.el
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Created: Jan 1998
-;; Version: $Revision: 1.7.2.5 $
+;; Version: $Revision: 1.7.2.3 $
 ;; Keywords: help comm
 
 ;; This file is part of XEmacs
@@ -155,9 +155,7 @@ Valid properties include:
   :type 'symbol
   :group 'ldap)
 
-(defcustom ldap-coding-system (if (featurep 'mule)
-                                 'utf-8
-                               nil)
+(defcustom ldap-coding-system nil
   "*Coding system of LDAP string values.
 LDAP v3 specifies the coding system of strings to be UTF-8.  
 Mule support is needed for this."
@@ -395,10 +393,12 @@ This table is built from RFC2252 Section 5 and RFC2256 Section 5")
       (error "Invalid country string: %s" str)))
 
 (defun ldap-decode-string (str)
-  (decode-coding-string str ldap-coding-system))
+  (if (fboundp 'decode-coding-string)
+      (decode-coding-string str ldap-coding-system)))
 
 (defun ldap-encode-string (str)
-  (encode-coding-string str ldap-coding-system))
+   (if (fboundp 'encode-coding-string)
+       (encode-coding-string str ldap-coding-system)))
 
 (defun ldap-decode-address (str)
   (mapconcat 'ldap-decode-string