Mercurial > hg > xemacs-beta

changeset 4490:67fbcaf3dbdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error-sequence -> invalid-sequence 2008-08-08 Aidan Kehoe <kehoea@parhasard.net> * unicode.el: * mule/mule-cmds.el: * mule/latin.el: * mule/cyrillic.el: Rework the various identifiers using error-sequence to use invalid-sequence instead.
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 08 Aug 2008 21:17:08 +0200
parents b75b075a9041
children 121aadac896e
files lisp/ChangeLog lisp/mule/cyrillic.el lisp/mule/greek.el lisp/mule/latin.el lisp/mule/mule-cmds.el lisp/unicode.el
diffstat 6 files changed, 33 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/ChangeLog	Fri Aug 08 21:17:08 2008 +0200
@@ -1,3 +1,12 @@
+2008-08-08  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* unicode.el: 
+	* mule/mule-cmds.el: 
+	* mule/latin.el: 
+	* mule/cyrillic.el: 
+	Rework the various identifiers using error-sequence to use
+	invalid-sequence instead.
+
 2008-08-05  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* specifier.el (current-display-table): Initialise this here, not
--- a/lisp/mule/cyrillic.el	Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/mule/cyrillic.el	Fri Aug 08 21:17:08 2008 +0200
@@ -370,7 +370,7 @@
 	     (coding-system koi8-r)
 	     (native-coding-system koi8-r)
 	     (coding-priority koi8-r)
-	     (error-sequence-coding-system koi8-r)
+	     (invalid-sequence-coding-system koi8-r)
 	     (input-method . "cyrillic-yawerty")
 	     (features cyril-util)
 	     (locale "ru")
@@ -544,7 +544,7 @@
  "Ukrainian" '((coding-system koi8-u)
                (coding-priority koi8-u)
                (locale "uk")
-               (error-sequence-coding-system koi8-u)
+               (invalid-sequence-coding-system koi8-u)
                (input-method . "cyrillic-ukrainian")
                (documentation
                 . "Support for Ukrainian."))
