update.

[elisp/apel.git] / emu-20.el

diff --git a/emu-20.el b/emu-20.el
index db66d36..a6e0e92 100644 (file)
--- a/emu-20.el
+++ b/emu-20.el
@@ -1,9 +1,8 @@
 ;;; emu-20.el --- emu API implementation for Emacs 20 and XEmacs/mule
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu-20.el,v 7.11 1997/08/30 07:46:38 morioka Exp $
 ;; Keywords: emulation, compatibility, Mule
 
 ;; This file is part of emu.
@@ -30,6 +29,10 @@
 
 ;;; Code:
 
+(require 'custom)
+(eval-when-compile (require 'wid-edit))
+
+
 ;;; @ binary access
 ;;;
 
@@ -47,17 +50,14 @@
   `(let ((coding-system-for-write 'binary))
      ,@body))
 
-(defun insert-binary-file-contents-literally
-  (filename &optional visit beg end replace)
-  "Like `insert-file-contents-literally', q.v., but don't code conversion.
-A buffer may be modified in several ways after reading into the buffer due
-to advanced Emacs features, such as file-name-handlers, format decoding,
-find-file-hooks, etc.
-  This function ensures that none of these modifications will take place."
+(defun write-region-as-binary (start end filename
+                                    &optional append visit lockname)
+  "Like `write-region', q.v., but don't code conversion."
   (let ((coding-system-for-read 'binary))
-    (insert-file-contents-literally filename visit beg end replace)
+    (write-region start end filename append visit lockname)
     ))
 
+
 ;;; @@ Mule emulating aliases
 ;;;
 ;;; You should not use it.
@@ -71,25 +71,26 @@ This constant is defined to emulate old MULE anything older than MULE
 ;;; @ MIME charset
 ;;;
 
-(defvar mime-charset-coding-system-alist
+(defcustom mime-charset-coding-system-alist
   `,(let ((rest
           '((us-ascii      . iso-8859-1)
             (gb2312        . cn-gb-2312)
             (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))
        )
       dest)
   "Alist MIME CHARSET vs CODING-SYSTEM.
-MIME CHARSET and CODING-SYSTEM must be symbol.")
+MIME CHARSET and CODING-SYSTEM must be symbol."
+  :group 'i18n
+  :type '(repeat (cons symbol coding-system)))
 
 (defsubst mime-charset-to-coding-system (charset &optional lbt)
   "Return coding-system corresponding with CHARSET.
@@ -103,43 +104,57 @@ 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)))
-
-(defsubst encode-mime-charset-region (start end charset)
-  "Encode the text between START and END as MIME CHARSET."
-  (let ((cs (mime-charset-to-coding-system charset)))
-    (if cs
-       (encode-coding-region start end cs)
-      )))
-
-(defsubst decode-mime-charset-region (start end charset)
-  "Decode the text between START and END as MIME CHARSET."
-  (let ((cs (mime-charset-to-coding-system charset)))
-    (if cs
-       (decode-coding-region start end cs)
-      )))
-
-(defsubst encode-mime-charset-string (string charset)
-  "Encode the STRING as MIME CHARSET."
-  (let ((cs (mime-charset-to-coding-system charset)))
-    (if cs
-       (encode-coding-string string cs)
-      string)))
-
-(defsubst decode-mime-charset-string (string charset)
-  "Decode the STRING as MIME CHARSET."
-  (let ((cs (mime-charset-to-coding-system charset)))
-    (if cs
-       (decode-coding-string string cs)
-      string)))
-
-
-(defvar default-mime-charset 'x-ctext
-  "Default value of MIME charset used when MIME charset is not specified.
-It must be symbol.")
+  (if lbt
+      (setq charset (intern (format "%s-%s" charset lbt)))
+    )
+  (if (find-coding-system charset)
+      charset))
+
+(defsubst mime-charset-list ()
+  "Return a list of all existing MIME-charset."
+  (nconc (mapcar (function car) mime-charset-coding-system-alist)
+        (coding-system-list)))
+
+
+(defvar widget-mime-charset-prompt-value-history nil
+  "History of input to `widget-mime-charset-prompt-value'.")
+
+(define-widget 'mime-charset 'coding-system
+  "A mime-charset."
+  :format "%{%t%}: %v"
+  :tag "MIME-charset"
+  :prompt-history 'widget-mime-charset-prompt-value-history
+  :prompt-value 'widget-mime-charset-prompt-value
+  :action 'widget-mime-charset-action)
+
+(defun widget-mime-charset-prompt-value (widget prompt value unbound)
+  ;; Read mime-charset from minibuffer.
+  (intern
+   (completing-read (format "%s (default %s) " prompt value)
+                   (mapcar (function
+                            (lambda (sym)
+                              (list (symbol-name sym))
+                              ))
+                           (mime-charset-list)))))
+
+(defun widget-mime-charset-action (widget &optional event)
+  ;; Read a mime-charset from the minibuffer.
+  (let ((answer
+        (widget-mime-charset-prompt-value
+         widget
+         (widget-apply widget :menu-tag-get)
+         (widget-value widget)
+         t)))
+    (widget-value-set widget answer)
+    (widget-apply widget :notify widget event)
+    (widget-setup)))
+
+(defcustom default-mime-charset 'x-ctext
+  "Default value of MIME-charset.
+It is used when MIME-charset is not specified.
+It must be symbol."
+  :group 'i18n
+  :type 'mime-charset)
 
 (defsubst detect-mime-charset-region (start end)
   "Return MIME charset for region between START and END."