Update to 21.5.b24

10 files changed, 283 insertions, 22 deletions

diff --git a/editors/xemacs-devel/files/patch-aa b/editors/xemacs-devel/files/patch-aa
index 45fbafd60623..54d2e365c1e7 100644
--- a/editors/xemacs-devel/files/patch-aa
+++ b/editors/xemacs-devel/files/patch-aa
@@ -1,11 +1,11 @@
---- lib-src/Makefile.in.in~	Tue Feb  8 11:54:39 2000
-+++ lib-src/Makefile.in.in	Thu Sep 21 22:26:13 2000
-@@ -224,7 +224,7 @@
- 	(cd ${archlibdir} && \
- 	 $(RM) ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
+--- lib-src/Makefile.in.in.orig	Tue Nov 22 09:14:42 2005
++++ lib-src/Makefile.in.in	Mon Dec 19 14:01:40 2005
+@@ -270,7 +270,7 @@
+ 	cd ${bindir} && $(RM) ${PUBLIC_INSTALLABLES}
+ 	cd ${archlibdir} && $(RM) ${PRIVATE_INSTALLABLES}
  
 -.PHONY: mostlyclean clean distclean realclean extraclean
 +.PHONY: mostlyclean clean distclean realclean extraclean ${archlibdir}
+ .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
  mostlyclean:
- 	$(RM) *.o *.i core
- clean: mostlyclean
+ 	-$(RM) *.o *.i core
diff --git a/editors/xemacs-devel/files/patch-cmdloop.el b/editors/xemacs-devel/files/patch-cmdloop.el
new file mode 100644
index 000000000000..f14ddb4627f4
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-cmdloop.el
@@ -0,0 +1,28 @@
+Index: cmdloop.el
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cmdloop.el,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- lisp/cmdloop.el	2005/06/26 18:04:49	1.18
++++ lisp/cmdloop.el	2006/01/08 20:00:43	1.19
+@@ -579,7 +579,8 @@
+ 		 (setq char (aref translated 0)))))
+       (cond ((null char))
+ 	    ((not (characterp char))
+-	     (setq unread-command-events (list char)
++	     ;; XEmacs change; event instead of char. 
++	     (setq unread-command-events (list event)
+ 		   done t))
+ ; 	    ((/= (logand char ?\M-\^@) 0)
+ ; 	     ;; Turn a meta-character into a character with the 0200 bit set.
+@@ -598,7 +599,8 @@
+ 	    ((and (not first) (eq char ?\C-m))
+ 	     (setq done t))
+ 	    ((not first)
+-	     (setq unread-command-events (list char)
++	     ;; XEmacs change; event instead of char. 
++	     (setq unread-command-events (list event)
+ 		   done t))
+ 	    (t (setq code (char-to-int char)
+ 		     done t)))
diff --git a/editors/xemacs-devel/files/patch-configure.ac b/editors/xemacs-devel/files/patch-configure.ac
index a716503ed86d..1d9758ae1bae 100644
--- a/editors/xemacs-devel/files/patch-configure.ac
+++ b/editors/xemacs-devel/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac	2005/03/11 11:19:01	1.2
-+++ configure.ac	2005/03/17 20:16:50
-@@ -1148,6 +1148,7 @@
+--- configure.ac.orig	Sun Dec 18 19:58:55 2005
++++ configure.ac	Mon Dec 19 16:04:59 2005
+@@ -1257,6 +1257,7 @@
  dnl Straightforward OS determination
  case "$ac_cv_build" in
    *-*-linux*    ) opsys=linux ;;
@@ -8,7 +8,16 @@
    *-*-netbsd*   ) opsys=netbsd ;;
    *-*-openbsd*	) opsys=openbsd ;;
    *-*-nextstep* ) opsys=nextstep ;;
-@@ -4943,7 +4950,7 @@
+@@ -3423,7 +3424,7 @@
+       dnl #### How about /sw/include, and /opt/local/include?
+       dnl these directories need to be the parent of the freetype directory
+       for freetype_include_top in "/usr/X11R6/include/freetype2" \
+-				  "/usr/include/freetype2"
++				  "$with_site_includes/freetype2"
+       do
+ 	if test -d $freetype_include_top; then
+ 	  AC_CHECKING([in ${freetype_include_top}/freetype2])
+@@ -5296,7 +5297,7 @@
  dnl Check for Berkeley DB.
  if test "$enable_database_berkdb" != "no"; then
    AC_MSG_CHECKING(for Berkeley db.h)
