From c3077e7262e7a93b60dc43fbf2644bc7502abd3c Mon Sep 17 00:00:00 2001 From: morioka Date: Wed, 11 Mar 1998 13:08:32 +0000 Subject: [PATCH] APEL 3.4.2. --- ChangeLog | 27 +++++++++++++++++++++++++++ Makefile | 4 ++-- emu-20.el | 14 +++++++------- emu-e20.el | 11 ++++++++--- emu.el | 14 +++++++++++++- 5 files changed, 57 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 193b0ea..f1d0969 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +1997-09-09 MORIOKA Tomohiko + + * APEL: Version 3.4.2 was released. + + * README.en (What's APEL?): Add emu-20.el. + +1997-09-07 MORIOKA Tomohiko + + * emu-20.el (mime-charset-to-coding-system): Use defsubst again; + modify implementation. + + * emu-20.el (mime-charset-to-coding-system): Use + `find-coding-system'. + + * emu-20.el (mime-charset-coding-system-alist): Use + `find-coding-system'. + + * emu-e20.el (find-coding-system): New inline function. + + * emu.el (defsubst-maybe): New macro. + +1997-09-03 MORIOKA Tomohiko + + * emu-20.el (mime-charset-to-coding-system): Use `defun' instead + of `defsubst'. + + 1997-09-02 MORIOKA Tomohiko * APEL: Version 3.4.1 was released. diff --git a/Makefile b/Makefile index 870b56a..95c6598 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ # -# $Id: Makefile,v 0.10 1997/09/02 08:18:34 morioka Exp $ +# $Id: Makefile,v 0.11 1997/09/09 05:07:03 morioka Exp $ # -VERSION = 3.4.1 +VERSION = 3.4.2 TAR = gtar RM = /bin/rm -f diff --git a/emu-20.el b/emu-20.el index db66d36..fdda4ee 100644 --- a/emu-20.el +++ b/emu-20.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Id: emu-20.el,v 7.11 1997/08/30 07:46:38 morioka Exp $ +;; Version: $Id: emu-20.el,v 7.15 1997/09/07 02:57:51 morioka Exp $ ;; Keywords: emulation, compatibility, Mule ;; This file is part of emu. @@ -78,11 +78,10 @@ This constant is defined to emulate old MULE anything older than MULE (iso-2022-jp-2 . iso-2022-7bit-ss2) (x-ctext . ctext) )) - (css (coding-system-list)) dest) (while rest (let ((pair (car rest))) - (or (memq (car pair) css) + (or (find-coding-system (car pair)) (setq dest (cons pair dest)) )) (setq rest (cdr rest)) @@ -103,10 +102,11 @@ used as line break code type of coding-system." (if ret (setq charset (cdr ret)) )) - (if (memq charset (coding-system-list)) - (if lbt - (intern (concat (symbol-name charset) "-" (symbol-name lbt))) - charset))) + (if lbt + (setq charset (intern (format "%s-%s" charset lbt))) + ) + (if (find-coding-system charset) + charset)) (defsubst encode-mime-charset-region (start end charset) "Encode the text between START and END as MIME CHARSET." diff --git a/emu-e20.el b/emu-e20.el index 1dec5ef..6b97ee2 100644 --- a/emu-e20.el +++ b/emu-e20.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1996,1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Id: emu-e20.el,v 7.22 1997/08/30 07:46:40 morioka Exp $ +;; Version: $Id: emu-e20.el,v 7.24 1997/09/07 02:39:24 morioka Exp $ ;; Keywords: emulation, compatibility, Mule ;; This file is part of emu. @@ -44,8 +44,6 @@ (t 0) ))) -(require 'emu-20) - ;;; @ character set ;;; @@ -67,6 +65,11 @@ in the region between START and END." ;;; @ coding system ;;; +(defsubst-maybe find-coding-system (obj) + "Return OBJ if it is a coding-system." + (if (coding-system-p obj) + obj)) + (defalias 'set-process-input-coding-system 'set-process-coding-system) @@ -157,6 +160,8 @@ TABLE defaults to the current buffer's category table." ;;; @ end ;;; +(require 'emu-20) + (provide 'emu-e20) ;;; emu-e20.el ends here diff --git a/emu.el b/emu.el index ea58c00..066dc18 100644 --- a/emu.el +++ b/emu.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Id: emu.el,v 7.46 1997/08/30 08:10:50 morioka Exp $ +;; Version: $Id: emu.el,v 7.48 1997/09/07 02:37:40 morioka Exp $ ;; Keywords: emulation, compatibility, NEmacs, MULE, Emacs/mule, XEmacs ;; This file is part of emu. @@ -36,6 +36,17 @@ )) ))) +(defmacro defsubst-maybe (name &rest everything-else) + (or (and (fboundp name) + (not (get name 'defsubst-maybe)) + ) + (` (or (fboundp (quote (, name))) + (progn + (defsubst (, name) (,@ everything-else)) + (put (quote (, name)) 'defsubst-maybe t) + )) + ))) + (defmacro defmacro-maybe (name &rest everything-else) (or (and (fboundp name) (not (get name 'defmacro-maybe)) @@ -48,6 +59,7 @@ ))) (put 'defun-maybe 'lisp-indent-function 'defun) +(put 'defsubst-maybe 'lisp-indent-function 'defun) (put 'defmacro-maybe 'lisp-indent-function 'defun) (defmacro defconst-maybe (name &rest everything-else) -- 1.7.10.4