From 22bb06f1662cc0e12bad52bf18c727a1afc9ba52 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 18:24:03 +0000 Subject: [PATCH] tm 7.61. --- ChangeLog | 42 +++++++++++++++++++++++++++++++++++++ Makefile | 2 +- emu-19.el | 4 +--- emu-e19.el | 24 ++++++++++++---------- emu-mule.el | 64 +++++++++++++++++++++++++++++---------------------------- emu-x20.el | 14 ++++++------- emu-xemacs.el | 9 +------- 7 files changed, 98 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee4b127..434b0d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,45 @@ +Wed May 15 14:23:50 1996 MORIOKA Tomohiko + + * tl: Version 7.24 was released. + + * tl-822.el (rfc822/lexical-analyze): Unnecessary local variable + `len' was abolished. + +Wed May 15 14:19:45 1996 MORIOKA Tomohiko + + * tl-822.el (rfc822/lexical-analyze): Unnecessary local variable + `i' was abolished. + +Wed May 15 14:12:22 1996 MORIOKA Tomohiko + + * tl-list.el (permute): Unnecessary local variable `ret' was + abolished. + +Wed May 15 14:05:34 1996 MORIOKA Tomohiko + + * emu-xemacs.el: Function `string-to-int-list' for XEmacs 19 was + deleted, for XEmacs 20 with Mule was moved to emu-x20.el. + + * emu-x20.el, emu-e19.el: rearrangement. + +Tue May 14 16:28:33 1996 MORIOKA Tomohiko + + * emu-mule.el: rearrangement. + + * emu-mule.el (string-to-int-list): New alias; moved from emu-19.el. + +Tue May 14 16:23:29 1996 MORIOKA Tomohiko + + * emu-e19.el (string-to-int-list): New alias; moved from emu-19.el. + + * emu-19.el: Alias `string-to-int-list' was moved to emu-e19.el + and emu-mule.el. + +Tue May 14 06:55:46 1996 MORIOKA Tomohiko + + * mu-cite.el (compress-cited-prefix): New function. + + Tue May 14 02:41:20 1996 MORIOKA Tomohiko * tl: Version 7.22.5 was released. diff --git a/Makefile b/Makefile index f2c5a68..d422687 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \ tl/*.el tl/*.bdf \ tl/doc/*.texi tl/ChangeLog -TARFILE = tl-7.22.4.tar +TARFILE = tl-7.24.tar elc: diff --git a/emu-19.el b/emu-19.el index 9f9ac3c..7eec5d3 100644 --- a/emu-19.el +++ b/emu-19.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-19.el,v 7.3 1996/04/24 11:57:52 morioka Exp $ +;;; $Id: emu-19.el,v 7.4 1996/05/14 16:22:38 morioka Exp $ ;;; Keywords: emulation, compatibility ;;; ;;; This file is part of tl (Tiny Library). @@ -55,8 +55,6 @@ "") )) -(fset 'string-to-int-list 'string-to-char-list) - ;;; @ end ;;; diff --git a/emu-e19.el b/emu-e19.el index 7a0d509..e4c79a9 100644 --- a/emu-e19.el +++ b/emu-e19.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-e19.el,v 7.12 1996/05/09 14:26:27 morioka Exp $ +;;; $Id: emu-e19.el,v 7.14 1996/05/15 14:00:04 morioka Exp $ ;;; Keywords: emulation, compatibility, Mule, Latin-1 ;;; ;;; This file is part of tl (Tiny Library). @@ -27,6 +27,16 @@ ;;; ;;; Code: +;;; @ version and variant specific features +;;; + +(cond (running-xemacs + (require 'emu-xemacs)) + (running-emacs-19 + (require 'emu-19) + )) + + ;;; @ character set ;;; @@ -120,6 +130,8 @@ between START and END. [emu-e19.el; Mule emulating function]" (mapcar (function identity) str) ) +(defalias 'string-to-int-list 'string-to-char-list) + (defalias 'sref 'aref) (defun truncate-string (str width &optional start-column) @@ -132,16 +144,6 @@ Optional non-nil arg START-COLUMN specifies the starting column. ) -;;; @ etc -;;; - -(cond (running-xemacs - (require 'emu-xemacs)) - (running-emacs-19 - (require 'emu-19) - )) - - ;;; @ end ;;; diff --git a/emu-mule.el b/emu-mule.el index bffee9e..00eefb4 100644 --- a/emu-mule.el +++ b/emu-mule.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-mule.el,v 7.11 1996/05/09 16:38:20 morioka Exp $ +;;; $Id: emu-mule.el,v 7.13 1996/05/14 16:28:33 morioka Exp $ ;;; Keywords: emulation, compatibility, Mule ;;; ;;; This file is part of tl (Tiny Library). @@ -27,6 +27,36 @@ ;;; ;;; Code: +;;; @ version specific features +;;; + +(cond (running-emacs-19 + (require 'emu-19) + + ;; Suggested by SASAKI Osamu + ;; (cf. [os2-emacs-ja:78]) + (defun fontset-pixel-size (fontset) + (let* ((font (get-font-info + (aref (cdr (get-fontset-info fontset)) 0))) + (open (aref font 4))) + (if (= open 1) + (aref font 5) + (if (= open 0) + (let ((pat (aref font 1))) + (if (string-match "-[0-9]+-" pat) + (string-to-number + (substring + pat (1+ (match-beginning 0)) (1- (match-end 0)))) + 0))) + ))) + ) + (running-emacs-18 + (require 'emu-18) + (defun tl:make-overlay (beg end &optional buffer type)) + (defun tl:overlay-put (overlay prop value)) + )) + + ;;; @ character set ;;; @@ -61,38 +91,10 @@ encoded in CODING-SYSTEM. [emu-mule.el]" ) -;;; @ version specific features +;;; @ character and string ;;; -(cond (running-emacs-19 - (require 'emu-19) - - ;; Suggested by SASAKI Osamu - ;; (cf. [os2-emacs-ja:78]) - (defun fontset-pixel-size (fontset) - (let* ((font (get-font-info - (aref (cdr (get-fontset-info fontset)) 0))) - (open (aref font 4))) - (if (= open 1) - (aref font 5) - (if (= open 0) - (let ((pat (aref font 1))) - (if (string-match "-[0-9]+-" pat) - (string-to-number - (substring - pat (1+ (match-beginning 0)) (1- (match-end 0)))) - 0))) - ))) - ) - (running-emacs-18 - (require 'emu-18) - (defun tl:make-overlay (beg end &optional buffer type)) - (defun tl:overlay-put (overlay prop value)) - )) - - -;;; @@ truncate-string -;;; +(defalias 'string-to-int-list 'string-to-char-list) (or (fboundp 'truncate-string) ;;; Imported from Mule-2.3 diff --git a/emu-x20.el b/emu-x20.el index 39cb1dd..008f59b 100644 --- a/emu-x20.el +++ b/emu-x20.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-x20.el,v 7.1 1996/05/14 02:41:20 morioka Exp $ +;;; $Id: emu-x20.el,v 7.2 1996/05/15 14:02:54 morioka Exp morioka $ ;;; Keywords: emulation, compatibility, Mule, XEmacs ;;; ;;; This file is part of tl (Tiny Library). @@ -27,6 +27,8 @@ ;;; ;;; Code: +(require 'emu-xemacs) + (defvar xemacs-beta-version (if (string-match "(beta\\([0-9]+\\))" emacs-version) (string-to-number @@ -137,6 +139,10 @@ in the region between START and END. (defalias 'string-width 'length) +(defun string-to-int-list (str) + (mapcar #'char-int str) + ) + (defalias 'sref 'aref) (defun truncate-string (str width &optional start-column) @@ -149,12 +155,6 @@ Optional non-nil arg START-COLUMN specifies the starting column. ) -;;; @ etc -;;; - -(require 'emu-xemacs) - - ;;; @ end ;;; diff --git a/emu-xemacs.el b/emu-xemacs.el index 6c0ca6d..4e2a69f 100644 --- a/emu-xemacs.el +++ b/emu-xemacs.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-xemacs.el,v 7.4 1996/04/24 11:58:31 morioka Exp $ +;;; $Id: emu-xemacs.el,v 7.5 1996/05/15 14:05:34 morioka Exp $ ;;; Keywords: emulation, compatibility, XEmacs ;;; ;;; This file is part of tl (Tiny Library). @@ -96,13 +96,6 @@ "Convert list of character CHAR-LIST to string. [emu-xemacs.el]" `(mapconcat #'char-to-string ,char-list "")) -(if running-xemacs-20 - (defun string-to-int-list (str) - (mapcar #'char-int str) - ) - (fset 'string-to-int-list 'string-to-char-list) - ) - ;;; @ end ;;; -- 1.7.10.4