From 5dd5776d7fa0307229d4de89278bf6fc5d37f237 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 07:57:19 +0000 Subject: [PATCH] tm 6.88. --- Makefile | 2 +- emu-18.el | 14 ++++++++++++-- emu-19.el | 25 +++++++++++++++++++++++++ emu-mule.el | 21 ++++++++++++++++++--- emu-nemacs.el | 34 +++++++++++++++++++++++++++++++-- emu-xemacs.el | 58 ++++++++++++++++++++++++++++++++++++--------------------- emu.el | 16 ++++++++++------ 7 files changed, 135 insertions(+), 35 deletions(-) create mode 100644 emu-19.el diff --git a/Makefile b/Makefile index fd3d8ce..2186907 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ TLDIR19 = $(HOME)/lib/emacs19/lisp FILES = tl/README.eng tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi -TARFILE = tl-6.6.5.tar +TARFILE = tl-6.6.6.tar elc: diff --git a/emu-18.el b/emu-18.el index e9ea96b..43c3a5f 100644 --- a/emu-18.el +++ b/emu-18.el @@ -1,7 +1,15 @@ ;;; -;;; emu-18: Emacs 19.* emulation module for Emacs 18.* +;;; emu-18.el --- Emacs 19.* emulation module for Emacs 18.* ;;; -;;; $Id: emu-18.el,v 4.0 1995/09/05 16:44:57 morioka Exp $ +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1994,1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Version: +;;; $Id: emu-18.el,v 6.0 1995/09/21 00:06:48 morioka Exp $ +;;; Keywords: emulation, compatibility +;;; +;;; This file is part of tl and tm (Tools for MIME). ;;; ;; This function is imported from AUC TeX. @@ -94,4 +102,6 @@ to create parent directories if they don't exist. (make-directory-internal dir) )) +(defvar mouse-button-2 nil) + (provide 'emu-18) diff --git a/emu-19.el b/emu-19.el new file mode 100644 index 0000000..880b526 --- /dev/null +++ b/emu-19.el @@ -0,0 +1,25 @@ +;;; +;;; emu-19.el --- emu module for FSF original Emacs 19.* +;;; +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Version: +;;; $Id: emu-19.el,v 2.0 1995/09/21 00:10:55 morioka Exp $ +;;; Keywords: emulation, compatibility +;;; +;;; This file is part of tl and tm (Tools for MIME). +;;; + +(defalias 'tl:set-text-properties 'set-text-properties) +(defalias 'tl:add-text-properties 'add-text-properties) +(defalias 'tl:make-overlay 'make-overlay) +(defalias 'tl:overlay-put 'overlay-put) +(defalias 'tl:overlay-buffer 'overlay-buffer) + +(defvar mouse-button-2 + (if window-system [mouse-2]) + ) + +(provide 'emu-19) diff --git a/emu-mule.el b/emu-mule.el index 2fd7140..9ddc0eb 100644 --- a/emu-mule.el +++ b/emu-mule.el @@ -1,7 +1,15 @@ ;;; -;;; emu-mule: Mule 2.* emulation module for Mule +;;; emu-mule.el --- Mule 2.* emulation module for Mule ;;; -;;; $Id: emu-mule.el,v 6.1 1995/08/26 18:07:55 morioka Exp $ +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1994,1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Version: +;;; $Id: emu-mule.el,v 6.3 1995/09/21 00:08:02 morioka Exp $ +;;; Keywords: emulation, compatibility, Mule +;;; +;;; This file is part of tl and tm (Tools for MIME). ;;; (defun some-element (pred seq) @@ -30,6 +38,7 @@ whose return value applied function PRED is not nil. ) (cond ((>= emacs-major-version 19) + (require 'emu-19) (defun fontset-pixel-size (fontset) (elt (get-font-info @@ -41,6 +50,12 @@ whose return value applied function PRED is not nil. (cdr (get-fontset-info fontset)) )) 5)) ) - (t (require 'emu-18))) + (t + (require 'emu-18) + (defun tl:make-overlay (beg end &optional buffer type)) + (defun tl:overlay-put (overlay prop value)) + (defun tl:add-text-properties (start end properties &optional object)) + )) + (provide 'emu-mule) diff --git a/emu-nemacs.el b/emu-nemacs.el index 709ed48..d03d97d 100644 --- a/emu-nemacs.el +++ b/emu-nemacs.el @@ -1,7 +1,15 @@ ;;; -;;; emu-nemacs: Mule 2 emulation module for NEmacs +;;; emu-nemacs.el --- Mule 2 emulation module for NEmacs ;;; -;;; $Id: emu-nemacs.el,v 5.0 1995/08/26 17:56:33 morioka Exp $ +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1994,1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Version: +;;; $Id: emu-nemacs.el,v 6.1 1995/09/21 00:07:24 morioka Exp $ +;;; Keywords: emulation, compatibility, NEmacs, Mule +;;; +;;; This file is part of tl and tm (Tools for MIME). ;;; (require 'emu-18) @@ -61,6 +69,12 @@ else returns nil. [Mule compatible function in tm-nemacs]" lc-ascii lc-jp)) +(setq tl:available-face-attribute-alist + '( + ;;(bold . inversed-region) + (italic . underlined-region) + (underline . underlined-region) + )) ;; by YAMATE Keiichirou 1994/10/28 (defun attribute-add-narrow-attribute (attr from to) @@ -101,5 +115,21 @@ else returns nil. [Mule compatible function in tm-nemacs]" (setcdr (nthcdr posfrom attr-value) (nthcdr posto attr-value))))) +(defalias 'tl:make-overlay 'cons) + +(defun tl:overlay-put (overlay prop value) + (let ((ret (and (eq prop 'face) + (assq value tl:available-face-attribute-alist) + ))) + (if ret + (attribute-add-narrow-attribute (cdr ret) + (car overlay)(cdr overlay)) + ))) + +(defun tl:add-text-properties (start end properties &optional object)) + + +;;; @ end +;;; (provide 'emu-nemacs) diff --git a/emu-xemacs.el b/emu-xemacs.el index adf7ea7..ed497bc 100644 --- a/emu-xemacs.el +++ b/emu-xemacs.el @@ -1,7 +1,15 @@ ;;; -;;; emu-xemacs: Emacs 19 emulation module for XEmacs +;;; emu-xemacs.el --- Emacs 19 emulation module for XEmacs ;;; -;;; $Id: emu-xemacs.el,v 3.0 1995/09/10 13:31:51 morioka Exp $ +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Version: +;;; $Id: emu-xemacs.el,v 5.0 1995/09/21 00:08:50 morioka Exp $ +;;; Keywords: emulation, compatibility, XEmacs +;;; +;;; This file is part of tl and tm (Tools for MIME). ;;; (or (fboundp 'face-list) @@ -16,24 +24,32 @@ (or (face-differs-from-default-p 'underline) (set-face-underline-p 'underline t)) -;;; (or (fboundp 'set-text-properties) -;;; (defun set-text-properties (start end props &optional buffer) -;;; (if (or (null buffer) (bufferp buffer)) -;;; (if props -;;; (while props -;;; (put-text-property -;;; start end (car props) (nth 1 props) buffer) -;;; (setq props (nthcdr 2 props))) -;;; (remove-text-properties start end ()) -;;; ))) -;;; ) -;;; -;;; (defalias 'make-overlay 'make-extent) -;;; (defalias 'overlay-put 'set-extent-property) -;;; (defalias 'overlay-buffer 'extent-buffer) -;;; -;;; (defun move-overlay (extent start end &optional buffer) -;;; (set-extent-endpoints extent start end) -;;; ) +(or (fboundp 'tl:set-text-properties) + (defun tl:set-text-properties (start end props &optional buffer) + (if (or (null buffer) (bufferp buffer)) + (if props + (while props + (put-text-property + start end (car props) (nth 1 props) buffer) + (setq props (nthcdr 2 props))) + (remove-text-properties start end ()) + ))) + ) + +(defun tl:add-text-properties (start end properties) + (add-text-properties start end + (append properties (list 'highlight t)) + ) + ) + +(defalias 'tl:make-overlay 'make-extent) +(defalias 'tl:overlay-put 'set-extent-property) +(defalias 'tl:overlay-buffer 'extent-buffer) + +(defun tl:move-overlay (extent start end &optional buffer) + (set-extent-endpoints extent start end) + ) + +(defvar mouse-button-2 'button2) (provide 'emu-xemacs) diff --git a/emu.el b/emu.el index 55e8d4d..54e52aa 100644 --- a/emu.el +++ b/emu.el @@ -1,7 +1,15 @@ ;;; -;;; emu: Emulation module for each Emacs variants +;;; emu.el --- Emulation module for each Emacs variants ;;; -;;; $Id: emu.el,v 2.0 1995/09/08 17:47:33 morioka Exp $ +;;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; Copyright (C) 1995 MORIOKA Tomohiko +;;; +;;; Author: MORIOKA Tomohiko +;;; Version: +;;; $Id: emu.el,v 4.0 1995/09/21 00:05:57 morioka Exp $ +;;; Keywords: emulation, compatibility, NEmacs, Mule, XEmacs +;;; +;;; This file is part of tl and tm (Tools for MIME). ;;; (cond ((boundp 'MULE) (require 'emu-mule)) @@ -9,10 +17,6 @@ (t (require 'emu-orig)) ) -(if (string-match "XEmacs\\|Lucid" emacs-version) - (require 'emu-xemacs) - ) - ;;; @ Emacs 19.29 emulation ;;; -- 1.7.10.4