(point-at-bol): New function.

[elisp/apel.git] / emu-20.el

diff --git a/emu-20.el b/emu-20.el
index d02680b..b750e41 100644 (file)
--- a/emu-20.el
+++ b/emu-20.el
@@ -54,8 +54,7 @@
                                     &optional append visit lockname)
   "Like `write-region', q.v., but don't encode."
   (let ((coding-system-for-write 'binary))
-    (write-region start end filename append visit lockname)
-    ))
+    (write-region start end filename append visit lockname)))
 
 (defun insert-file-contents-as-binary (filename
                                       &optional visit beg end replace)
@@ -67,15 +66,8 @@ Namely this function ensures that only format decoding and character
 code conversion will not take place."
   (let ((coding-system-for-read 'binary)
        format-alist)
-    (insert-file-contents filename visit beg end replace)
-    ))
-
-(defun write-region-as-CRLF (start end filename
-                                  &optional append visit lockname)
-  "Like `write-region', q.v., but write as network representation."
-  (let ((coding-system-for-write 'raw-text-dos))
-    (write-region start end filename append visit lockname)
-    ))
+    ;; Returns list of absolute file name and length of data inserted.
+    (insert-file-contents filename visit beg end replace)))
 
 (defun insert-file-contents-as-raw-text (filename
                                         &optional visit beg end replace)
@@ -86,8 +78,14 @@ Like `insert-file-contents-as-binary', but it converts line-break
 code."
   (let ((coding-system-for-read 'raw-text)
        format-alist)
-    (insert-file-contents filename visit beg end replace)
-    ))
+    ;; Returns list of absolute file name and length of data inserted.
+    (insert-file-contents filename visit beg end replace)))
+
+(defun write-region-as-raw-text-CRLF (start end filename
+                                           &optional append visit lockname)
+  "Like `write-region', q.v., but write as network representation."
+  (let ((coding-system-for-write 'raw-text-dos))
+    (write-region start end filename append visit lockname)))
 
 
 ;;; @@ Mule emulating aliases
@@ -109,6 +107,8 @@ This constant is defined to emulate old MULE anything older than MULE
             (gb2312        . cn-gb-2312)
             (iso-2022-jp-2 . iso-2022-7bit-ss2)
             (x-ctext       . ctext)
+            (unknown       . undecided)
+            (x-unknown     . undecided)
             ))
          dest)
       (while rest
@@ -127,8 +127,8 @@ MIME CHARSET and CODING-SYSTEM must be symbol."
 (defsubst mime-charset-to-coding-system (charset &optional lbt)
   "Return coding-system corresponding with CHARSET.
 CHARSET is a symbol whose name is MIME charset.
-If optional argument LBT (`unix', `dos' or `mac') is specified, it is
-used as line break code type of coding-system."
+If optional argument LBT (`CRLF', `LF', `CR', `unix', `dos' or `mac')
+is specified, it is used as line break code type of coding-system."
   (if (stringp charset)
       (setq charset (intern (downcase charset)))
     )
@@ -137,10 +137,15 @@ used as line break code type of coding-system."
        (setq charset (cdr ret))
       ))
   (if lbt
-      (setq charset (intern (format "%s-%s" charset lbt)))
+      (setq charset (intern (format "%s-%s" charset
+                                   (cond ((eq lbt 'CRLF) 'dos)
+                                         ((eq lbt 'LF) 'unix)
+                                         ((eq lbt 'CR) 'mac)
+                                         (t lbt)))))
     )
   (if (find-coding-system charset)
-      charset))
+      charset
+    ))
 
 (defsubst mime-charset-list ()
   "Return a list of all existing MIME-charset."
@@ -165,8 +170,7 @@ used as line break code type of coding-system."
    (completing-read (format "%s (default %s) " prompt value)
                    (mapcar (function
                             (lambda (sym)
-                              (list (symbol-name sym))
-                              ))
+                              (list (symbol-name sym))))
                            (mime-charset-list)))))
 
 (defun widget-mime-charset-action (widget &optional event)
@@ -198,8 +202,7 @@ It must be symbol."
   (let ((coding-system-for-write
         (or (mime-charset-to-coding-system charset)
             'binary)))
-    (write-region start end filename append visit lockname)
-    ))
+    (write-region start end filename append visit lockname)))
 
 
 ;;; @ end