updated for version 7.0152

diff --git a/runtime/spell/README.txt b/runtime/spell/README.txt
index 01d30608a2ae609f727c4120e9ab9683f69c6891..d2a9c17dc3a9306f36f39a7cf614541ee9a8f4b6 100644 (file)
--- a/runtime/spell/README.txt
+++ b/runtime/spell/README.txt
@@ -11,6 +11,9 @@ Copyright notices for specific languages are in README_??.txt.  Note that the
 files for different regions are merged, both to save space and to make it
 possible to highlight words for another region different from bad words.
 
+Most of the soundslike mappings come from Aspell ??_phonet.dat files:
+ftp://ftp.gnu.org/gnu/aspell/dict/.  Most go under the GPL or LGPL copyright.
+
 
 GENERATING .SPL FILES
 

diff --git a/runtime/spell/am/am_ET.diff b/runtime/spell/am/am_ET.diff
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cbac554b33d6d937c45652a92803c421530f9df4 100644 (file)
--- a/runtime/spell/am/am_ET.diff
+++ b/runtime/spell/am/am_ET.diff
@@ -0,0 +1,9 @@
+*** am_ET.orig.aff     Mon Aug 22 11:52:57 2005
+--- am_ET.aff  Thu Sep 29 21:56:20 2005
+***************
+*** 24 ****
+--- 24,27 ----
+  SFX c   0     ዎች        
++ 
++ # Aspell has sound folding for Amharic, but it doesn't look right, it uses
++ # different characters than the dictionary.  Therefore it was not included.

diff --git a/runtime/spell/nl/nl_NL.diff b/runtime/spell/nl/nl_NL.diff
index bc068fd89d10a8adef7918747e1aad89a9e57963..fdc675a3b8fe62f58b31b43c509acafb77a2e355 100644 (file)
--- a/runtime/spell/nl/nl_NL.diff
+++ b/runtime/spell/nl/nl_NL.diff
@@ -141,7 +141,7 @@
 + REP zoz z.o.z.
 + 
 *** nl_NL.orig.dic     Sun Jul  3 18:24:07 2005
---- nl_NL.dic  Mon Sep 19 20:25:09 2005
+--- nl_NL.dic  Thu Sep 29 20:54:43 2005
 ***************
 *** 1,3 ****
   119937
@@ -259,7 +259,7 @@
   voorjaarsmoeheid
 ***************
 *** 119938 ****
---- 119963,120142 ----
+--- 119963,120143 ----
   überhaupt
 + Christiaan/X
 + Fred/X
@@ -440,3 +440,4 @@
 + Luuk
 + Gert
 + Marion
++ Jos

diff --git a/runtime/spell/yi/yi_tr.diff b/runtime/spell/yi/yi_tr.diff
index c39e0fe0ed5bdc1a50f9cec38e1d27c703205dd8..629532a2882a78d7e1b0872b518804b342453df4 100644 (file)
--- a/runtime/spell/yi/yi_tr.diff
+++ b/runtime/spell/yi/yi_tr.diff
@@ -6,7 +6,7 @@
 + 84608
   gruntelement
   dzhobendiks
-*** /dev/null  Thu Sep 29 20:06:57 2005
+*** /dev/null  Fri Sep 30 14:15:43 2005
 --- yi_tr.aff  Tue Aug 16 10:48:01 2005
 ***************
 *** 0 ****

diff --git a/src/gui.c b/src/gui.c
index 9a465f4941d8f4afbae133a0c5519709cce11388..9135992cc030f2b879d8fee6725c63e4946f27ca 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -2248,13 +2248,13 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
            /* Draw a composing char on top of the previous char. */
            if (comping)
            {
-#  if !defined(__APPLE_CC__) && !defined(__MRC__) && !defined(TARGET_API_MAC_CARBON) && !defined(FEAT_GUI_W32)
-               gui_mch_draw_string(gui.row, scol - cn, s + i, cl,
-                                                   draw_flags | DRAW_TRANSP);
-#  else
+#  if (defined(__APPLE_CC__) || defined(__MRC__)) && TARGET_API_MAC_CARBON
                /* Carbon ATSUI autodraws composing char over previous char */
                gui_mch_draw_string(gui.row, scol, s + i, cl,
                                                    draw_flags | DRAW_TRANSP);
+#  else
+               gui_mch_draw_string(gui.row, scol - cn, s + i, cl,
+                                                   draw_flags | DRAW_TRANSP);
 #  endif
                start = i + cl;
            }