X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pces-om.el;h=7b8f99c2b5a3536980989d54a29fd10deaf81343;hb=6362a76695a230cf04f5da6109a24044949df6da;hp=fdbb6489dd2726cd67bf8621074aa2c1f288564a;hpb=d17b1ee5e40d59bef5cdea1ed96352d32c508203;p=elisp%2Fapel.git diff --git a/pces-om.el b/pces-om.el index fdbb648..7b8f99c 100644 --- a/pces-om.el +++ b/pces-om.el @@ -160,12 +160,23 @@ ;;; @ with code-conversion ;;; -(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 +(cond + ((and (>= emacs-major-version 19) (>= emacs-minor-version 23)) + ;; Mule 2.0 or later. + (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 `file-coding-system-for-read'." + (let ((file-coding-system-for-read coding-system)) + (insert-file-contents filename visit beg end replace)))) + (t + ;; Mule 1.1 or earlier. + (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 `file-coding-system-for-read'." - (let ((file-coding-system-for-read coding-system)) - (insert-file-contents filename visit beg end replace))) + (let ((file-coding-system-for-read coding-system)) + (insert-file-contents filename visit))))) (cond ((and (>= emacs-major-version 19) (>= emacs-minor-version 29)) @@ -237,17 +248,33 @@ applied to `coding-system-for-write'." (defalias 'set-process-input-coding-system 'set-process-coding-system) -(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. +(cond + ((and (>= emacs-major-version 19) (>= emacs-minor-version 23)) + ;; Mule 2.0 or later. + (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." + (as-binary-input-file + ;; Returns list absolute file name and length of data inserted. + (insert-file-contents filename visit beg end replace)))) + (t + ;; Mule 1.1 or earlier. + (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." - (as-binary-input-file - ;; Returns list absolute file name and length of data inserted. - (insert-file-contents filename visit beg end replace))) + (as-binary-input-file + ;; Returns list absolute file name and length of data inserted. + (insert-file-contents filename visit))))) (defun insert-file-contents-as-raw-text (filename &optional visit beg end replace) @@ -307,6 +334,7 @@ conversion except for line-break code." ;;; @ end ;;; -(provide 'pces-om) +(require 'product) +(product-provide (provide 'pces-om) (require 'apel-ver)) ;;; pces-om.el ends here