(cp850-decode-table): Fix a few codes.

(cp858-decode-table): New variable.

2 files changed, 24 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c166019cfa9..2f4b85e60a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/codepage.el (cp850-decode-table): Fix a few codes.
+        (cp858-decode-table): New variable.
+
 2006-09-09  Toby Allsopp  <Toby.Allsopp@navman.com>  (tiny change)
 
         * net/ldap.el (ldap-search-internal): Doc fix.
diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el
index 56920b968ac..e2499002a34 100644
--- a/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@ -220,16 +220,32 @@ character is generated by (make-char CHARSET OFFSET)."
   ;; character created by (make-char 'latin-iso8859-1 (+ N 160)).
   ;; The element nil means there's no corresponding cp850 glyph.
   [
-   255 173 189 156 207 190 221 245 249 184 166 174 170 240 169 nil
+   255 173 189 156 207 190 221 245 249 184 166 174 170 240 169 238
    248 241 253 252 239 230 244 250 247 251 167 175 172 171 243 168
    183 181 182 199 142 143 146 128 212 144 210 211 222 214 215 216
-   209 165 227 224 226 229 153 158 157 235 233 234 154 237 231 225
+   209 165 227 224 226 229 153 158 157 235 233 234 154 237 232 225
    133 160 131 198 132 134 145 135 138 130 136 137 141 161 140 139
-   208 164 149 162 147 228 148 246 155 151 163 150 129 236 232 152]
+   208 164 149 162 147 228 148 246 155 151 163 150 129 236 231 152]
   "Table for converting ISO-8859-1 characters into codepage 850 glyphs.")
 (setplist 'cp850-decode-table
           '(charset latin-iso8859-1 language "Latin-1" offset 160))
 
+;; Multilingual (Latin-9)
+(defvar cp858-decode-table
+  ;; Nth element is the code of a cp858 glyph for the multibyte
+  ;; character created by (make-char 'latin-iso8859-15 (+ N 160)).
+  ;; The element nil means there's no corresponding cp858 glyph.
+  [
+   255 173 189 156 213 190 221 245 249 184 166 174 170 240 169 238
+   248 241 253 252 239 230 244 250 247 251 167 175 172 171 243 168
+   183 181 182 199 142 143 146 128 212 144 210 211 222 214 215 216
+   209 165 227 224 226 229 153 158 157 235 233 234 154 237 232 225
+   133 160 131 198 132 134 145 135 138 130 136 137 141 161 140 139
+   208 164 149 162 147 228 148 246 155 151 163 150 129 236 231 152]
+  "Table for converting ISO-8859-15 characters into codepage 858 glyphs.")
+(setplist 'cp858-decode-table
+          '(charset latin-iso8859-15 language "Latin-9" offset 160))
+
 ;; Greek
 (defvar cp851-decode-table
   [