From cb5be6c9e6be7fbc7d36438077ac55888a61138d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 26 Feb 2002 15:58:43 +0000 Subject: [PATCH] (compound-text): Renamed back from compound-text-no-extensions. (ctext-no-compositions): Remove the mime-charset property. (compound-text-with-extensions): Renamed from compound-text. (x-ctext-with-extensions, ctext-with-extensions): Renamed aliases. --- lisp/ChangeLog | 8 ++++++++ lisp/international/mule-conf.el | 30 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4b456f42ee0..3c59b6fd1b9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2002-02-26 Eli Zaretskii + + * international/mule-conf.el (compound-text): Renamed back from + compound-text-no-extensions. + (ctext-no-compositions): Remove the mime-charset property. + (compound-text-with-extensions): Renamed from compound-text. + (x-ctext-with-extensions, ctext-with-extensions): Renamed aliases. + 2002-02-26 Juanma Barranquero * faces.el (list-faces-display): Fix typo. diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index fb615b6bdb9..fe3d6a2e494 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -410,7 +410,7 @@ is treated as a character." (composition . t))) (make-coding-system - 'compound-text-no-extensions 2 ?x + 'compound-text 2 ?x "Compound text based generic encoding for decoding unknown messages. This coding system does not support ICCCM Extended Segments." @@ -421,28 +421,26 @@ This coding system does not support ICCCM Extended Segments." (mime-charset . x-ctext) (composition . t))) -(define-coding-system-alias - 'x-ctext-no-extensions 'compound-text-no-extensions) -(define-coding-system-alias - 'ctext-no-extensions 'compound-text-no-extensions) +(define-coding-system-alias 'x-ctext 'compound-text) +(define-coding-system-alias 'ctext 'compound-text) -;; Same as compound-text-no-extensions, but doesn't produce composition -;; escape sequences. Used in post-read and pre-write conversions of -;; compound-text, see mule.el. +;; Same as compound-text, but doesn't produce composition escape +;; sequences. Used in post-read and pre-write conversions of +;; compound-text-with-extensions, see mule.el. Note that this should +;; not have a mime-charset property, to prevent it from showing up +;; close to the beginning of coding systems ordered by priority. (make-coding-system 'ctext-no-compositions 2 ?x "Compound text based generic encoding for decoding unknown messages. -Like `compound-text-no-extensions', but does not produce escape sequences -for compositions." +Like `compound-text', but does not produce escape sequences for compositions." '((ascii t) (latin-iso8859-1 katakana-jisx0201 t) t t nil ascii-eol ascii-cntl nil locking-shift single-shift nil nil nil init-bol nil nil) - '((safe-charsets . t) - (mime-charset . x-ctext))) + '((safe-charsets . t))) (make-coding-system - 'compound-text 5 ?x + 'compound-text-with-extensions 5 ?x "Compound text encoding with ICCCM Extended Segment extensions. This coding system should be used only for X selections. It is inappropriate @@ -451,8 +449,10 @@ for decoding and encoding files, process I/O, etc." '((post-read-conversion . ctext-post-read-conversion) (pre-write-conversion . ctext-pre-write-conversion))) -(define-coding-system-alias 'x-ctext 'compound-text) -(define-coding-system-alias 'ctext 'compound-text) +(define-coding-system-alias + 'x-ctext-with-extensions 'compound-text-with-extensions) +(define-coding-system-alias + 'ctext-with-extensions 'compound-text-with-extensions) (make-coding-system 'iso-safe 2 ?- -- 2.39.2