X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ffont-lock.c;h=ddeeda95ce09632518c30b806c22cdf27669b212;hb=c84990d1037000e9487a437491a853975b356e5a;hp=1cfd739284c68e0ea84ef9cc3b3da52e4417f4d9;hpb=ac7d0619aad74b1d57c4748ebb3ab29d9c32e3d8;p=chise%2Fxemacs-chise.git.1

diff --git a/src/font-lock.c b/src/font-lock.c
index 1cfd739..ddeeda9 100644
--- a/src/font-lock.c
+++ b/src/font-lock.c
@@ -1,6 +1,7 @@
 /* Routines to compute the current syntactic context, for font-lock mode.
    Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
+   Copyright (C) 2001 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -423,7 +424,11 @@ find_context (struct buffer *buf, Bufpos pt)
 {
   /* This function can GC */
 #ifndef emacs
+#ifdef UTF2000
+  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->syntax_table);
+#else
   Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
   Lisp_Object syntaxtab = buf->syntax_table;
 #endif
   Emchar prev_c, c;
@@ -515,7 +520,7 @@ find_context (struct buffer *buf, Bufpos pt)
 	      context_cache.context = context_comment;
 	      context_cache.ccontext = ccontext_none;
 	      context_cache.style = SINGLE_SYNTAX_STYLE (syncode);
-	      if (context_cache.style == comment_style_none) abort ();
+	      if (context_cache.style == comment_style_none) ABORT ();
 	    }
 	  break;
 
@@ -607,7 +612,7 @@ find_context (struct buffer *buf, Bufpos pt)
 	{
 	  context_cache.ccontext = ccontext_start2;
 	  context_cache.style = SYNTAX_START_STYLE (prev_syncode, syncode);
-	  if (context_cache.style == comment_style_none) abort ();
+	  if (context_cache.style == comment_style_none) ABORT ();
 	}
       else if ((SYNTAX_CODE_COMMENT_BITS (syncode) &
 		SYNTAX_FIRST_CHAR_START) &&
@@ -648,18 +653,18 @@ find_context (struct buffer *buf, Bufpos pt)
 	   comment-end sequence. ie, '/xxx foo xxx/' or '/xxx foo x/',
 	   where 'x' = '*' -- mct */
 	{
-	  if (context_cache.style == comment_style_none) abort ();
+	  if (context_cache.style == comment_style_none) ABORT ();
 	  context_cache.ccontext = ccontext_end1;
 	}
 
       else if (context_cache.ccontext == ccontext_start1)
 	{
-	  if (context_cache.context != context_none) abort ();
+	  if (context_cache.context != context_none) ABORT ();
 	  context_cache.ccontext = ccontext_none;
 	}
       else if (context_cache.ccontext == ccontext_end1)
 	{
-	  if (context_cache.context != context_block_comment) abort ();
+	  if (context_cache.context != context_block_comment) ABORT ();
 	  context_cache.context = context_none;
 	  context_cache.ccontext = ccontext_start2;
 	}
@@ -668,7 +673,7 @@ find_context (struct buffer *buf, Bufpos pt)
 	  context_cache.context == context_none)
 	{
 	  context_cache.context = context_block_comment;
-	  if (context_cache.style == comment_style_none) abort ();
+	  if (context_cache.style == comment_style_none) ABORT ();
 	}
       else if (context_cache.ccontext == ccontext_none &&
 	       context_cache.context == context_block_comment)
@@ -691,7 +696,7 @@ context_to_symbol (enum syntactic_context context)
     case context_block_comment:		return Qblock_comment;
     case context_generic_comment:	return Qblock_comment;
     case context_generic_string:	return Qstring;
-    default: abort (); return Qnil; /* suppress compiler warning */
+    default: ABORT (); return Qnil; /* suppress compiler warning */
     }
 }