* gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.

[gnu-emacs] / src / category.c

diff --git a/src/category.c b/src/category.c
index 84af413120fbab13d026e111ad51313bff66451d..b56d62b6b803cf317f5b1b5990d747a10f122ffc 100644 (file)
--- a/src/category.c
+++ b/src/category.c
@@ -1,8 +1,8 @@
 /* GNU Emacs routines to deal with category tables.
 /* GNU Emacs routines to deal with category tables.

-   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

      Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-     2005, 2006, 2007, 2008, 2009
+     2005, 2006, 2007, 2008, 2009, 2010

      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003


@@ -30,6 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <ctype.h>
 
 #include <config.h>
 #include <ctype.h>

+#include <setjmp.h>

 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"
 #include "lisp.h"
 #include "buffer.h"
 #include "character.h"


@@ -135,6 +136,8 @@ the current buffer's category table.  */)
 
   if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category))))
     error ("Category `%c' is already defined", XFASTINT (category));
 
   if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category))))
     error ("Category `%c' is already defined", XFASTINT (category));

+  if (!NILP (Vpurify_flag))
+    docstring = Fpurecopy (docstring);

   CATEGORY_DOCSTRING (table, XFASTINT (category)) = docstring;
 
   return Qnil;
   CATEGORY_DOCSTRING (table, XFASTINT (category)) = docstring;
 
   return Qnil;


@@ -450,9 +453,11 @@ word_boundary_p (c1, c2)
       if (CONSP (elt)
          && (NILP (XCAR (elt))
              || (CATEGORYP (XCAR (elt))
       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))
          && (NILP (XCDR (elt))
              || (CATEGORYP (XCDR (elt))

+                 && ! CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set1)

                  && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2))))
        return !default_result;
     }
                  && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2))))
        return !default_result;
     }


@@ -464,13 +469,13 @@ void
 init_category_once ()
 {
   /* This has to be done here, before we call Fmake_char_table.  */
 init_category_once ()
 {
   /* This has to be done here, before we call Fmake_char_table.  */

-  Qcategory_table = intern ("category-table");
+  Qcategory_table = intern_c_string ("category-table");

   staticpro (&Qcategory_table);
 
   /* Intern this now in case it isn't already done.
      Setting this variable twice is harmless.
      But don't staticpro it here--that is done in alloc.c.  */
   staticpro (&Qcategory_table);
 
   /* Intern this now in case it isn't already done.
      Setting this variable twice is harmless.
      But don't staticpro it here--that is done in alloc.c.  */

-  Qchar_table_extra_slots = intern ("char-table-extra-slots");
+  Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");

 
   /* Now we are ready to set up this property, so we can
      create category tables.  */
 
   /* Now we are ready to set up this property, so we can
      create category tables.  */


@@ -486,11 +491,11 @@ init_category_once ()
 void
 syms_of_category ()
 {
 void
 syms_of_category ()
 {

-  Qcategoryp = intern ("categoryp");
+  Qcategoryp = intern_c_string ("categoryp");

   staticpro (&Qcategoryp);
   staticpro (&Qcategoryp);

-  Qcategorysetp = intern ("categorysetp");
+  Qcategorysetp = intern_c_string ("categorysetp");

   staticpro (&Qcategorysetp);
   staticpro (&Qcategorysetp);

-  Qcategory_table_p = intern ("category-table-p");
+  Qcategory_table_p = intern_c_string ("category-table-p");

   staticpro (&Qcategory_table_p);
 
   DEFVAR_LISP ("word-combining-categories", &Vword_combining_categories,
   staticpro (&Qcategory_table_p);
 
   DEFVAR_LISP ("word-combining-categories", &Vword_combining_categories,


@@ -521,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
 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'),
 
 For instance, to tell that there's a word boundary between Hiragana
 and Katakana (both are in the same script `kana'),