- Update to 2.4.16

- Pass maintainership to submitter

PR:		ports/75444
Submitted by:	Andrey Slusar <anray(at)inet.ua>

3 files changed, 62 insertions, 11 deletions

diff --git a/editors/xemacs21-mule/files/patch-etags.c b/editors/xemacs21-mule/files/patch-etags.c
new file mode 100644
index 000000000000..468f3e4a4b4c
--- /dev/null
+++ b/editors/xemacs21-mule/files/patch-etags.c
@@ -0,0 +1,29 @@
+Index: lib-src/etags.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
+retrieving revision 1.24.2.2
+retrieving revision 1.24.2.3
+diff -u -r1.24.2.2 -r1.24.2.3
+--- lib-src/etags.c	2004/06/24 04:02:29	1.24.2.2
++++ lib-src/etags.c	2004/12/17 23:03:25	1.24.2.3
+@@ -5146,6 +5146,7 @@
+      bool ignore_case;
+      language *lang;
+ {
++  static struct re_pattern_buffer zeropattern;
+   char *name;
+   const char *err;
+   struct re_pattern_buffer *patbuf;
+@@ -5166,11 +5167,9 @@
+   (void) scan_separators (name);
+ 
+   patbuf = xnew (1, struct re_pattern_buffer);
++  *patbuf = zeropattern;
+   /* Translation table to fold case if appropriate. */
+   patbuf->translate = (ignore_case) ? lc_trans : NULL;
+-  patbuf->fastmap = NULL;
+-  patbuf->buffer = NULL;
+-  patbuf->allocated = 0;
+ 
+   err = re_compile_pattern (regexp_pattern, strlen (regexp_pattern), patbuf);
+   if (err != NULL)
diff --git a/editors/xemacs21-mule/files/patch-mem-limits.h b/editors/xemacs21-mule/files/patch-mem-limits.h
deleted file mode 100644
index a5ce6cb35839..000000000000
--- a/editors/xemacs21-mule/files/patch-mem-limits.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mem-limits.h.bak	Thu Mar 18 13:08:19 2004
-+++ src/mem-limits.h	Thu Mar 18 13:08:42 2004
-@@ -108,7 +108,7 @@
- static POINTER data_space_start;
- 
- /* Number of bytes of writable memory we can expect to be able to get */
--extern unsigned int lim_data;
-+extern rlim_t lim_data;
- 
- #if defined (HEAP_IN_DATA) && !defined(PDUMP)
- extern unsigned long static_heap_size;
diff --git a/editors/xemacs21-mule/files/patch-regex.c b/editors/xemacs21-mule/files/patch-regex.c
new file mode 100644
index 000000000000..6a4e854c5955
--- /dev/null
+++ b/editors/xemacs21-mule/files/patch-regex.c
@@ -0,0 +1,33 @@
+Index: regex.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
+retrieving revision 1.25.2.10
+retrieving revision 1.25.2.9
+diff -u -r1.25.2.10 -r1.25.2.9
+--- src/regex.c	2004/10/08 00:40:33	1.25.2.10
++++ src/regex.c	2004/09/23 03:03:43	1.25.2.9
+@@ -4766,20 +4766,16 @@
+ 
+ 		/* Go through the first `min (num_regs, regs->num_regs)'
+ 		   registers, since that is all we initialized.  */
+-		for (mcnt = 1;
+-		     mcnt < MIN (num_nonshy_regs, regs->num_regs);
+-		     mcnt++)
++		for (mcnt = 1; mcnt < MIN (num_regs, regs->num_regs); mcnt++)
+ 		  {
+-		    int ireg = bufp->external_to_internal_register[mcnt];
+-
+-		    if (REG_UNSET (regstart[ireg]) || REG_UNSET (regend[ireg]))
++		    if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt]))
+ 		      regs->start[mcnt] = regs->end[mcnt] = -1;
+ 		    else
+ 		      {
+ 			regs->start[mcnt]
+-			  = (regoff_t) POINTER_TO_OFFSET (regstart[ireg]);
++			  = (regoff_t) POINTER_TO_OFFSET (regstart[mcnt]);
+ 			regs->end[mcnt]
+-			  = (regoff_t) POINTER_TO_OFFSET (regend[ireg]);
++			  = (regoff_t) POINTER_TO_OFFSET (regend[mcnt]);
+ 		      }
+ 		  }
+ 	      } /* regs && !bufp->no_sub */