*base64.el: Unbound base64-*-string and base64-*-region

when defined by autoload.

diff --git a/lisp/base64.el b/lisp/base64.el
index ff4146c..4c0e87b 100644 (file)
--- a/lisp/base64.el
+++ b/lisp/base64.el
@@ -30,6 +30,20 @@
 (require 'mel)
 
 (eval-and-compile
+  (defun autoload-functionp (object)
+    (if (functionp object)
+       (let ((def object))
+         (while (and (symbolp def) (fboundp def))
+           (setq def (symbol-function def)))
+         (eq (car-safe def) 'autoload))))
+  (if (autoload-functionp 'base64-decode-string)
+      (fmakunbound 'base64-decode-string))
+  (if (autoload-functionp 'base64-decode-region)
+      (fmakunbound 'base64-decode-region))
+  (if (autoload-functionp 'base64-encode-string)
+      (fmakunbound 'base64-encode-string))
+  (if (autoload-functionp 'base64-encode-region)
+      (fmakunbound 'base64-encode-region))
   (mel-find-function 'mime-decode-string "base64")
   (mel-find-function 'mime-decode-region "base64")
   (mel-find-function 'mime-encode-string "base64")