diff --git a/editors/xemacs-devel/files/patch-dynarr.c b/editors/xemacs-devel/files/patch-dynarr.c
new file mode 100644
index 000000000000..5957624348d6
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-dynarr.c
@@ -0,0 +1,57 @@
+Index: src/dynarr.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dynarr.c,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- src/dynarr.c	2005/11/25 01:41:59	1.13
++++ src/dynarr.c	2006/01/20 17:59:50	1.14
+@@ -129,16 +129,17 @@
+ static int Dynarr_min_size = 8;
+ 
+ static void
+-Dynarr_realloc (Dynarr *dy, Bytecount new_size)
++Dynarr_realloc (Dynarr *dy, int new_size)
+ {
+   if (DUMPEDP (dy->base))
+     {
+       void *new_base = malloc (new_size);
+-      memcpy (new_base, dy->base, dy->max > new_size ? dy->max : new_size);
++      memcpy (new_base, dy->base, 
++	      (dy->max < new_size ? dy->max : new_size) * dy->elsize);
+       dy->base = new_base;
+     }
+   else
+-    dy->base = xrealloc (dy->base, new_size);
++    dy->base = xrealloc (dy->base, new_size * dy->elsize);
+ }
+ 
+ void *
+@@ -158,13 +159,13 @@
+ 			       Dynarr);
+ 
+ static void
+-Dynarr_lisp_realloc (Dynarr *dy, Elemcount new_size)
++Dynarr_lisp_realloc (Dynarr *dy, int new_size)
+ {
+   void *new_base = alloc_lrecord_array (dy->elsize, new_size, dy->lisp_imp);
+   void *old_base = dy->base;
+   if (dy->base)
+     memcpy (new_base, dy->base, 
+-	    (dy->max > new_size ? dy->max : new_size) * dy->elsize);
++	    (dy->max < new_size ? dy->max : new_size) * dy->elsize);
+   dy->base = new_base;
+   if (old_base)
+     mc_free (old_base);
+@@ -205,9 +206,9 @@
+       if (dy->lisp_imp)
+ 	Dynarr_lisp_realloc (dy, newsize);
+       else
+-	Dynarr_realloc (dy, newsize*dy->elsize);
++	Dynarr_realloc (dy, newsize);
+ #else /* not NEW_GC */
+-      Dynarr_realloc (dy, newsize*dy->elsize);
++      Dynarr_realloc (dy, newsize);
+ #endif /* not NEW_GC */
+       dy->max = newsize;
+     }
diff --git a/editors/xemacs-devel/files/patch-objects-gtk.c b/editors/xemacs-devel/files/patch-objects-gtk.c
new file mode 100644
index 000000000000..ed9b96938bc4
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-objects-gtk.c
@@ -0,0 +1,28 @@
+Index: src/objects-gtk.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-gtk.c,v
+retrieving revision 1.16
+retrieving revision 1.17
+diff -u -r1.16 -r1.17
+--- src/objects-gtk.c	2005/01/28 02:58:51	1.16
++++ src/objects-gtk.c	2005/12/24 17:33:34	1.17
+@@ -485,8 +485,7 @@
+ /* X Specific stuff */
+ #include <X11/Xatom.h>
+ 
+-/* Unbounded, for sufficiently small values of infinity... */
+-#define MAX_FONT_COUNT 5000
++#define MAX_FONT_COUNT INT_MAX
+ 
+ #ifdef MULE
+ /* find a font spec that matches font spec FONT and also matches
+@@ -536,9 +535,6 @@
+   return result;
+ }
+ #endif /* MULE */
+-
+-/* Unbounded, for sufficiently small values of infinity... */
+-#define MAX_FONT_COUNT 5000
+ 
+ static int
+ valid_font_name_p (Display *dpy, char *name)
diff --git a/editors/xemacs-devel/files/patch-objects-x.c b/editors/xemacs-devel/files/patch-objects-x.c
new file mode 100644
index 000000000000..25e5b3b4acd3
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-objects-x.c
@@ -0,0 +1,49 @@
+Index: src/objects-x.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
+retrieving revision 1.30
+retrieving revision 1.36
+diff -u -r1.30 -r1.36
+--- src/objects-x.c	2005/11/26 18:25:03	1.30
++++ src/objects-x.c	2006/01/20 17:50:46	1.36
+@@ -693,8 +693,9 @@
+   return result;
+ }
+ 
+-/* Unbounded, for sufficiently small values of infinity... */
+-#define MAX_FONT_COUNT 5000
++/* XListFonts doesn't allocate memory unconditionally based on this. (For
++   XFree86 in 2005, at least. */
++#define MAX_FONT_COUNT INT_MAX
+ 
+ static Extbyte *
+ truename_via_XListFonts (Display *dpy, Extbyte *font_name)
+@@ -807,7 +808,8 @@
+       FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern);
+       if (res)
+ 	{
+-	  FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res));
++	  FONT_INSTANCE_TRUENAME (f) = 
++	    build_ext_string (res, Qxft_font_name_encoding); 
+ 	  free (res);
+ 	  return FONT_INSTANCE_TRUENAME (f);
+ 	}
+@@ -1175,7 +1177,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
+@@ -1441,7 +1443,8 @@
+       if (x_font_spec_matches_charset (XDEVICE (device), charset,
+ 				       intname, Qnil, 0, -1, 0))
+ 	{
+-	  result = make_string (intname, intlen);
++	  result = build_ext_string ((const Extbyte *) intname, 
++				     Qx_font_name_encoding); 
+ 	  break;
+ 	}
+     }
diff --git a/editors/xemacs-devel/files/patch-syntax.c b/editors/xemacs-devel/files/patch-syntax.c
new file mode 100644
index 000000000000..03b48561efbd
--- /dev/null
+++ b/editors/xemacs-devel/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),
diff --git a/editors/xemacs-devel/files/patch-unexelf.c b/editors/xemacs-devel/files/patch-unexelf.c
deleted file mode 100644
index 4def66b623ac..000000000000
--- a/editors/xemacs-devel/files/patch-unexelf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/unexelf.c.orig	Fri Jul 22 23:34:12 2005
-+++ src/unexelf.c	Fri Jul 22 23:34:42 2005
-@@ -477,7 +477,7 @@
- # include <sys/exec_elf.h>
- #endif
- 
--#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__)) 
-+#if defined(__FreeBSD__) && (defined(__alpha__) || defined(_LP64)) 
- # ifdef __STDC__ 
- #  define ElfW(type)   Elf64_##type 
- # else 
diff --git a/editors/xemacs-devel/files/patch-x-win-xfree86.el b/editors/xemacs-devel/files/patch-x-win-xfree86.el
new file mode 100644
index 000000000000..9c40cdd7e33d
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-x-win-xfree86.el
@@ -0,0 +1,46 @@
+Index: lisp/x-win-xfree86.el
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-win-xfree86.el,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- lisp/x-win-xfree86.el	2001/05/04 22:42:19	1.5
++++ lisp/x-win-xfree86.el	2005/12/24 19:53:53	1.6
+@@ -46,6 +46,37 @@
+ 
+ ;;;###autoload
+ (defun x-win-init-xfree86 ()
++
++  ;; We know this keyboard is an XFree86 keyboard. As such, we can predict
++  ;; what key scan codes will correspond to the keys on US keyboard layout,
++  ;; and we can use that information to fall back to the US layout when
++  ;; looking up commands that would otherwise fail. (Cf. the hard-coding of
++  ;; this information in /usr/X11R6/lib/X11/xkb/keycodes/xfree86 )
++  ;;
++  ;; These settings for x-us-keymap-first-keycode and
++  ;; x-us-keymap-description were determined with 
++  ;; 
++  ;; setxkbmap us
++  ;; xmodmap -pke > keyboard-description.txt
++  ;;
++  ;; "8" is the key code of the first line, x-us-keymap-description is
++  ;; taken from the column describing the bindings. 
++
++  (setq x-us-keymap-first-keycode 8
++	x-us-keymap-description
++	[nil nil [?1 ?!] [?2 ?@] [?3 ?\#] [?4 ?$] [?5 ?%] [?6 ?^] [?7 ?&]
++	     [?8 ?*] [?9 ?\(] [?0 ?\)] [?- ?_] [?= ?+] nil ?\t [?q ?Q] 
++	     [?w ?W] [?e ?E] [?r ?R] [?t ?T] [?y ?Y] [?u ?U] [?i ?I] [?o ?O]
++	     [?p ?P] [?\[ ?{] [?\] ?}] nil nil [?a ?A] [?s ?S] [?d ?D]
++	     [?f ?F] [?g ?G] [?h ?H] [?j ?J] [?k ?K] [?l ?L] [?\; ?:]
++	     [?\' ?\"] [?\` ?~] nil [?\\ ?|] [?z ?Z] [?x ?X] [?c ?C]
++	     [?v ?V] [?b ?B] [?n ?N] [?m ?M] [?\, ?<] [?\. ?>] [?/ ?\?]
++	     nil ?* nil ?\  nil nil nil nil nil nil nil nil nil nil nil
++	     nil nil ?7 ?8 ?9 ?- ?4 ?5 ?6 ?+ ?1 ?2 ?3 ?0 ?\. nil nil 
++	     [?< ?>] nil nil nil nil nil nil nil nil nil nil nil nil 
++	     nil nil nil nil nil ?/ nil nil nil nil nil nil nil nil 
++	     nil nil nil nil nil ?=])
++
+   (loop for (key sane-key) in
+     '((f13 f1)
+       (f14 f2)
diff --git a/editors/xemacs-devel/files/patch-xlwmenu.c b/editors/xemacs-devel/files/patch-xlwmenu.c
new file mode 100644
index 000000000000..ee91eba795b5
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-xlwmenu.c
@@ -0,0 +1,18 @@
+Index: lwlib/xlwmenu.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v
+retrieving revision 1.38
+diff -u -r1.38 xlwmenu.c
+--- lwlib/xlwmenu.c	2005/11/26 11:45:59	1.38
++++ lwlib/xlwmenu.c	2005/12/20 13:04:56
+@@ -2828,8 +2828,9 @@
+ 	  XColor xcolor;
+ 	  Visual *visual;
+ 	  int ignore;
++	  Colormap cmap;
+ 	  visual_info_from_widget ((Widget) mw, &visual, &ignore);
+-	  Colormap cmap = mw->core.colormap;
++	  cmap = mw->core.colormap;
+ 	  xcolor.pixel = mw->core.background_pixel;
+ 	  XQueryColor (dpy, cmap, &xcolor);
+ 	  xcolor.red   = (xcolor.red   * 17) / 20;