From 8a605fe839a119820e7e346bf860a9245872fa67 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 13 Nov 2009 11:18:02 +0000 Subject: [PATCH] (word_boundary_p): Adjusted for the change of the semantics of Vword_combining_categories. (Vword_combining_categories): Describe the slight change of the semantics. --- src/ChangeLog | 7 +++++++ src/category.c | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 35296685a65..9bc55ece62a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2009-11-13 Kenichi Handa + + * category.c (word_boundary_p): Adjusted for the change of the + semantics of Vword_combining_categories. + (Vword_combining_categories): Describe the slight change of the + semantics. + 2009-11-13 Eli Zaretskii * menu.c (Fx_popup_menu): Call Fx_hide_tip only if HAVE_WINDOW_SYSTEM. diff --git a/src/category.c b/src/category.c index 7d7553411e6..702bcee9ce5 100644 --- a/src/category.c +++ b/src/category.c @@ -453,9 +453,11 @@ word_boundary_p (c1, c2) if (CONSP (elt) && (NILP (XCAR (elt)) || (CATEGORYP (XCAR (elt)) - && CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set1))) + && CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set1) + && ! CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set2))) && (NILP (XCDR (elt)) || (CATEGORYP (XCDR (elt)) + && ! CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set1) && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2)))) return !default_result; } @@ -524,8 +526,9 @@ Emacs finds a word boundary between characters of the same script if they have categories matching some element of this list. More precisely, if an element of this list is a cons of category CAT1 -and CAT2, and a multibyte character C1 which has CAT1 is followed by -C2 which has CAT2, there's a word boundary between C1 and C2. +and CAT2, and a multibyte character C1 which has CAT1 but not CAT2 is +followed by C2 which has CAT2 but not CAT1, there's a word boundary +between C1 and C2. For instance, to tell that there's a word boundary between Hiragana and Katakana (both are in the same script `kana'), -- 2.39.5