Mercurial > emacs

diff src/abbrev.c @ 89483:2f877ed80fa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Mon, 08 Sep 2003 12:53:41 +0000
parents 375f2633d815 98dcb14bf34c
children 68c22ea6027c
line wrap: on
line diff
--- a/src/abbrev.c	Mon Sep 08 11:56:09 2003 +0000
+++ b/src/abbrev.c	Mon Sep 08 12:53:41 2003 +0000
@@ -27,7 +27,7 @@
 #include "commands.h"
 #include "buffer.h"
 #include "window.h"
-#include "charset.h"
+#include "character.h"
 #include "syntax.h"
 
 /* An abbrev table is an obarray.
@@ -385,9 +385,15 @@
 	  int pos = wordstart_byte;
 
 	  /* Find the initial.  */
-	  while (pos < PT_BYTE
-		 && SYNTAX (*BUF_BYTE_ADDRESS (current_buffer, pos)) != Sword)
-	    pos++;
+	  if (multibyte)
+	    while (pos < PT_BYTE
+		   && SYNTAX (FETCH_MULTIBYTE_CHAR (pos)) != Sword)
+	      INC_POS (pos);
+	  else
+	    while (pos < PT_BYTE
+		   && (SYNTAX (*BUF_BYTE_ADDRESS (current_buffer, pos))
+		       != Sword))
+	      pos++;
 
 	  /* Change just that.  */
 	  pos = BYTE_TO_CHAR (pos);