From 2ca2136c27a89d62c90dc182b3b7d706b3fa61f0 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 28 Apr 2000 04:56:21 +0000 Subject: [PATCH] Sync. --- lisp/ChangeLog | 5 +++++ lisp/lpath.el | 1 + lisp/mm-view.el | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b09024e..3aa24f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2000-04-28 00:31:53 Shenghuo ZHU + + * lpath.el: Fbind put-image for XEmacs. + * mm-view.el (mm-inline-image): Fset it. + 2000-04-27 23:23:37 Shenghuo ZHU * nndoc.el (nndoc-type-alist): Change forward regexp. diff --git a/lisp/lpath.el b/lisp/lpath.el index cf6c777..f6ee51d 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -48,6 +48,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 make-symbolic-link)) (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 --- 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 () -- 1.7.10.4