From: morioka Date: Mon, 9 Mar 1998 18:58:13 +0000 (+0000) Subject: tm 7.66. X-Git-Tag: tm7_66~1 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4526571d1a366cae7803f82d9f4f3585afa1681e;p=elisp%2Fapel.git tm 7.66. --- diff --git a/ChangeLog b/ChangeLog index 35239e6..0d63eff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Tue May 28 06:48:04 1996 MORIOKA Tomohiko + + * tl: Version 7.29 was released. + + * mu-comment.el (comment-sexp): Unused local variable `p' was + abolished. + +Tue May 28 06:30:51 1996 MORIOKA Tomohiko + + * emu-e19.el, emu-nemacs.el (charset-description): New function. + (charset-registry): New function. + (charset-columns): New function. + (charset-direction): New function. + + Mon May 27 14:04:12 1996 MORIOKA Tomohiko * tl: Version 7.27.1 was released. diff --git a/Makefile b/Makefile index b5fa27f..288d4ba 100644 --- a/Makefile +++ b/Makefile @@ -19,9 +19,9 @@ TLDIR19 = $(HOME)/lib/emacs19/lisp FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \ tl/*.el tl/*.bdf \ - tl/doc/*.texi tl/ChangeLog + tl/doc/*.ol tl/doc/*.tex tl/doc/*.texi tl/ChangeLog -TARFILE = tl-7.27.tar +TARFILE = tl-7.29.tar elc: diff --git a/emu-e19.el b/emu-e19.el index 118879e..ab07fea 100644 --- a/emu-e19.el +++ b/emu-e19.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-e19.el,v 7.18 1996/05/27 12:25:34 morioka Exp $ +;;; $Id: emu-e19.el,v 7.20 1996/05/28 06:37:36 morioka Exp $ ;;; Keywords: emulation, compatibility, Mule, Latin-1 ;;; ;;; This file is part of tl (Tiny Library). @@ -43,6 +43,48 @@ (defconst charset-ascii 0 "Character set of ASCII") (defconst charset-latin-1 129 "Character set of ISO-8859-1") +(defun charset-description (charset) + "Return description of CHARSET. [emu-e19.el]" + (if (< charset 128) + (documentation-property 'charset-ascii 'variable-documentation) + (documentation-property 'charset-latin-1 'variable-documentation) + )) + +(defun charset-registry (charset) + "Return registry name of CHARSET. [emu-e19.el]" + (if (< charset 128) + "ASCII" + "ISO8859-1")) + +(defun charset-columns (charset) + "Return number of columns a CHARSET occupies when displayed. +\[emu-e19.el]" + 1) + +(defun charset-direction (charset) + "Return the direction of a character of CHARSET by + 0 (left-to-right) or 1 (right-to-left). [emu-e19.el]" + 0) + +(defun find-charset-string (str) + "Return a list of charsets in the string. +\[emu-e19.el; Mule emulating function]" + (if (string-match "[\200-\377]" str) + (list lc-ltn1) + )) + +(defun find-charset-region (start end) + "Return a list of charsets in the region between START and END. +\[emu-e19.el; Mule emulating function]" + (if (save-excursion + (save-restriction + (narrow-to-region start end) + (goto-char start) + (re-search-forward "[\200-\377]" nil t) + )) + (list lc-ltn1) + )) + ;;; @@ for Mule emulation ;;; @@ -99,13 +141,6 @@ between START and END. [emu-e19.el; Mule emulating function]" ;;; @ character ;;; -(defun char-bytes (chr) 1) - -(defun char-columns (character) - "Return number of columns a CHARACTER occupies when displayed. -\[emu-nemacs.el]" - 1) - (defun char-charset (chr) "Return the character set of char CHR. \[emu-e19.el; XEmacs 20 emulating function]" @@ -113,24 +148,15 @@ between START and END. [emu-e19.el; Mule emulating function]" charset-ascii charset-latin-1)) -(defun find-charset-string (str) - "Return a list of leading-chars in the string. +(defun char-bytes (char) + "Return number of bytes a character in CHAR occupies in a buffer. \[emu-e19.el; Mule emulating function]" - (if (string-match "[\200-\377]" str) - (list lc-ltn1) - )) + 1) -(defun find-charset-region (start end) - "Return a list of leading-chars in the region between START and END. -\[emu-e19.el; Mule emulating function]" - (if (save-excursion - (save-restriction - (narrow-to-region start end) - (goto-char start) - (re-search-forward "[\200-\377]" nil t) - )) - (list lc-ltn1) - )) +(defun char-columns (character) + "Return number of columns a CHARACTER occupies when displayed. +\[emu-nemacs.el]" + 1) ;;; @@ for Mule emulation ;;; diff --git a/emu-nemacs.el b/emu-nemacs.el index 986c3b6..d782bc6 100644 --- a/emu-nemacs.el +++ b/emu-nemacs.el @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; modified by KOBAYASHI Shuhei ;;; Version: -;;; $Id: emu-nemacs.el,v 7.27 1996/05/27 12:27:59 morioka Exp $ +;;; $Id: emu-nemacs.el,v 7.29 1996/05/28 06:39:56 morioka Exp $ ;;; Keywords: emulation, compatibility, NEmacs, Mule ;;; ;;; This file is part of tl (Tiny Library). @@ -37,6 +37,62 @@ (defconst charset-ascii 0 "Character set of ASCII") (defconst charset-jisx0208 146 "Character set of JIS X0208-1983") +(defun charset-description (charset) + "Return description of CHARSET. [emu-nemacs.el]" + (if (< charset 128) + (documentation-property 'charset-ascii 'variable-documentation) + (documentation-property 'charset-jisx0208 'variable-documentation) + )) + +(defun charset-registry (charset) + "Return registry name of CHARSET. [emu-nemacs.el]" + (if (< charset 128) + "ASCII" + "JISX0208.1983")) + +(defun charset-columns (charset) + "Return number of columns a CHARSET occupies when displayed. +\[emu-nemacs.el]" + (if (< charset 128) + 1 + 2)) + +(defun charset-direction (charset) + "Return the direction of a character of CHARSET by + 0 (left-to-right) or 1 (right-to-left). [emu-nemacs.el]" + 0) + +(defun find-charset-string (str) + "Return a list of charsets in the string. +\[emu-nemacs.el; Mule emulating function]" + (if (string-match "[\200-\377]" str) + (list lc-jp) + )) + +(defun find-charset-region (start end) + "Return a list of charsets in the region between START and END. +\[emu-nemacs.el; Mule emulating function]" + (if (save-excursion + (save-restriction + (narrow-to-region start end) + (goto-char start) + (re-search-forward "[\200-\377]" nil t) + )) + (list lc-jp) + )) + +(defun check-ASCII-string (str) + (let ((i 0) + len) + (setq len (length str)) + (catch 'label + (while (< i len) + (if (>= (elt str i) 128) + (throw 'label nil)) + (setq i (+ i 1)) + ) + str))) + ;;; @@ for Mule emulation ;;; @@ -178,37 +234,6 @@ else returns nil. [emu-nemacs.el; Mule emulating function]" (fset 'string-to-int-list (symbol-function 'string-to-char-list)) -(defun find-charset-string (str) - "Return a list of leading-chars in the string. -\[emu-nemacs.el; Mule emulating function]" - (if (string-match "[\200-\377]" str) - (list lc-jp) - )) - -(defun find-charset-region (start end) - "Return a list of leading-chars in the region between START and END. -\[emu-nemacs.el; Mule emulating function]" - (if (save-excursion - (save-restriction - (narrow-to-region start end) - (goto-char start) - (re-search-forward "[\200-\377]" nil t) - )) - (list lc-jp) - )) - -(defun check-ASCII-string (str) - (let ((i 0) - len) - (setq len (length str)) - (catch 'label - (while (< i len) - (if (>= (elt str i) 128) - (throw 'label nil)) - (setq i (+ i 1)) - ) - str))) - ;;; Imported from Mule-2.3 (defun truncate-string (str width &optional start-column) "Truncate STR to fit in WIDTH columns. diff --git a/emu-x20.el b/emu-x20.el index a4cb1fa..27c4c8d 100644 --- a/emu-x20.el +++ b/emu-x20.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-x20.el,v 7.11 1996/05/27 14:09:18 morioka Exp $ +;;; $Id: emu-x20.el,v 7.12 1996/05/28 06:42:21 morioka Exp $ ;;; Keywords: emulation, compatibility, Mule, XEmacs ;;; ;;; This file is part of tl (Tiny Library). @@ -66,6 +66,19 @@ (defalias 'charset-description 'charset-doc-string) +(defun find-charset-string (string) + "Return a list of charsets in the STRING except ascii. +\[emu-x20.el; Mule emulating function]" + (delq 'ascii (charsets-in-string string)) + ) + +(defun find-charset-region (start end) + "Return a list of charsets except ascii +in the region between START and END. +\[emu-x20.el; Mule emulating function]" + (delq 'ascii (charsets-in-region start end)) + ) + ;;; @@ for Mule emulation ;;; @@ -198,19 +211,6 @@ Optional non-nil arg START-COLUMN specifies the starting column. (substring str start-column width) ) -(defun find-charset-string (string) - "Return a list of charsets in the STRING except ascii. -\[emu-x20.el; Mule emulating function]" - (delq 'ascii (charsets-in-string string)) - ) - -(defun find-charset-region (start end) - "Return a list of charsets except ascii -in the region between START and END. -\[emu-x20.el; Mule emulating function]" - (delq 'ascii (charsets-in-region start end)) - ) - ;;; @ end ;;;