Move `insert-file-contents-as-binary' and

`insert-file-contents-as-raw-text' from emu-e20.el to emu-e20_2.el.

diff --git a/emu-e20.el b/emu-e20.el
index f08522a..9c524d2 100644 (file)
--- a/emu-e20.el
+++ b/emu-e20.el
@@ -43,12 +43,6 @@
          (t 0)
          )))
 
-(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
-  )
-
 
 ;;; @ character set
 ;;;
@@ -78,45 +72,6 @@ in the region between START and END."
 (defalias 'set-process-input-coding-system 'set-process-coding-system)
 
 
-;;; @ binary access
-;;;
-
-(defun insert-file-contents-as-binary (filename
-                                      &optional visit beg end replace)
-  "Like `insert-file-contents', q.v., but don't code and format conversion.
-Like `insert-file-contents-literary', but it allows find-file-hooks,
-automatic uncompression, etc.
-
-Namely this function ensures that only format decoding and character
-code conversion will not take place."
-  (let ((flag enable-multibyte-characters)
-       (coding-system-for-read 'binary)
-       format-alist)
-    (insert-file-contents filename visit beg end replace)
-    (set-buffer-multibyte flag)
-    ))
-
-(defalias 'insert-binary-file-contents 'insert-file-contents-as-binary)
-(make-obsolete 'insert-binary-file-contents 'insert-file-contents-as-binary)
-
-(defun insert-file-contents-as-raw-text (filename
-                                        &optional visit beg end replace)
-  "Like `insert-file-contents', q.v., but don't code and format conversion.
-Like `insert-file-contents-literary', but it allows find-file-hooks,
-automatic uncompression, etc.
-Like `insert-file-contents-as-binary', but it converts line-break
-code."
-  (let ((flag enable-multibyte-characters)
-       (coding-system-for-read 'raw-text)
-       format-alist)
-    (insert-file-contents filename visit beg end replace)
-    (set-buffer-multibyte flag)
-    ))
-
-(defalias 'insert-binary-file-contents-literally
-  'insert-file-contents-literally)
-
-
 ;;; @ MIME charset
 ;;;
 
@@ -213,6 +168,19 @@ TABLE defaults to the current buffer's category table."
 
 (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

diff --git a/emu-e20_2.el b/emu-e20_2.el
index 023b2f4..c98a0d6 100644 (file)
--- a/emu-e20_2.el
+++ b/emu-e20_2.el
@@ -86,6 +86,39 @@ but the contents viewed as characters do change.
 (make-obsolete 'string-columns 'string-width)
 
 
+;;; @ without code-conversion
+;;;
+
+(defun insert-file-contents-as-binary (filename
+                                      &optional visit beg end replace)
+  "Like `insert-file-contents', q.v., but don't code and format conversion.
+Like `insert-file-contents-literary', but it allows find-file-hooks,
+automatic uncompression, etc.
+
+Namely this function ensures that only format decoding and character
+code conversion will not take place."
+  (let ((flag enable-multibyte-characters)
+       (coding-system-for-read 'binary)
+       format-alist)
+    (insert-file-contents filename visit beg end replace)
+    (set-buffer-multibyte flag)
+    ))
+
+(defun insert-file-contents-as-raw-text (filename
+                                        &optional visit beg end replace)
+  "Like `insert-file-contents', q.v., but don't code and format conversion.
+Like `insert-file-contents-literary', but it allows find-file-hooks,
+automatic uncompression, etc.
+Like `insert-file-contents-as-binary', but it converts line-break
+code."
+  (let ((flag enable-multibyte-characters)
+       (coding-system-for-read 'raw-text)
+       format-alist)
+    (insert-file-contents filename visit beg end replace)
+    (set-buffer-multibyte flag)
+    ))
+
+
 ;;; @ end
 ;;;