X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emu.el;h=fce2080a5fbef5c511322db1be2e31a88f324a9d;hb=4f879b7214b1c7288f42db98d9fb8ff8b33b4600;hp=9d26d339a3773648b6e8405ae709d76a4fbdf795;hpb=5760307aa255d1dc28a7e5861c63efb020dadb25;p=elisp%2Fapel.git

diff --git a/emu.el b/emu.el
index 9d26d33..fce2080 100644
--- a/emu.el
+++ b/emu.el
@@ -131,7 +131,7 @@ TABLE defaults to the current buffer's category table."
        (defun code-convert-string (str ic oc)
 	 "Convert code in STRING from SOURCE code to TARGET code,
 On successful converion, returns the result string,
-else returns nil. [emu-nemacs.el; Mule emulating function]"
+else returns nil."
 	 (if (not (eq ic oc))
 	     (convert-string-kanji-code str ic oc)
 	   str))
@@ -139,7 +139,7 @@ else returns nil. [emu-nemacs.el; Mule emulating function]"
        (defun code-convert-region (beg end ic oc)
 	 "Convert code of the text between BEGIN and END from SOURCE
 to TARGET. On successful conversion returns t,
-else returns nil. [emu-nemacs.el; Mule emulating function]"
+else returns nil."
 	 (if (/= ic oc)
 	     (save-excursion
 	       (save-restriction
@@ -193,8 +193,7 @@ It is obsolete, so don't use it."))
 A buffer may be modified in several ways after reading into the buffer due
 to advanced Emacs features, such as file-name-handlers, format decoding,
 find-file-hooks, etc.
-  This function ensures that none of these modifications will take place.
-\[emu-nemacs.el]"
+  This function ensures that none of these modifications will take place."
   (as-binary-input-file
    ;; Returns list absolute file name and length of data inserted.
    (insert-file-contents-literally filename visit beg end replace)))
@@ -224,10 +223,35 @@ find-file-hooks, etc.
        (autoload 'enriched-decode "tinyrich")
        ))
 
+(if (or (and (eq emacs-major-version 19)
+	     (>= emacs-minor-version (if (featurep 'xemacs) 14 29)))
+	(and (eq emacs-major-version 20)
+	     (< emacs-minor-version (if (featurep 'xemacs) 3 1))))
+    (eval-after-load "enriched"
+      '(if (fboundp 'si:enriched-encode)
+	   nil
+	 (fset 'si:enriched-encode (symbol-function 'enriched-encode))
+	 (defun enriched-encode (from to &optional orig-buf)
+	   (let* ((si:enriched-initial-annotation enriched-initial-annotation)
+		  (enriched-initial-annotation
+		   (if (stringp si:enriched-initial-annotation)
+		       si:enriched-initial-annotation
+		     (function
+		      (lambda ()
+			(save-excursion
+			  ;; Eval this in the buffer we are annotating.  This
+			  ;; fixes a bug which was saving incorrect File-Width
+			  ;; information, since we were looking at local
+			  ;; variables in the wrong buffer.
+			  (if orig-buf (set-buffer orig-buf))
+			  (funcall si:enriched-initial-annotation)))))))
+	     (si::enriched-encode from to))))))
+
 
 ;;; @ end
 ;;;
 
-(provide 'emu)
+(require 'product)
+(product-provide (provide 'emu) (require 'apel-ver))
 
 ;;; emu.el ends here