(ispell-dictionary-alist-4): Add "german"

and "german8", for the new German orthography dictionaries,
(ispell-dictionary-alist-5, ispell-dictionary-alist-6): Rearrange
the entries, to keep the line length balanced for loaddefs.el.

2 files changed, 29 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 206f0c23bcd..cf718738e66 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-07  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * textmodes/ispell.el (ispell-dictionary-alist-4): Add "german"
+        and "german8", for the new German orthography dictionaries,
+        (ispell-dictionary-alist-5, ispell-dictionary-alist-6): Rearrange
+        the entries, to keep the line length balanced for loaddefs.el.
+
 2001-09-07  Dr Francis J. Wright  <F.J.Wright@qmw.ac.uk>
         
         * comint.el (comint-send-input): Handle comint-process-echoes
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 4e8b6119e51..24a96213eaf 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -564,35 +564,37 @@ See `ispell-dictionary-alist'."
     "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]"
     "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]"
     "[-'^`\"]" t nil "~tex" iso-8859-1)
+   ("german"                         ; german.aff
+    "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1)
+   ("german8"
+    "[a-zA-Z\304\326\334\344\366\337\374]"
+    "[^a-zA-Z\304\326\334\344\366\337\374]"
+    "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1)
    ("italiano"                         ; Italian.aff
     "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"
     "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]"
-    "[-]" nil ("-B" "-d" "italian") "~tex" iso-8859-1)
-   ("nederlands"                        ; Nederlands.aff
-    "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]"
-    "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]"
-    "[']" t ("-C") nil iso-8859-1)
-   ("nederlands8"                       ; Dutch8.aff
-    "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]"
-    "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]"
-    "[']" t ("-C") nil iso-8859-1)))
+    "[-]" nil ("-B" "-d" "italian") "~tex" iso-8859-1)))
 
 
 ;;; Fifth part of dictionary, shortened for loaddefs.el
 ;;;###autoload
 (setq
  ispell-dictionary-alist-5
- '(("norsk"                             ; 8 bit Norwegian mode
+ '(("nederlands"                        ; Nederlands.aff
+    "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]"
+    "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]"
+    "[']" t ("-C") nil iso-8859-1)
+   ("nederlands8"                       ; Dutch8.aff
+    "[A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]"
+    "[^A-Za-z\300-\305\307\310-\317\322-\326\331-\334\340-\345\347\350-\357\361\362-\366\371-\374]"
+    "[']" t ("-C") nil iso-8859-1)
+   ("norsk"                             ; 8 bit Norwegian mode
     "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]"
     "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]"
     "[\"]" nil ("-d" "norsk") "~list" iso-8859-1)
    ("norsk7-tex"                        ; 7 bit Norwegian TeX mode
     "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]"
-    "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1)
-   ("polish"                            ; polish mode
-    "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
-    "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
-    "" nil ( "-d" "polish") nil iso-8859-2)))
+    "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1)))
 
 
 ;;; Sixth part of dictionary, shortened for loaddefs.el
@@ -601,7 +603,11 @@ See `ispell-dictionary-alist'."
  ispell-dictionary-alist-6
  ;; include Russian iso character set too?
  ;;   "[']" t ("-d" "russian") "~latin1" iso-8859-1
- '(("russian"                           ; Russian.aff (KOI8-R charset)
+ '(("polish"                            ; polish mode
+    "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
+    "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
+    "" nil ( "-d" "polish") nil iso-8859-2)
+   ("russian"                           ; Russian.aff (KOI8-R charset)
     "[\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]"
     "[^\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]"
     "" nil ("-d" "russian") nil koi8-r)