* Windows-1251 coding system now supported without any options.

* Fixed performance issues.
* Fixed setting the default character class to word, not whitespace.

Approved by:	sem(mentor)

4 files changed, 55 insertions, 4 deletions

diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 96a70bcd2e71..c824f3104cde 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -170,10 +171,6 @@ PLIST_SUB+=	WITH_PGSQL=""
 PLIST_SUB+=	WITH_PGSQL="@comment "
 .endif
 
-.if defined(WITH_WINDOWS1251)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cyrillic.el
-.endif
-
 BINNAMEEXT=		-mule
 .if defined(CANNA) && defined(FREEWNN)
 CONFIGURE_ARGS+=	--with-canna --with-wnn --with-wnn6=no
diff --git a/editors/xemacs-devel-mule/files/extra-patch-cyrillic.el b/editors/xemacs-devel-mule/files/patch-cyrillic.el
index 275b08951812..275b08951812 100644
--- a/editors/xemacs-devel-mule/files/extra-patch-cyrillic.el
+++ b/editors/xemacs-devel-mule/files/patch-cyrillic.el
diff --git a/editors/xemacs-devel-mule/files/patch-objects-x.c b/editors/xemacs-devel-mule/files/patch-objects-x.c
new file mode 100644
index 000000000000..cd671e854b92
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-objects-x.c
@@ -0,0 +1,17 @@
+Index: objects-x.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
+retrieving revision 1.30
+retrieving revision 1.31
+diff -u -r1.30 -r1.31
+--- src/objects-x.c	2005/11/26 18:25:03	1.30
++++ src/objects-x.c	2005/12/20 22:01:52	1.31
+@@ -1175,7 +1175,7 @@
+   Extbyte **names;
+   int count = 0;
+   const Extbyte *patternext;
+-  Lisp_Object result = Qunbound;
++  Lisp_Object result = Qnil;
+   int i;
+ 
+   /* #### with Xft need to handle second stage here -- sjt
diff --git a/editors/xemacs-devel-mule/files/patch-syntax.c b/editors/xemacs-devel-mule/files/patch-syntax.c
new file mode 100644
index 000000000000..03b48561efbd
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-syntax.c
@@ -0,0 +1,37 @@
+Index: syntax.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syntax.c,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -u -r1.25 -r1.26
+--- src/syntax.c	2005/11/25 01:42:06	1.25
++++ src/syntax.c	2005/12/18 22:55:52	1.26
+@@ -613,7 +613,7 @@
+ {
+   *multi_p_out = 1;
+   /* !!#### get this right */
+-  return Spunct;
++  return Sword;
+ }
+ 
+ #endif
+@@ -2296,8 +2296,8 @@
+   if (!EQ (table, Vstandard_syntax_table) && !NILP (Vstandard_syntax_table))
+     map_char_table (Vstandard_syntax_table, &range,
+ 		    copy_if_not_already_present, LISP_TO_VOID (mirrortab));
+-  /* The resetting made the default be Qnil.  Put it back to Spunct. */
+-  set_char_table_default (mirrortab, make_int (Spunct));
++  /* The resetting made the default be Qnil.  Put it back to Sword. */
++  set_char_table_default (mirrortab, make_int (Sword));
+   XCHAR_TABLE (mirrortab)->dirty = 0;
+ }
+ 
+@@ -2419,7 +2419,7 @@
+ 							Smax);
+   staticpro (&Vsyntax_designator_chars_string);
+ 
+-  set_char_table_default (Vstandard_syntax_table, make_int (Spunct));
++  set_char_table_default (Vstandard_syntax_table, make_int (Sword));
+ 
+   for (i = 0; i <= 32; i++)	/* Control 0 plus SPACE */
+     Fput_char_table (make_char (i), make_int (Swhitespace),