* mcs-e20.el (x-ctext): Use the definition in Emacs 20.4.

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

diff --git a/poem-nemacs.el b/poem-nemacs.el
index 9170a8e..6b24d3f 100644 (file)
--- a/poem-nemacs.el
+++ b/poem-nemacs.el
@@ -181,7 +181,7 @@
        (,@ body))))
 
 (defmacro as-binary-input-file (&rest body)
-  (` (let (kanji-flag)
+  (` (let (kanji-flag default-kanji-flag)
        (,@ body))))
 
 (defmacro as-binary-output-file (&rest body)
@@ -205,10 +205,19 @@
 (defun insert-file-contents-as-raw-text (filename
                                         &optional visit beg end replace)
   "Like `insert-file-contents', q.v., but don't character code conversion.
-\[emu-nemacs.el]"
-  (as-binary-input-file
-   ;; Returns list absolute file name and length of data inserted.
-   (insert-file-contents filename visit)))
+It converts line-break code from CRLF to LF. [emu-nemacs.el]"
+  (save-restriction
+    (narrow-to-region (point) (point))
+    (let ((return (as-binary-input-file
+                  (insert-file-contents filename visit))))
+      (while (search-forward "\r\n" nil t)
+       (replace-match "\n"))
+      (goto-char (point-min))
+      ;; Returns list absolute file name and length of data inserted.
+      (list (car return) (- (point-max) (point-min))))))
+
+(defalias 'insert-file-contents-as-raw-text-CRLF
+  'insert-file-contents-as-raw-text)
 
 (defun write-region-as-raw-text-CRLF (start end filename
                                            &optional append visit lockname)
@@ -223,27 +232,62 @@
                              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)))
+  "Like `find-file-noselect', q.v., but don't code conversion.
+\[emu-nemacs.el]"
+  (as-binary-input-file (find-file-noselect filename nowarn)))
 
 (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)))
+except for line-break code. [emu-nemacs.el]"
+  (let ((buf (get-file-buffer filename))
+       cur)
+    (if buf
+       (prog1
+           buf
+         (or nowarn
+             (verify-visited-file-modtime buf)
+             (cond ((not (file-exists-p filename))
+                    (error "File %s no longer exists!" filename))
+                   ((yes-or-no-p
+                     (if (buffer-modified-p buf)
+    "File has changed since last visited or saved.  Flush your changes? "
+  "File has changed since last visited or saved.  Read from disk? "))
+                    (setq cur (current-buffer))
+                    (set-buffer buf)
+                    (revert-buffer t t)
+                    (save-excursion
+                      (goto-char (point-min))
+                      (while (search-forward "\r\n" nil t)
+                        (replace-match "\n")))
+                    (set-buffer-modified-p nil)
+                    (set-buffer cur)))))
+      (save-excursion
+       (prog1
+           (set-buffer
+            (find-file-noselect-as-binary filename nowarn rawfile))
+         (while (search-forward "\r\n" nil t)
+           (replace-match "\n"))
+         (goto-char (point-min))
+         (set-buffer-modified-p nil))))))
+
+(defalias 'find-file-noselect-as-raw-text-CRLF
+  'find-file-noselect-as-raw-text)
 
 (defun open-network-stream-as-binary (name buffer host service)
-  "Like `open-network-stream', q.v., but don't code conversion."
+  "Like `open-network-stream', q.v., but don't code conversion.
+\[emu-nemacs.el]"
   (let ((process (open-network-stream name buffer host service)))
     (set-process-kanji-code process 0)
     process))
 
 (defun save-buffer-as-binary (&optional args)
-  "Like `save-buffer', q.v., but don't encode."
+  "Like `save-buffer', q.v., but don't encode. [emu-nemacs.el]"
   (as-binary-output-file
    (save-buffer args)))
 
 (defun save-buffer-as-raw-text-CRLF (&optional args)
-  "Like `save-buffer', q.v., but save as network representation."
+  "Like `save-buffer', q.v., but save as network representation.
+\[emu-nemacs.el]"
   (if (buffer-modified-p)
       (save-restriction
        (widen)
@@ -268,7 +312,7 @@ except for line-break code."
 (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'."
+be applied to `kanji-fileio-code'. [emu-nemacs.el]"
   (let ((kanji-fileio-code coding-system)
        kanji-expected-code)
     (insert-file-contents filename visit)))
@@ -276,7 +320,7 @@ be applied to `kanji-fileio-code'."
 (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'."
+applied to `kanji-fileio-code'. [emu-nemacs.el]"
   (let ((kanji-fileio-code coding-system)
        jka-compr-compression-info-list jam-zcat-filename-list)
     (write-region start end filename append visit)))
@@ -284,14 +328,14 @@ applied to `kanji-fileio-code'."
 (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)
+be applied to `kanji-fileio-code'. [emu-nemacs.el]"
+  (let ((default-kanji-fileio-code coding-system)
+       kanji-fileio-code kanji-expected-code)
     (find-file-noselect filename nowarn)))
 
 (defun save-buffer-as-coding-system (coding-system &optional args)
   "Like `save-buffer', q.v., but CODING-SYSTEM the first arg will be
-applied to `kanji-fileio-code'."
+applied to `kanji-fileio-code'. [emu-nemacs.el]"
   (let ((kanji-fileio-code coding-system))
     (save-buffer args)))
 
@@ -337,7 +381,8 @@ but the contents viewed as characters do change.
 (defalias 'char-length 'char-bytes)
 
 (defmacro char-next-index (char index)
-  "Return index of character succeeding CHAR whose index is INDEX."
+  "Return index of character succeeding CHAR whose index is INDEX.
+\[emu-nemacs.el]"
   (` (+ (, index) (char-bytes (, char)))))