aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2002-11-05 10:43:33 +0000
committerJuanma Barranquero2002-11-05 10:43:33 +0000
commit2fb49346bd370863dc869baad025ef39e0367cec (patch)
tree5dd87556d1dec017000e1730bb403d9156f1ba21
parent2e729bfaa60159556e81ceca36548f9206f2fe26 (diff)
downloademacs-2fb49346bd370863dc869baad025ef39e0367cec.tar.gz
emacs-2fb49346bd370863dc869baad025ef39e0367cec.zip
(coding-system-eol-type-mnemonic): Move to mule.el.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/international/mule-util.el15
2 files changed, 9 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 000c06f9843..1b7f7fe5bda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12002-11-05 Juanma Barranquero <lektu@terra.es>
2
3 * international/mule.el (coding-system-eol-type-mnemonic): Move from
4 mule-util.el.
5
6 * international/mule-util.el (coding-system-eol-type-mnemonic): Move to
7 mule.el.
8
12002-11-04 Juanma Barranquero <lektu@terra.es> 92002-11-04 Juanma Barranquero <lektu@terra.es>
2 10
3 * files.el (find-buffer-visiting): Accept new optional PREDICATE 11 * files.el (find-buffer-visiting): Accept new optional PREDICATE
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 99847c3986e..9ed3d8a3880 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -195,7 +195,7 @@ defaults to \"...\"."
195;; (("こhんeにlちlはo" 13 4 ?x "日本語") . "xex日本語") 195;; (("こhんeにlちlはo" 13 4 ?x "日本語") . "xex日本語")
196;; )) 196;; ))
197;; (let (ret) 197;; (let (ret)
198;; (condition-case e 198;; (condition-case e
199;; (setq ret (apply #'truncate-string-to-width (car test))) 199;; (setq ret (apply #'truncate-string-to-width (car test)))
200;; (error (setq ret e))) 200;; (error (setq ret e)))
201;; (unless (equal ret (cdr test)) 201;; (unless (equal ret (cdr test))
@@ -294,19 +294,6 @@ Optional 3rd argument NIL-FOR-TOO-LONG non-nil means return nil
294;; Coding system related functions. 294;; Coding system related functions.
295 295
296;;;###autoload 296;;;###autoload
297(defun coding-system-eol-type-mnemonic (coding-system)
298 "Return the string indicating end-of-line format of CODING-SYSTEM."
299 (let* ((eol-type (coding-system-eol-type coding-system))
300 (val (cond ((vectorp eol-type) eol-mnemonic-undecided)
301 ((eq eol-type 0) eol-mnemonic-unix)
302 ((eq eol-type 1) eol-mnemonic-dos)
303 ((eq eol-type 2) eol-mnemonic-mac)
304 (t "-"))))
305 (if (stringp val)
306 val
307 (char-to-string val))))
308
309;;;###autoload
310(defun coding-system-post-read-conversion (coding-system) 297(defun coding-system-post-read-conversion (coding-system)
311 "Return the value of CODING-SYSTEM's `post-read-conversion' property." 298 "Return the value of CODING-SYSTEM's `post-read-conversion' property."
312 (coding-system-get coding-system 'post-read-conversion)) 299 (coding-system-get coding-system 'post-read-conversion))