(detect-mime-charset-region): Don't call

[elisp/apel.git] / poem-nemacs.el

diff --git a/poem-nemacs.el b/poem-nemacs.el
index ad4b55e..2741b9f 100644 (file)
--- a/poem-nemacs.el
+++ b/poem-nemacs.el
@@ -200,7 +200,7 @@
 \[emu-nemacs.el]"
   (as-binary-input-file
    ;; Returns list absolute file name and length of data inserted.
-   (insert-file-contents filename visit beg end replace)))
+   (insert-file-contents filename visit)))
 
 (defun insert-file-contents-as-raw-text (filename
                                         &optional visit beg end replace)
@@ -208,7 +208,7 @@
 \[emu-nemacs.el]"
   (as-binary-input-file
    ;; Returns list absolute file name and length of data inserted.
-   (insert-file-contents filename visit beg end replace)))
+   (insert-file-contents filename visit)))
 
 (defun write-region-as-raw-text-CRLF (start end filename
                                            &optional append visit lockname)
@@ -222,6 +222,15 @@
       (write-region-as-binary (point-min)(point-max)
                              filename append visit))))
 
+(defun find-file-noselect-as-binary (filename &optional nowarn rawfile)
+  "Like `find-file-noselect', q.v., but don't code conversion."
+  (as-binary-input-file (find-file-noselect filename nowarn rawfile)))
+
+(defun find-file-noselect-as-raw-text (filename &optional nowarn rawfile)
+  "Like `find-file-noselect', q.v., but it does not code conversion
+except for line-break code."
+  (as-binary-input-file (find-file-noselect filename nowarn rawfile)))
+
 (defun open-network-stream-as-binary (name buffer host service)
   "Like `open-network-stream', q.v., but don't code conversion."
   (let ((process (open-network-stream name buffer host service)))
@@ -232,24 +241,29 @@
 ;;; @ with code-conversion
 ;;;
 
-(defun insert-file-contents-as-specified-coding-system (filename &rest args)
-  "Like `insert-file-contents', q.v., but code convert by the specified
-coding-system. ARGS the optional arguments are passed to
-`insert-file-contents' except for the last element. The last element of
-ARGS must be a coding-system."
-  (let ((kanji-fileio-code (car (reverse args)))
+(defun insert-file-contents-as-coding-system
+  (coding-system filename &optional visit beg end replace)
+  "Like `insert-file-contents', q.v., but CODING-SYSTEM the first arg will
+be applied to `kanji-fileio-code'."
+  (let ((kanji-fileio-code coding-system)
        kanji-expected-code)
-    (apply' insert-file-contents filename (nreverse (cdr (nreverse args))))))
-
-(defun write-region-as-specified-coding-system (start end filename
-                                                     &rest args)
-  "Like `write-region', q.v., but code convert by the specified coding-system.
-ARGS the optional arguments are passed to `write-region' except for the last
-element. The last element of ARGS must be a coding-system."
-  (let ((kanji-fileio-code (car (reverse args)))
+    (insert-file-contents filename visit)))
+
+(defun write-region-as-coding-system
+  (coding-system start end filename &optional append visit lockname)
+  "Like `write-region', q.v., but CODING-SYSTEM the first arg will be
+applied to `kanji-fileio-code'."
+  (let ((kanji-fileio-code coding-system)
        jka-compr-compression-info-list jam-zcat-filename-list)
-    (apply 'write-region start end filename
-          (nreverse (cdr (nreverse args))))))
+    (write-region start end filename append visit)))
+
+(defun find-file-noselect-as-coding-system
+  (coding-system filename &optional nowarn rawfile)
+  "Like `find-file-noselect', q.v., but CODING-SYSTEM the first arg will
+be applied to `kanji-fileio-code'."
+  (let ((kanji-fileio-code coding-system)
+       kanji-expected-code)
+    (find-file-noselect filename nowarn)))
 
 
 ;;; @ buffer representation