Add latin-iso8859-1[45].

3 files changed, 18 insertions, 4 deletions

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index a2a06cbef7d..98e0c55fb10 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -281,12 +281,16 @@
 (modify-category-entry (make-char 'latin-iso8859-3) ?l)
 (modify-category-entry (make-char 'latin-iso8859-4) ?l)
 (modify-category-entry (make-char 'latin-iso8859-9) ?l)
+(modify-category-entry (make-char 'latin-iso8859-14) ?l)
+(modify-category-entry (make-char 'latin-iso8859-15) ?l)
 
 (modify-category-entry (make-char 'latin-iso8859-1 160) ?\ )
 (modify-category-entry (make-char 'latin-iso8859-2 160) ?\ )
 (modify-category-entry (make-char 'latin-iso8859-3 160) ?\ )
 (modify-category-entry (make-char 'latin-iso8859-4 160) ?\ )
 (modify-category-entry (make-char 'latin-iso8859-9 160) ?\ )
+(modify-category-entry (make-char 'latin-iso8859-14 160) ?\ )
+(modify-category-entry (make-char 'latin-iso8859-15 160) ?\ )
 
 ;; Greek character set (ISO-8859-7)
 
@@ -615,7 +619,9 @@
 	   (chinese-cns11643-6	. iso-2022-cn)
 	   (chinese-cns11643-7	. iso-2022-cn)
 	   (indian-2-column	. devanagari)
-	   (tibetan		. tibetan))))
+	   (tibetan		. tibetan)
+	   (latin-iso8859-14	. iso-latin-8)
+	   (latin-iso8859-15	. iso-latin-9))))
   (while l
     (put-charset-property (car (car l)) 'preferred-coding-system (cdr (car l)))
     (setq l (cdr l))))
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 49430477e48..3acd1b49136 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -76,6 +76,8 @@
     (lao . "MuleLao-1")
     (tibetan . "MuleTibetan-0")
     (tibetan-1-column . "MuleTibetan-1")
+    (latin-iso8859-14 . "ISO8859-14")
+    (latin-iso8859-15 . "ISO8859-15")
     ))
 
 (let ((l x-charset-registries))
@@ -113,6 +115,8 @@
     ("iso8859-6" ascii arabic-iso8859-6)
     ("iso8859-7" ascii greek-iso8859-7)
     ("iso8859-8" ascii hebrew-iso8859-8)
+    ("iso8859-14" ascii latin-iso8859-14)
+    ("iso8859-15" ascii latin-iso8859-15)
     ("tis620" ascii thai-tis620)
     ("koi8" ascii cyrillic-iso8859-5)
     ("viscii" ascii vietnamese-viscii-upper vietnamese-viscii-lower)
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 51dfa67bea2..f046ecaeda1 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -31,7 +31,7 @@
 ;;; Definitions of character sets.
 
 ;; Basic (official) character sets.  These character sets are treated
-;; effectively in the aspect of memory in a buffer.
+;; efficiently with respect to buffer memory.
 
 ;; Syntax:
 ;; (define-charset CHARSET-ID CHARSET
@@ -68,6 +68,10 @@
      "ISO8859-5 (Cyrillic)"])
 (define-charset 141 'latin-iso8859-9
   [1 96 1 0 ?M 1 "Latin-5" "ISO8859-9 (Latin-5)" "ISO8859-9 (Latin-5)"])
+(define-charset 142 'latin-iso8859-15
+  [1 96 1 0 ?b 1 "Latin-9" "ISO8859-15 (Latin-9)" "ISO8859-15 (Latin-9)"])
+(define-charset 143 'latin-iso8859-14
+  [1 96 1 0 ?_ 1 "Latin-8" "ISO8859-14 (Latin-8)" "ISO8859-14 (Latin-8)"])
 (define-charset 144 'japanese-jisx0208-1978
   [2 94 2 0 ?@ 0 "JISX0208.1978" "JISX0208.1978 (Japanese)"
      "JISX0208.1978 Japanese Kanji (so called \"old JIS\")"])
@@ -96,7 +100,7 @@
      "Big5 Level-2 Chinese traditional"])
 
 ;; Additional (private) character sets.  These character sets are
-;; treated less effectively in the aspect of memory in a buffer.
+;; treated less space-efficiently in the buffer.
 
 ;; Syntax:
 ;; (define-charset nil CHARSET
@@ -142,7 +146,7 @@
 
 ;; Chinese CNS11643 Plane3 thru Plane7.  Although these are official
 ;; character sets, the use is rare and don't have to be treated
-;; effectively in the aspect of memory in a buffer.
+;; space-efficiently in the buffer.
 (define-charset nil 'chinese-cns11643-3
   [2 94 2 0 ?I 0 "CNS11643-3" "CNS11643-3 (Chinese traditional)"
      "CNS11643 Plane 3 Chinese Traditional"])