From 426591c3ff90afc4f47808b3643a7936a3f94e72 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 16 May 1997 00:59:00 +0000 Subject: [PATCH] Coding system names changed as follows: internal -> emacs-mule, automatic-conversion -> undecided. Coding category name changes as follows: coding-category-internal -> coding-category-emacs-mule. --- lisp/gnus/gnus-mule.el | 2 +- lisp/international/mule-conf.el | 36 ++++++++++++++++----------------- lisp/mail/rmail.el | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lisp/gnus/gnus-mule.el b/lisp/gnus/gnus-mule.el index aef9e81ca7a..8ee6ae99895 100644 --- a/lisp/gnus/gnus-mule.el +++ b/lisp/gnus/gnus-mule.el @@ -208,7 +208,7 @@ coding-system for reading and writing respectively." (add-hook 'message-send-mail-hook 'gnus-mule-message-send-mail-function)) -(gnus-mule-add-group "" 'automatic-conversion) +(gnus-mule-add-group "" 'undecided) (gnus-mule-add-group "fj" 'iso-2022-7) (gnus-mule-add-group "alt.chinese.text" 'hz-gb-2312) (gnus-mule-add-group "alt.hk" 'hz-gb-2312) diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index b4f904953bd..5df38af0a8b 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -214,23 +214,23 @@ (vector nil ?= "Do no conversion" nil nil)) (put 'no-conversion 'eol-type 0) -(put 'automatic-conversion-unix 'coding-system 'automatic-conversion) -(put 'automatic-conversion-unix 'eol-type 0) -(put 'automatic-conversion-dos 'coding-system 'automatic-conversion) -(put 'automatic-conversion-dos 'eol-type 1) -(put 'automatic-conversion-mac 'coding-system 'automatic-conversion) -(put 'automatic-conversion-mac 'eol-type 2) -(put 'automatic-conversion 'coding-system +(put 'undecided-unix 'coding-system 'undecided) +(put 'undecided-unix 'eol-type 0) +(put 'undecided-dos 'coding-system 'undecided) +(put 'undecided-dos 'eol-type 1) +(put 'undecided-mac 'coding-system 'undecided) +(put 'undecided-mac 'eol-type 2) +(put 'undecided 'coding-system (vector t ?+ "Detect coding-system automatically" nil nil)) -(put 'automatic-conversion 'eol-type - (vector 'automatic-conversion-unix - 'automatic-conversion-dos - 'automatic-conversion-mac)) +(put 'undecided 'eol-type + (vector 'undecided-unix + 'undecided-dos + 'undecided-mac)) ;; Coding systems not specific to each language environment. (make-coding-system - 'internal 0 ?= + 'emacs-mule 0 ?= "Internal coding system used in a buffer.") (make-coding-system @@ -277,15 +277,15 @@ ;; The other coding-systems are defined in each language specific ;; section of languages.el. -;; Setting coding system 'automatic-conversion for reading any files. -;; Though, compiled Emacs Lisp files (*.elc) should never be decoded -;; nor encoded. +;; Setting coding system 'undecided for reading any files. Though, +;; compiled Emacs Lisp files (*.elc) should never be decoded nor +;; encoded. (setq coding-system-alist '((insert-file-contents ("\\.elc$" . (no-conversion . nil)) ("loaddefs.el$" . (no-conversion . nil)) - ("" . (automatic-conversion . nil))) + ("" . (undecided . nil))) (write-region ("\\.elc$" . (nil . no-conversion)) ("loaddefs.el$" . (nil . no-conversion))))) @@ -298,7 +298,7 @@ ;; values are set by the command `setup-language-environment' for each ;; language environment. -(setq coding-category-internal 'internal +(setq coding-category-emacs-mule 'emacs-mule coding-category-sjis 'sjis coding-category-iso-7 'iso-2022-7 coding-category-iso-8-1 'iso-8859-1 @@ -315,6 +315,6 @@ coding-category-sjis coding-category-big5 coding-category-binary - coding-category-internal)) + coding-category-emacs-mule)) ;;; mule-conf.el ends here diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 6f8353d859e..477502dce0f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1403,7 +1403,7 @@ Optional DEFAULT is password to start with." (replace-match "\n^_")))); 2 chars: "^" and "_" (or rmail-enable-mime (not rmail-enable-decoding-message) - (decode-coding-region start (point) 'automatic-conversion)) + (decode-coding-region start (point) 'undecided)) (narrow-to-region (point) (point-max)) (setq count (1+ count))) ;;*** Mail format @@ -1466,7 +1466,7 @@ Optional DEFAULT is password to start with." (insert ?\^_) (or rmail-enable-mime (not rmail-enable-decoding-message) - (decode-coding-region start (point) 'automatic-conversion)) + (decode-coding-region start (point) 'undecided)) (narrow-to-region (point) (point-max))) ;; ;; This kludge is because some versions of sendmail.el -- 2.39.2