Make compatible for XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b09024e..0b95660 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-28 00:31:53  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * lpath.el: Fbind put-image for XEmacs.
+       * mm-view.el (mm-inline-image): Fset it.
+
 2000-04-27 23:23:37  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * nndoc.el (nndoc-type-alist): Change forward regexp. 
@@ -75,7 +80,7 @@
        * mm-bodies.el (mm-encode-body): Remove reference to
        mm-default-charset in comment.
 
-2000-04-24 00:56:00  Björn Torkelsson  <torkel@hpc2n.umu.se>
+2000-04-24 00:56:00  Bj\e-Aörn Torkelsson  <torkel@hpc2n.umu.se>\e$)A
 
        * rfc2047.el (rfc2047-encode-message-header): Fixing typo.
        
@@ -184,7 +189,7 @@ Mon Apr 24 21:12:06 2000  Lars Magne Ingebrigtsen  <lmi@quimbies.gnus.org>
 
        * gnus-sum.el (t): M-down and M-up.
 
-2000-04-22 20:22:03  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2000-04-22 20:22:03  Kai Gro\e-Aßjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>\e$)A
 
        * gnus-sum.el: Doc fix.
 
@@ -245,7 +250,7 @@ Mon Apr 24 21:12:06 2000  Lars Magne Ingebrigtsen  <lmi@quimbies.gnus.org>
        * gnus-msg.el (gnus-configure-posting-styles): Allow nil values to
        override. 
 
-2000-04-21 21:58:20  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2000-04-21 21:58:20  Kai Gro\e-Aßjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>\e$)A
 
        * nnmail.el (nnmail-cache-insert): Does some stuff that is
        probably good to do, or something.  I dunno.  I just write these
@@ -837,7 +842,7 @@ Wed Jan  5 17:06:41 2000  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * webmail.el (webmail-hotmail-article): Don't insert message id.
 
-1999-12-28  Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Großjohann)
+1999-12-28  Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Gro\e-Aßjohann)\e$)A
 
        * nnimap.el (nnimap-split-fancy): New variable.
        (nnimap-split-fancy): New function.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 1f89b48..266b5e0 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -43,6 +43,7 @@
                     temp-directory babel-fetch babel-wash
                     find-coding-systems-for-charsets sc-cite-regexp
                     vcard-pretty-print image-type-available-p
+                    put-image 
                     make-overlay overlay-put))
       (maybe-bind '(global-face-data
                    mark-active transient-mark-mode mouse-selection-click-count

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 9edee34..fe36cf6 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -63,10 +63,10 @@
     (set-extent-property annot 'mm t)
     (set-extent-property annot 'duplicable t)))
 
-(defun mm-inline-image (handle)
-  (if mm-xemacs-p
-      (mm-inline-image-xemacs handle)
-    (mm-inline-image-emacs handle)))
+(eval-and-compile
+  (if (string-match "XEmacs" (emacs-version))
+      (fset 'mm-inline-image 'mm-inline-image-xemacs)
+    (fset 'mm-inline-image 'mm-inline-image-emacs)))
 
 (defvar mm-w3-setup nil)
 (defun mm-setup-w3 ()