tm 7.87.

diff --git a/ChangeLog b/ChangeLog
index 80876ba..e495fb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Mon Sep 23 17:44:23 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.61.7 was released.
+
+       * emu.el (insert-binary-file-contents-literally): New function.
+
+       * emu.el (insert-file-contents-literally): New implementation.
+
+Mon Sep 23 14:58:21 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * emu-mule.el (detect-coding-region): New alias.
+
+Mon Sep 23 14:55:53 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * emu-e19.el, emu-nemacs.el (detect-coding-region): Renamed from
+       `code-detect-region'.
+
+\f
 Mon Sep 23 12:36:01 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.61.6 was released.

diff --git a/emu-e19.el b/emu-e19.el
index c861349..f9bd6a1 100644 (file)
--- a/emu-e19.el
+++ b/emu-e19.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu-e19.el,v 7.37 1996/09/18 13:50:09 morioka Exp $
+;; Version: $Id: emu-e19.el,v 7.38 1996/09/23 14:55:53 morioka Exp $
 ;; Keywords: emulation, compatibility, mule, Latin-1
 
 ;; This file is part of tl (Tiny Library).
@@ -19,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
@@ -117,9 +117,9 @@
 \[emu-e19.el; Emacs 20 emulating function]"
   0)
 
-(defun code-detect-region (beg end)
-  "Detect coding-system of the text in the region
-between START and END. [emu-e19.el; Mule emulating function]"
+(defun detect-coding-region (start end)
+  "Detect coding-system of the text in the region between START and END.
+\[emu-e19.el; Emacs 20 emulating function]"
   )
 
 (defun set-file-coding-system (coding-system &optional force)

diff --git a/emu-e20.el b/emu-e20.el
index deb733d..f2b72fa 100644 (file)
--- a/emu-e20.el
+++ b/emu-e20.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu-e20.el,v 2.6 1996/09/21 20:52:12 morioka Exp $
+;; Version: $Id: emu-e20.el,v 3.1 1996/09/23 17:44:23 morioka Exp $
 ;; Keywords: emulation, compatibility, MULE
 
 ;; This file is part of tl (Tiny Library).
@@ -19,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with This program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:

diff --git a/emu-mule.el b/emu-mule.el
index a0b8470..c2e5a69 100644 (file)
--- a/emu-mule.el
+++ b/emu-mule.el
@@ -1,10 +1,9 @@
-;;; emu-mule.el --- Mule 2.* emulation module for Mule
+;;; emu-mule.el --- emu module for Mule 1.* and Mule 2.*
 
 ;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version:
-;;     $Id: emu-mule.el,v 7.52 1996/09/18 08:32:56 morioka Exp $
+;; Version: $Id: emu-mule.el,v 7.55 1996/09/23 17:43:43 morioka Exp $
 ;; Keywords: emulation, compatibility, Mule
 
 ;; This file is part of tl (Tiny Library).
@@ -20,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with This program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
@@ -92,6 +91,8 @@
     (concat ret (substring str len))
     ))
 
+(defalias 'detect-coding-region 'code-detect-region)
+
 (defmacro as-binary-process (&rest body)
   (` (let (selective-display   ; Disable ^M to nl translation.
           ;; Mule

diff --git a/emu-nemacs.el b/emu-nemacs.el
index eb306b5..5903de1 100644 (file)
--- a/emu-nemacs.el
+++ b/emu-nemacs.el
@@ -3,8 +3,7 @@
 ;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version:
-;;     $Id: emu-nemacs.el,v 7.44 1996/09/18 13:40:26 morioka Exp $
+;; Version: $Id: emu-nemacs.el,v 7.47 1996/09/23 17:43:04 morioka Exp $
 ;; Keywords: emulation, compatibility, NEmacs, mule
 
 ;; This file is part of tl (Tiny Library).
@@ -20,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
@@ -144,9 +143,9 @@
          (convert-region-kanji-code start end 3 coding-system)
          ))))
 
-(defun code-detect-region (start end)
+(defun detect-coding-region (start end)
   "Detect coding-system of the text in the region between START and END.
-\[emu-nemacs.el; Mule emulating function]"
+\[emu-nemacs.el; Emacs 20 emulating function]"
   (if (save-excursion
        (save-restriction
          (narrow-to-region start end)
@@ -174,6 +173,7 @@
        (,@ body)
        )))
 
+
 ;;; @@ for old MULE emulation
 ;;;
 

diff --git a/emu.el b/emu.el
index 03af4f3..3a7d971 100644 (file)
--- a/emu.el
+++ b/emu.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu.el,v 7.32 1996/09/21 16:08:35 morioka Exp $
+;; Version: $Id: emu.el,v 7.34 1996/09/23 17:42:26 morioka Exp $
 ;; Keywords: emulation, compatibility, NEmacs, MULE, XEmacs
 
 ;; This file is part of tl (Tiny Library).
@@ -77,6 +77,22 @@
        ))
 
 
+;;; @ binary access
+;;;
+
+(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.
+\[emu.el]"
+  (as-binary-input-file
+   (insert-file-contents-literally filename visit beg end replace)
+   ))
+
+
 ;;; @ MIME charset
 ;;;
 
@@ -155,9 +171,24 @@ into a hook function that will be run only after loading the package.
 ;;; @ EMACS 19.30 emulation
 ;;;
 
-(or (fboundp 'insert-file-contents-literally)
-    (defalias 'insert-file-contents-literally 'insert-file-contents)
-    )
+(cond ((fboundp 'insert-file-contents-literally)
+       )
+      ((boundp 'file-name-handler-alist)
+       (defun insert-file-contents-literally
+        (filename &optional visit beg end replace)
+        "Like `insert-file-contents', q.v., but only reads in the file.
+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.
+\[emu.el; Emacs 19.30 emulating function]"
+        (let (file-name-handler-alist)
+          (insert-file-contents filename visit beg end replace)
+          ))
+       )
+      (t
+       (defalias 'insert-file-contents-literally 'insert-file-contents)
+       ))
 
 
 ;;; @ EMACS 19.31 emulation