Synch with `flim-1_14'.

diff --git a/ChangeLog b/ChangeLog
index bdac0c0..c24dfd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-21  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mailcap.el: Require `poe' for `define-obsolete-function-alias'.
+
 2000-12-21   Daiki Ueno  <ueno@unixuser.org>
 
        * smtp.el (smtp-send-buffer): Add DOC.
@@ -7,6 +11,7 @@
        (smtp-send-buffer): Add description.
        (smtp-via-smtp): Likewise.
 
+\f
 2000-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * mime.el (mime-entity-media-type): Add DOC.

diff --git a/mailcap.el b/mailcap.el
index b31dd21..9bee280 100644 (file)
--- a/mailcap.el
+++ b/mailcap.el
@@ -28,6 +28,7 @@
 ;;; Code:
 
 (require 'mime-conf)
+(require 'poe) ; define-obsolete-function-alias
 
 (define-obsolete-function-alias
   'mailcap-parse-buffer 'mime-parse-mailcap-buffer)