X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emu.el;h=8b91770c72828893363681cd3805c8d975b6db0c;hb=dfd2f7162fe8801265f2a62e66567e00ea0ffe97;hp=929655d62224466385d9aee3591afa0315f0ff04;hpb=b4ec5813262975ef410d9abbc886e851c5742b3f;p=elisp%2Fapel.git

diff --git a/emu.el b/emu.el
index 929655d..8b91770 100644
--- a/emu.el
+++ b/emu.el
@@ -1,12 +1,11 @@
 ;;; emu.el --- Emulation module for each Emacs variants
 
-;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu.el,v 7.26 1996/09/05 16:31:02 morioka Exp $
-;; Keywords: emulation, compatibility, NEmacs, MULE, XEmacs
+;; Keywords: emulation, compatibility, Nemacs, MULE, Emacs/mule, XEmacs
 
-;; This file is part of tl (Tiny Library).
+;; This file is part of emu.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -19,182 +18,199 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
-(or (boundp 'emacs-major-version)
-    (defconst emacs-major-version (string-to-int emacs-version)))
-(or (boundp 'emacs-minor-version)
-    (defconst emacs-minor-version
-      (string-to-int
-       (substring
-	emacs-version
-	(string-match (format "%d\\." emacs-major-version) emacs-version)
-	))))
+(require 'poe)
 
 (defvar running-emacs-18 (<= emacs-major-version 18))
-(defvar running-xemacs (string-match "XEmacs" emacs-version))
+(defvar running-xemacs (featurep 'xemacs))
+
+(defvar running-mule-merged-emacs (and (not (boundp 'MULE))
+				       (not running-xemacs) (featurep 'mule)))
+(defvar running-xemacs-with-mule (and running-xemacs (featurep 'mule)))
+
+(defvar running-emacs-19 (and (not running-xemacs) (= emacs-major-version 19)))
+(defvar running-emacs-19_29-or-later
+  (or (and running-emacs-19 (>= emacs-minor-version 29))
+      (and (not running-xemacs)(>= emacs-major-version 20))))
+
 (defvar running-xemacs-19 (and running-xemacs
 			       (= emacs-major-version 19)))
-(defvar running-xemacs-20 (and running-xemacs
-			       (= emacs-major-version 20)))
 (defvar running-xemacs-20-or-later (and running-xemacs
 					(>= emacs-major-version 20)))
 (defvar running-xemacs-19_14-or-later
   (or (and running-xemacs-19 (>= emacs-minor-version 14))
       running-xemacs-20-or-later))
-(defvar running-emacs-19 (and (not running-xemacs)
-			      (= emacs-major-version 19)))
-(defvar running-emacs-19_29-or-later
-  (or (and running-emacs-19 (>= emacs-minor-version 29))
-      (and (not running-xemacs)(>= emacs-major-version 20))))
 
-(cond ((boundp 'MULE)
-       (require 'emu-mule)
+(cond (running-xemacs
+       ;; for XEmacs
+       (defvar mouse-button-1 'button1)
+       (defvar mouse-button-2 'button2)
+       (defvar mouse-button-3 'button3)
+       )
+      ((>= emacs-major-version 19)
+       ;; mouse
+       (defvar mouse-button-1 [mouse-1])
+       (defvar mouse-button-2 [mouse-2])
+       (defvar mouse-button-3 [down-mouse-3])
        )
-      ((and running-xemacs-20 (featurep 'mule))
-       (require 'emu-x20)
+      (t
+       ;; mouse
+       (defvar mouse-button-1 nil)
+       (defvar mouse-button-2 nil)
+       (defvar mouse-button-3 nil)
+       ))
+
+;; for tm-7.106
+(unless (fboundp 'tl:make-overlay)
+  (defalias 'tl:make-overlay 'make-overlay)
+  (make-obsolete 'tl:make-overlay 'make-overlay)
+  )
+(unless (fboundp 'tl:overlay-put)
+  (defalias 'tl:overlay-put 'overlay-put)
+  (make-obsolete 'tl:overlay-put 'overlay-put)
+  )
+(unless (fboundp 'tl:overlay-put)
+  (defalias 'tl:overlay-buffer 'overlay-buffer)
+  (make-obsolete 'tl:overlay-buffer 'overlay-buffer)
+  )
+
+(require 'poem)
+(require 'mcharset)
+(require 'invisible)
+
+(defsubst char-list-to-string (char-list)
+  "Convert list of character CHAR-LIST to string."
+  (apply (function string) char-list))
+
+(cond ((featurep 'mule)
+       (cond ((featurep 'xemacs) ; for XEmacs with MULE
+	      ;; old Mule emulating aliases
+
+	      ;;(defalias 'char-leading-char 'char-charset)
+
+	      (defun char-category (character)
+		"Return string of category mnemonics for CHAR in TABLE.
+CHAR can be any multilingual character
+TABLE defaults to the current buffer's category table."
+		(mapconcat (lambda (chr)
+			     (if (integerp chr)
+				 (char-to-string (int-char chr))
+			       (char-to-string chr)))
+			   ;; `char-category-list' returns a list of
+			   ;; characters in XEmacs 21.2.25 and later,
+			   ;; otherwise integers.
+			   (char-category-list character)
+			   ""))
+	      )
+	     ((>= emacs-major-version 20) ; for Emacs 20
+	      (defalias 'insert-binary-file-contents-literally
+		'insert-file-contents-literally)
+	      
+	      ;; old Mule emulating aliases
+	      (defun char-category (character)
+		"Return string of category mnemonics for CHAR in TABLE.
+CHAR can be any multilingual character
+TABLE defaults to the current buffer's category table."
+		(category-set-mnemonics (char-category-set character)))
+	      )
+	     (t ; for MULE 1.* and 2.*
+	      (require 'emu-mule)
+	      ))
        )
       ((boundp 'NEMACS)
-       (require 'emu-nemacs)
+       ;; for Nemacs and Nepoch
+
+       ;; old MULE emulation
+       (defconst *noconv*    0)
+       (defconst *sjis*      1)
+       (defconst *junet*     2)
+       (defconst *ctext*     2)
+       (defconst *internal*  3)
+       (defconst *euc-japan* 3)
+       
+       (defun code-convert-string (str ic oc)
+	 "Convert code in STRING from SOURCE code to TARGET code,
+On successful conversion, returns the result string,
+else returns nil."
+	 (if (not (eq ic oc))
+	     (convert-string-kanji-code str ic oc)
+	   str))
+       
+       (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."
+	 (if (/= ic oc)
+	     (save-excursion
+	       (save-restriction
+		 (narrow-to-region beg end)
+		 (convert-region-kanji-code beg end ic oc)))
+	   ))
        )
       (t
-       (require 'emu-e19)
+       ;; for Emacs 19 and XEmacs without MULE
+       
+       ;; old MULE emulation
+       (defconst *internal* nil)
+       (defconst *ctext* nil)
+       (defconst *noconv* nil)
+       
+       (defun code-convert-string (str ic oc)
+	 "Convert code in STRING from SOURCE code to TARGET code,
+On successful conversion, returns the result string,
+else returns nil. [emu-latin1.el; old MULE emulating function]"
+	 str)
+
+       (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-latin1.el; old MULE emulating function]"
+	 t)
        ))
 
 
-;;; @ MIME charset
+;;; @ Mule emulating aliases
 ;;;
+;;; You should not use it.
 
-(defun charsets-to-mime-charset (charsets)
-  "Return MIME charset from list of charset CHARSETS.
-This function refers variable `charsets-mime-charset-alist'
-and `default-mime-charset'. [emu.el]"
-  (if charsets
-      (or (catch 'tag
-	    (let ((rest charsets-mime-charset-alist)
-		  cell csl)
-	      (while (setq cell (car rest))
-		(if (catch 'not-subset
-		      (let ((set1 charsets)
-			    (set2 (car cell))
-			    obj)
-			(while set1
-			  (setq obj (car set1))
-			  (or (memq obj set2)
-			      (throw 'not-subset nil)
-			      )
-			  (setq set1 (cdr set1))
-			  )
-			t))
-		    (throw 'tag (cdr cell))
-		  )
-		(setq rest (cdr rest))
-		)))
-	  default-mime-charset)))
-
-
-;;; @ EMACS 19.29 emulation
-;;;
+(or (boundp '*noconv*)
+    (defconst *noconv* 'binary
+      "Coding-system for binary.
+This constant is defined to emulate old MULE anything older than MULE 2.3.
+It is obsolete, so don't use it."))
 
-(or (fboundp 'buffer-substring-no-properties)
-    (defun buffer-substring-no-properties (beg end)
-      "Return the text from BEG to END, without text properties, as a string.
-\[emu.el; EMACS 19.29 emulating function]"
-      (let ((string (buffer-substring beg end)))
-        (tl:set-text-properties 0 (length string) nil string)
-	string))
-    )
-
-(or running-emacs-19_29-or-later
-    running-xemacs
-    ;; for Emacs 19.28 or earlier
-    (fboundp 'si:read-string)
-    (progn
-      (fset 'si:read-string (symbol-function 'read-string))
-      
-      (defun read-string (prompt &optional initial-input history)
-	"Read a string from the minibuffer, prompting with string PROMPT.
-If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
-The third arg HISTORY, is dummy for compatibility. [emu.el]
-See `read-from-minibuffer' for details of HISTORY argument."
-	(si:read-string prompt initial-input)
-	)
-      ))
-
-(or (fboundp 'add-to-list)
-    ;; This function was imported Emacs 19.30.
-    (defun add-to-list (list-var element)
-      "Add to the value of LIST-VAR the element ELEMENT if it isn't there yet.
-If you want to use `add-to-list' on a variable that is not defined
-until a certain package is loaded, you should put the call to `add-to-list'
-into a hook function that will be run only after loading the package.
-\[emu.el; EMACS 19.30 emulating function]"
-      (or (member element (symbol-value list-var))
-	  (set list-var (cons element (symbol-value list-var)))))
-    )
-
-
-;;; @ EMACS 19.31 emulation
-;;;
 
-(or (fboundp 'buffer-live-p)
-    (defun buffer-live-p (object)
-      "Return non-nil if OBJECT is a buffer which has not been killed.
-Value is nil if OBJECT is not a buffer or if it has been killed.
-\[emu.el; EMACS 19.31 emulating function]"
-      (and object
-	   (get-buffer object)
-	   (buffer-name (get-buffer object))
-	   ))
-    )
-
-(or (fboundp 'save-selected-window)
-    ;; This function was imported Emacs 19.33.
-    (defmacro save-selected-window (&rest body)
-      "Execute BODY, then select the window that was selected before BODY.
-\[emu.el; EMACS 19.31 emulating function]"
-      (list 'let
-	    '((save-selected-window-window (selected-window)))
-	    (list 'unwind-protect
-		  (cons 'progn body)
-		  (list 'select-window 'save-selected-window-window)))) 
-    )
-
-
-;;; @ XEmacs emulation
+;;; @ without code-conversion
 ;;;
 
-(or (fboundp 'functionp)
-    (defun functionp (obj)
-      "Returns t if OBJ is a function, nil otherwise.
-\[emu.el; XEmacs emulating function]"
-      (or (subrp obj)
-	  (byte-code-function-p obj)
-	  (and (symbolp obj)(fboundp obj))
-	  (and (consp obj)(eq (car obj) 'lambda))
-	  ))
-    )
-	
-
-;;; @ for XEmacs 20
-;;;
+(defalias 'insert-binary-file-contents 'insert-file-contents-as-binary)
+(make-obsolete 'insert-binary-file-contents 'insert-file-contents-as-binary)
 
-(or (fboundp 'char-int)
-    (fset 'char-int (symbol-function 'identity))
-    )
-(or (fboundp 'int-char)
-    (fset 'int-char (symbol-function 'identity))
-    )
+(defun-maybe insert-binary-file-contents-literally (filename
+						    &optional visit
+						    beg end replace)
+  "Like `insert-file-contents-literally', q.v., but don't code conversion.
+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."
+  (as-binary-input-file
+   ;; Returns list absolute file name and length of data inserted.
+   (insert-file-contents-literally filename visit beg end replace)))
 
 
 ;;; @ for text/richtext and text/enriched
 ;;;
 
-(cond ((or running-emacs-19_29-or-later running-xemacs-19_14-or-later)
+(cond ((fboundp 'richtext-decode)
+       ;; have richtext.el
+       )
+      ((or running-emacs-19_29-or-later running-xemacs-19_14-or-later)
        ;; have enriched.el
        (autoload 'richtext-decode "richtext")
        (or (assq 'text/richtext format-alist)
@@ -212,10 +228,35 @@ Value is nil if OBJECT is not a buffer or if it has been killed.
        (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