-;;; emu-e20.el --- emu API implementation for Emacs 20
+;;; emu-e20.el --- emu API implementation for Emacs 20.1 and 20.2
-;; Copyright (C) 1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997,1998 Free Software Foundation, Inc.
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu-e20.el,v 7.26 1997/11/04 09:10:31 morioka Exp $
;; Keywords: emulation, compatibility, Mule
;; This file is part of emu.
;;; Commentary:
-;; This module requires Emacs 20.1 or later.
+;; This module requires Emacs 20.1 and 20.2.
;;; Code:
-(require 'emu-19)
+(require 'emu-e19)
(defun fontset-pixel-size (fontset)
(let* ((info (fontset-info fontset))
(encode-coding-region start end cs)
)))
-(defsubst decode-mime-charset-region (start end charset)
+(defsubst decode-mime-charset-region (start end charset &optional lbt)
"Decode the text between START and END as MIME CHARSET."
(let (cs)
(if (and enable-multibyte-characters
- (setq cs (mime-charset-to-coding-system charset)))
+ (setq cs (mime-charset-to-coding-system charset lbt)))
(decode-coding-region start end cs)
)))
(encode-coding-string string cs)
string)))
-(defsubst decode-mime-charset-string (string charset)
+(defsubst decode-mime-charset-string (string charset &optional lbt)
"Decode the STRING as MIME CHARSET."
(let (cs)
(if (and enable-multibyte-characters
- (setq cs (mime-charset-to-coding-system charset)))
+ (setq cs (mime-charset-to-coding-system charset lbt)))
(decode-coding-string string cs)
string)))
((ascii latin-iso8859-9) . iso-8859-9)
((ascii latin-jisx0201
japanese-jisx0208-1978 japanese-jisx0208) . iso-2022-jp)
+ ((ascii latin-jisx0201
+ katakana-jisx0201 japanese-jisx0208) . shift_jis)
((ascii korean-ksc5601) . euc-kr)
((ascii chinese-gb2312) . cn-gb-2312)
((ascii chinese-big5-1 chinese-big5-2) . cn-big5)
;;; @ character
;;;
-(defalias 'char-length 'char-bytes)
-
-(defalias 'char-columns 'char-width)
-
-
;;; @@ Mule emulating aliases
;;;
;;; You should not use them.
)
-;;; @ string
+;;; @ CCL
;;;
-(defalias 'string-columns 'string-width)
-
-(defalias 'sset 'store-substring)
-
-(defun string-to-char-list (string)
- "Return a list of which elements are characters in the STRING."
- (let* ((len (length string))
- (i 0)
- l chr)
- (while (< i len)
- (setq chr (sref string i))
- (setq l (cons chr l))
- (setq i (+ i (char-bytes chr)))
- )
- (nreverse l)
- ))
-
-(defalias 'string-to-int-list 'string-to-char-list)
+(eval-and-compile
+(defconst ccl-use-symbol-as-program
+ (eval-when-compile
+ (define-ccl-program ew-ccl-identity-program
+ '(1 ((read r0) (loop (write-read-repeat r0)))))
+ (condition-case nil
+ (progn
+ (make-coding-system
+ 'ew-ccl-identity 4 ?I
+ "Identity coding system for byte-compile time checking"
+ '(ew-ccl-identity-program . ew-ccl-identity-program))
+ t)
+ (error nil)))
+ "t if CCL related builtins accept symbol as CCL
+program. (20.2 with ExCCL, 20.3 or later)
+Otherwise nil (20.2 without ExCCL or former).
+
+Because emu provides functions accepting symbol as CCL program,
+user programs should not refer this variable.")
+
+(defun make-ccl-coding-system
+ (coding-system mnemonic doc-string decoder encoder)
+ "Define a new CODING-SYSTEM (symbol) by CCL programs
+DECODER (symbol) and ENCODER (symbol)."
+ (unless ccl-use-symbol-as-program
+ (setq decoder (symbol-value decoder))
+ (setq encoder (symbol-value encoder)))
+ (make-coding-system coding-system 4 mnemonic doc-string
+ (cons decoder encoder)))
+)
+
+(eval-when-compile
+(define-ccl-program test-ccl-eof-block
+ '(1
+ (read r0)
+ (write "[EOF]")))
+
+(unless (coding-system-p 'test-ccl-eof-block-cs)
+ (make-ccl-coding-system 'test-ccl-eof-block-cs ?T
+ "CCL_EOF_BLOCK tester"
+ 'test-ccl-eof-block
+ 'test-ccl-eof-block))
+)
+
+(defconst ccl-encoder-eof-block-is-broken
+ (eval-when-compile
+ (not (equal (encode-coding-string "" 'test-ccl-eof-block-cs)
+ "[EOF]")))
+ "t if CCL_EOF_BLOCK is not executed when coding system encounts EOF on
+encoding.")
+
+(defconst ccl-decoder-eof-block-is-broken
+ (eval-when-compile
+ (not (equal (decode-coding-string "" 'test-ccl-eof-block-cs)
+ "[EOF]")))
+ "t if CCL_EOF_BLOCK is not executed when coding system encounts EOF on
+decoding.")
+
+(defconst ccl-eof-block-is-broken
+ (or ccl-encoder-eof-block-is-broken
+ ccl-decoder-eof-block-is-broken))
+
+(unless ccl-use-symbol-as-program
+
+(when (subrp (symbol-function 'ccl-execute))
+ (fset 'ccl-vector-program-execute
+ (symbol-function 'ccl-execute))
+ (defun ccl-execute (ccl-prog reg)
+ "Execute CCL-PROG `ccl-vector-program-execute'.
+If CCL-PROG is symbol, it is dereferenced.
+\[Emacs 20.3 emulating function]"
+ (ccl-vector-program-execute
+ (if (symbolp ccl-prog) (symbol-value ccl-prog) ccl-prog)
+ reg)))
+
+(when (subrp (symbol-function 'ccl-execute-on-string))
+ (fset 'ccl-vector-program-execute-on-string
+ (symbol-function 'ccl-execute-on-string))
+ (defun ccl-execute-on-string (ccl-prog status &optional contin)
+ "Execute CCL-PROG `ccl-vector-program-execute-on-string'.
+If CCL-PROG is symbol, it is dereferenced.
+\[Emacs 20.3 emulating function]"
+ (ccl-vector-program-execute-on-string
+ (if (symbolp ccl-prog) (symbol-value ccl-prog) ccl-prog)
+ status
+ contin)))
+
+)
;;; @ end
(require 'emu-20)
+(defalias 'insert-binary-file-contents 'insert-file-contents-as-binary)
+(make-obsolete 'insert-binary-file-contents 'insert-file-contents-as-binary)
+
+(defalias 'insert-binary-file-contents-literally
+ 'insert-file-contents-literally)
+
+(if (and (fboundp 'set-buffer-multibyte)
+ (subrp (symbol-function 'set-buffer-multibyte)))
+ (require 'emu-e20_3) ; for Emacs 20.3
+ (require 'emu-e20_2) ; for Emacs 20.1 and 20.2
+ )
+
+
(provide 'emu-e20)
;;; emu-e20.el ends here
projects / elisp / apel.git / blobdiff