(non-standard-designations-alist)

(ctext-pre-write-conversion): Don't mung Latin-9 &c.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97a1610dcda0c3786393d23b52d080bc4ec193d7..30736305ee4a64499dbec54bcf3f450cc1c2a6b7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-29  Dave Love  <fx@gnu.org>
+
+       * international/mule-conf.el (non-standard-designations-alist) 
+       (ctext-pre-write-conversion): Don't mung Latin-9 &c.
+
 2002-07-29  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
        * scroll-all.el (scroll-all-mode): Make argument optional.  Doc fix.

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 44d955437d33ad045a3cf245a0eb3f446b9982ef..66ed244e6602660d0460533bf2b5c762bd3959d3 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -430,7 +430,7 @@ Like `compound-text', but does not produce escape sequences for compositions."
 charsets or coding systems.")
 
 ;; Functions to support "Non-Standard Character Set Encodings" defined
-;; by the ICCCM spec.  We support that by converting the leading
+;; by the compound text spec.  We support that by converting the leading
 ;; sequence of the ``extended segment'' to the corresponding ISO-2022
 ;; sequences (if the leading sequence names an Emacs charset), or decode
 ;; the segment (if it names a coding system).  Encoding does the reverse.
@@ -505,15 +505,19 @@ charsets or coding systems.")
 (defvar non-standard-designations-alist
   '(("$(0" . (big5 "big5-0" 2))
     ("$(1" . (big5 "big5-0" 2))
-    ("-V"  . (t "iso8859-10" 1))
-    ("-Y"  . (t "iso8859-13" 1))
-    ("-_"  . (t "iso8859-14" 1))
-    ("-b"  . (t "iso8859-15" 1))
-    ("-f"  . (t "iso8859-16" 1)))
-  "Alist of ctext control sequences that introduce character sets which
-are not in the list of approved ICCCM encodings, and the corresponding
-coding system, identifier string, and number of octets per encoded
-character.
+    ;; The following are actually standard; generating extended
+    ;; segments for them is wrong and screws e.g. Latin-9 users
+    ;; pasting into a terminal window.  8859-{10,13,16} aren't Emacs
+    ;; charsets anyhow.  Presumably extended segments should be
+    ;; generated for all the really non-standard Emacs charsets...
+    ;; -- fx
+;;     ("-V"  . (t "iso8859-10" 1))
+;;     ("-Y"  . (t "iso8859-13" 1))
+;;     ("-_"  . (t "iso8859-14" 1))
+;;     ("-b"  . (t "iso8859-15" 1))
+;;     ("-f"  . (t "iso8859-16" 1))
+    )
+  "Alist of ctext control sequences for extended segments.
 
 Each element has the form (CTLSEQ . (ENCODING CHARSET NOCTETS)).  CTLSEQ
 is the control sequence (sans the leading ESC) that introduces the character
@@ -521,7 +525,7 @@ set in the text encoded by compound-text.  ENCODING is a coding system
 symbol; if it is t, it means that the ctext coding system already encodes
 the text correctly, and only the leading control sequence needs to be altered.
 If ENCODING is a coding system, we need to re-encode the text with that
-coding system.  CHARSET is the ICCCM name of the charset we need to put into
+coding system.  CHARSET is the name of the charset we need to put into
 the leading control sequence.  NOCTETS is the number of octets (bytes) that
 encode each character in this charset.  NOCTETS can be 0 (meaning the number
 of octets per character is variable), 1, 2, 3, or 4.")
@@ -554,7 +558,8 @@ text, and convert it in the temporary buffer.  Otherwise, convert in-place."
          (case-fold-search nil)
          pt desig encode-info encoding chset noctets textlen)
       (set-buffer-multibyte nil)
-      (while (re-search-forward "\e\\(\$([01]\\|-[VY_bf]\\)" nil 'move)
+      (while ;;  (re-search-forward "\e\\(\$([01]\\|-[VY_bf]\\)" nil 'move)
+         (re-search-forward "\e\\(\$([01]\\)" nil 'move)
        (setq desig (match-string 1)
              pt (point-marker)
              encode-info (cdr (assoc desig non-standard-designations-alist))
@@ -591,7 +596,7 @@ text, and convert it in the temporary buffer.  Otherwise, convert in-place."
 
 (make-coding-system
  'compound-text-with-extensions 5 ?x
- "Compound text encoding with ICCCM Extended Segment extensions.
+ "Compound text encoding with extended segments.
 
 This coding system should be used only for X selections.  It is inappropriate
 for decoding and encoding files, process I/O, etc."