[evolution] Bug 762022 - [ESpellEntry] Considers a comma to be a spelling error

[Milan Crha <mcrha src gnome org>]

commit 70f230d580179f9051aba0de9a49ef6f46a86de1
Author: Milan Crha <mcrha redhat com>
Date:   Fri Feb 19 19:49:26 2016 +0100

    Bug 762022 - [ESpellEntry] Considers a comma to be a spelling error

 e-util/e-spell-entry.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-spell-entry.c b/e-util/e-spell-entry.c
index 12d5a50..f4ff675 100644
--- a/e-util/e-spell-entry.c
+++ b/e-util/e-spell-entry.c
@@ -233,6 +233,20 @@ spell_entry_store_word (gchar ***set,
        memcpy ((*set)[n_word], word_start, bytes);
 }
 
+static gboolean
+entry_is_word_char (gunichar uc)
+{
+       if (uc == L'\'') {
+               PangoLanguage *current_locale = pango_language_get_default ();
+
+               /* English locales use apostrophes as part of the word */
+               if (pango_language_matches (current_locale, "en"))
+                       return TRUE;
+       }
+
+       return g_unichar_isalnum (uc) || g_unichar_ismark (uc);
+}
+
 static void
 entry_strsplit_utf8 (GtkEntry *entry,
                      gchar ***set,
@@ -249,7 +263,7 @@ entry_strsplit_utf8 (GtkEntry *entry,
        n_strings = 0;
        word_start = NULL;
        for (ptr = text; *ptr; ptr = g_utf8_next_char (ptr)) {
-               if (g_unichar_isspace (g_utf8_get_char (ptr))) {
+               if (!entry_is_word_char (g_utf8_get_char (ptr))) {
                        word_start = NULL;
                } else if (!word_start) {
                        n_strings++;
@@ -265,7 +279,7 @@ entry_strsplit_utf8 (GtkEntry *entry,
        word_start = NULL;
        n_word = -1;
        for (ptr = text; *ptr; ptr = g_utf8_next_char (ptr)) {
-               if (g_unichar_isspace (g_utf8_get_char (ptr))) {
+               if (!entry_is_word_char (g_utf8_get_char (ptr))) {
                        if (word_start)
                                spell_entry_store_word (set, starts, ends, text, n_word, n_strings, 
word_start, ptr);
                        word_start = NULL;