@@ -691,7 +691,7 @@
 (set-language-info-alist
  "Bulgarian" '((coding-system windows-1251)
                (coding-priority windows-1251)
-	       (error-sequence-coding-system windows-1251)
+	       (invalid-sequence-coding-system windows-1251)
                (input-method . "bulgarian-bds")
                (locale "bg")
                (documentation
@@ -702,7 +702,7 @@
 (set-language-info-alist
  "Belarusian" '((coding-system windows-1251)
                 (coding-priority windows-1251)
-		(error-sequence-coding-system windows-1251)
+		(invalid-sequence-coding-system windows-1251)
                 (locale "be")
                 (input-method . "belarusian")
                 (documentation
@@ -849,7 +849,7 @@
  "Cyrillic-ALT" '((charset cyrillic-iso8859-5)
                   (coding-system alternativnyj)
                   (native-coding-system alternativnyj)
-		  (error-sequence-coding-system alternativnyj)
+		  (invalid-sequence-coding-system alternativnyj)
                   (coding-priority alternativnyj)
                   (input-method . "cyrillic-yawerty")
                   (features cyril-util)
--- a/lisp/mule/greek.el	Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/mule/greek.el	Fri Aug 08 21:17:08 2008 +0200
@@ -328,7 +328,7 @@
 	   (coding-system iso-8859-7)
 	   (coding-priority iso-8859-7)
 	   (native-coding-system iso-8859-7)
-	   (error-sequence-coding-system iso-8859-7)
+	   (invalid-sequence-coding-system iso-8859-7)
 	   (locale "el")
 	   (input-method . "greek")
 	   (sample-text . "Greek (,FGkk]mija(B)	,FCei\(B ,Fsar(B")
--- a/lisp/mule/latin.el	Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/mule/latin.el	Fri Aug 08 21:17:08 2008 +0200
@@ -957,7 +957,7 @@
   for ((charset codesys default-input nice-charset-1 nice-charset-2
                 ;; supported-langs is a list if the doc string is replaced
                 ;; entirely
-                supported-langs error-sequence-coding-system) 
+                supported-langs invalid-sequence-coding-system) 
        langenvs) in
   '(((latin-iso8859-1 iso-8859-1 "latin-1-prefix" "Latin-1" "ISO-8859-1"
 " Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic,
@@ -1025,8 +1025,8 @@
      (coding-system ,codesys)
      (coding-priority ,codesys)
      (native-coding-system ,codesys)
-     (error-sequence-coding-system ,(or error-sequence-coding-system
-                                        codesys))
+     (invalid-sequence-coding-system ,(or invalid-sequence-coding-system
+                                          codesys))
      (documentation . ,(if (listp supported-langs) (car supported-langs)
 			 (format "\
 Generic language environment for %s (%s)." nice-charset-1 nice-charset-2))))
--- a/lisp/mule/mule-cmds.el	Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/mule/mule-cmds.el	Fri Aug 08 21:17:08 2008 +0200
@@ -227,7 +227,7 @@
                      locale is assumed to have the same name as the
                      language environment.
 
-  error-sequence-coding-system
+  invalid-sequence-coding-system
                      VALUE is a fixed-width 8-bit coding system used to
                      display Unicode error sequences (using a face to make
                      it clear that the data is invalid).  In Western Europe
@@ -768,20 +768,21 @@
     (if (functionp func)
 	(funcall func)))
 
-  (let ((error-sequence-coding-system
-         (get-language-info language-name 'error-sequence-coding-system))
+  (let ((invalid-sequence-coding-system
+         (get-language-info language-name 'invalid-sequence-coding-system))
         (disp-table (specifier-instance current-display-table))
         glyph)
-    (when (consp error-sequence-coding-system)
-      (setq error-sequence-coding-system (car error-sequence-coding-system)))
+    (when (consp invalid-sequence-coding-system)
+      (setq invalid-sequence-coding-system
+            (car invalid-sequence-coding-system)))
     (map-char-table
      #'(lambda (key entry)
          (setq glyph (make-glyph
                       (vector
                        'string :data
                        (decode-coding-string (string entry)
-                                             error-sequence-coding-system))))
-         (set-glyph-face glyph 'unicode-error-sequence-warning-face)
+                                             invalid-sequence-coding-system))))
+         (set-glyph-face glyph 'unicode-invalid-sequence-warning-face)
          (put-char-table key glyph disp-table)
          nil)
      unicode-error-default-translation-table))
--- a/lisp/unicode.el	Tue Aug 05 09:06:41 2008 +0200
+++ b/lisp/unicode.el	Fri Aug 08 21:17:08 2008 +0200
@@ -526,7 +526,7 @@
 To transform XEmacs Unicode error sequences to the Latin-1 characters that
 correspond to the octets on disk, you can use this variable.  ")
 
-(defvar unicode-error-sequence-regexp-range
+(defvar unicode-invalid-sequence-regexp-range
   (and (featurep 'mule)
        (format "%c%c-%c"
                (aref (decode-coding-string "\xd8\x00\x00\x00" 'utf-16-be) 0)
@@ -564,7 +564,7 @@
     ;; Comment out until the issue in
     ;; 18179.49815.622843.336527@parhasard.net is fixed.
     (assert t ; (re-search-forward (concat "[" 
-              ;                        unicode-error-sequence-regexp-range
+              ;                        unicode-invalid-sequence-regexp-range
               ;                        "]"))
             nil
             (format "Could not find char ?\\x%x in buffer" i))))
@@ -586,12 +586,12 @@
 	  (setq begin
 		(progn
 		  (skip-chars-forward
-		   (concat "^" unicode-error-sequence-regexp-range))
+		   (concat "^" unicode-invalid-sequence-regexp-range))
 		  (point))
 		end (and (not (= (point) (point-max)))
 			 (progn
 			   (skip-chars-forward
-			    unicode-error-sequence-regexp-range)
+			    unicode-invalid-sequence-regexp-range)
 			   (point))))
 	  (if end
 	      (funcall frob-function begin end))))))
@@ -612,7 +612,7 @@
      begin end buffer))
 
 ;; Sure would be nice to be able to use defface here. 
-(copy-face 'highlight 'unicode-error-sequence-warning-face)
+(copy-face 'highlight 'unicode-invalid-sequence-warning-face)
 
 (unless (featurep 'mule)
   ;; We do this in such a roundabout way--instead of having the above defun
@@ -622,8 +622,8 @@
   ;; Lisp.
   (mapcar #'unintern
           '(ccl-encode-to-ucs-2 unicode-error-default-translation-table
-            unicode-error-sequence-regexp-range
-            frob-unicode-errors-region unicode-error-translate-region)))
+            unicode-invalid-regexp-range frob-unicode-errors-region
+            unicode-error-translate-region)))
 
 ;; #### UTF-7 is not yet implemented, and it's tricky to do.  There's
 ;; an implementation in appendix A.1 of the Unicode Standard, Version