From 8add233c5108710aa0891c678f3032d223388ac131990e11f0bff05cc827e7ba Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 8 May 2007 18:11:02 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xemacs?expand=0&rev=5

---
 xemacs-ia64.dif | 402 +++++++++++++++++++++---------------------------
 xemacs.changes  |   5 +
 xemacs.spec     |   8 +-
 3 files changed, 183 insertions(+), 232 deletions(-)

diff --git a/xemacs-ia64.dif b/xemacs-ia64.dif
index 3b1408f..fb9deb1 100644
--- a/xemacs-ia64.dif
+++ b/xemacs-ia64.dif
@@ -1,7 +1,6 @@
-diff -ru xemacs-21.5.24.orig/src/chartab.c xemacs-21.5.24/src/chartab.c
---- xemacs-21.5.24.orig/src/chartab.c	2005-12-27 18:12:03.000000000 +0100
-+++ xemacs-21.5.24/src/chartab.c	2005-12-27 18:49:58.000000000 +0100
-@@ -1880,6 +1880,19 @@
+--- xemacs-21.5.27.20070507/src/chartab.c
++++ xemacs-21.5.27.20070507/src/chartab.c
+@@ -1885,6 +1885,19 @@
    define_structure_type_keyword (st, Qdata, chartab_data_validate);
  }
  
@@ -21,9 +20,8 @@ diff -ru xemacs-21.5.24.orig/src/chartab.c xemacs-21.5.24/src/chartab.c
  void
  complex_vars_of_chartab (void)
  {
-diff -ru xemacs-21.5.24.orig/src/console-gtk.c xemacs-21.5.24/src/console-gtk.c
---- xemacs-21.5.24.orig/src/console-gtk.c	2005-06-26 20:05:02.000000000 +0200
-+++ xemacs-21.5.24/src/console-gtk.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/console-gtk.c
++++ xemacs-21.5.27.20070507/src/console-gtk.c
 @@ -194,6 +194,14 @@
  {
    INITIALIZE_CONSOLE_TYPE (gtk, "gtk", "console-gtk-p");
@@ -39,9 +37,8 @@ diff -ru xemacs-21.5.24.orig/src/console-gtk.c xemacs-21.5.24/src/console-gtk.c
    CONSOLE_HAS_METHOD (gtk, semi_canonicalize_console_connection);
    CONSOLE_HAS_METHOD (gtk, canonicalize_console_connection);
    CONSOLE_HAS_METHOD (gtk, semi_canonicalize_device_connection);
-diff -ru xemacs-21.5.24.orig/src/console-msw.c xemacs-21.5.24/src/console-msw.c
---- xemacs-21.5.24.orig/src/console-msw.c	2005-07-08 10:27:34.000000000 +0200
-+++ xemacs-21.5.24/src/console-msw.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/console-msw.c
++++ xemacs-21.5.27.20070507/src/console-msw.c
 @@ -732,6 +732,14 @@
  {
    INITIALIZE_CONSOLE_TYPE (mswindows, "mswindows", "console-mswindows-p");
@@ -57,10 +54,9 @@ diff -ru xemacs-21.5.24.orig/src/console-msw.c xemacs-21.5.24/src/console-msw.c
    /* console methods */
  /*  CONSOLE_HAS_METHOD (mswindows, init_console); */
  /*  CONSOLE_HAS_METHOD (mswindows, mark_console); */
-diff -ru xemacs-21.5.24.orig/src/console-stream.c xemacs-21.5.24/src/console-stream.c
---- xemacs-21.5.24.orig/src/console-stream.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/console-stream.c	2005-12-27 18:49:58.000000000 +0100
-@@ -320,6 +320,14 @@
+--- xemacs-21.5.27.20070507/src/console-stream.c
++++ xemacs-21.5.27.20070507/src/console-stream.c
+@@ -318,6 +318,14 @@
  {
    INITIALIZE_CONSOLE_TYPE (stream, "stream", "console-stream-p");
  
@@ -75,10 +71,9 @@ diff -ru xemacs-21.5.24.orig/src/console-stream.c xemacs-21.5.24/src/console-str
    /* console methods */
    CONSOLE_HAS_METHOD (stream, init_console);
    CONSOLE_HAS_METHOD (stream, initially_selected_for_input);
-diff -ru xemacs-21.5.24.orig/src/console-tty.c xemacs-21.5.24/src/console-tty.c
---- xemacs-21.5.24.orig/src/console-tty.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/console-tty.c	2005-12-27 18:49:58.000000000 +0100
-@@ -438,6 +438,14 @@
+--- xemacs-21.5.27.20070507/src/console-tty.c
++++ xemacs-21.5.27.20070507/src/console-tty.c
+@@ -489,6 +489,14 @@
  {
    INITIALIZE_CONSOLE_TYPE (tty, "tty", "console-tty-p");
  
@@ -93,10 +88,9 @@ diff -ru xemacs-21.5.24.orig/src/console-tty.c xemacs-21.5.24/src/console-tty.c
    /* console methods */
    CONSOLE_HAS_METHOD (tty, init_console);
    CONSOLE_HAS_METHOD (tty, mark_console);
-diff -ru xemacs-21.5.24.orig/src/console-x.c xemacs-21.5.24/src/console-x.c
---- xemacs-21.5.24.orig/src/console-x.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/console-x.c	2005-12-27 18:49:58.000000000 +0100
-@@ -390,6 +390,14 @@
+--- xemacs-21.5.27.20070507/src/console-x.c
++++ xemacs-21.5.27.20070507/src/console-x.c
+@@ -392,6 +392,14 @@
  {
    INITIALIZE_CONSOLE_TYPE (x, "x", "console-x-p");
  
@@ -111,9 +105,8 @@ diff -ru xemacs-21.5.24.orig/src/console-x.c xemacs-21.5.24/src/console-x.c
    CONSOLE_HAS_METHOD (x, semi_canonicalize_console_connection);
    CONSOLE_HAS_METHOD (x, canonicalize_console_connection);
    CONSOLE_HAS_METHOD (x, semi_canonicalize_device_connection);
-diff -ru xemacs-21.5.24.orig/src/device-gtk.c xemacs-21.5.24/src/device-gtk.c
---- xemacs-21.5.24.orig/src/device-gtk.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/device-gtk.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/device-gtk.c
++++ xemacs-21.5.27.20070507/src/device-gtk.c
 @@ -718,6 +718,14 @@
  void
  console_type_create_device_gtk (void)
@@ -129,9 +122,8 @@ diff -ru xemacs-21.5.24.orig/src/device-gtk.c xemacs-21.5.24/src/device-gtk.c
    CONSOLE_HAS_METHOD (gtk, init_device);
    CONSOLE_HAS_METHOD (gtk, finish_init_device);
    CONSOLE_HAS_METHOD (gtk, mark_device);
-diff -ru xemacs-21.5.24.orig/src/device-msw.c xemacs-21.5.24/src/device-msw.c
---- xemacs-21.5.24.orig/src/device-msw.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/device-msw.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/device-msw.c
++++ xemacs-21.5.27.20070507/src/device-msw.c
 @@ -1404,6 +1404,14 @@
  void
  console_type_create_device_mswindows (void)
@@ -147,9 +139,8 @@ diff -ru xemacs-21.5.24.orig/src/device-msw.c xemacs-21.5.24/src/device-msw.c
    CONSOLE_HAS_METHOD (mswindows, init_device);
    CONSOLE_HAS_METHOD (mswindows, finish_init_device);
    CONSOLE_HAS_METHOD (mswindows, mark_device);
-diff -ru xemacs-21.5.24.orig/src/device-tty.c xemacs-21.5.24/src/device-tty.c
---- xemacs-21.5.24.orig/src/device-tty.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/device-tty.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/device-tty.c
++++ xemacs-21.5.27.20070507/src/device-tty.c
 @@ -218,6 +218,14 @@
  void
  console_type_create_device_tty (void)
@@ -165,10 +156,9 @@ diff -ru xemacs-21.5.24.orig/src/device-tty.c xemacs-21.5.24/src/device-tty.c
    /* device methods */
    CONSOLE_HAS_METHOD (tty, init_device);
  #ifndef NEW_GC
-diff -ru xemacs-21.5.24.orig/src/device-x.c xemacs-21.5.24/src/device-x.c
---- xemacs-21.5.24.orig/src/device-x.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/device-x.c	2005-12-27 18:49:58.000000000 +0100
-@@ -2106,6 +2106,15 @@
+--- xemacs-21.5.27.20070507/src/device-x.c
++++ xemacs-21.5.27.20070507/src/device-x.c
+@@ -2153,6 +2153,15 @@
  console_type_create_device_x (void)
  {
    reinit_console_type_create_device_x ();
@@ -184,9 +174,8 @@ diff -ru xemacs-21.5.24.orig/src/device-x.c xemacs-21.5.24/src/device-x.c
    CONSOLE_HAS_METHOD (x, init_device);
    CONSOLE_HAS_METHOD (x, finish_init_device);
    CONSOLE_HAS_METHOD (x, mark_device);
-diff -ru xemacs-21.5.24.orig/src/dialog-gtk.c xemacs-21.5.24/src/dialog-gtk.c
---- xemacs-21.5.24.orig/src/dialog-gtk.c	2004-09-20 21:19:38.000000000 +0200
-+++ xemacs-21.5.24/src/dialog-gtk.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/dialog-gtk.c
++++ xemacs-21.5.27.20070507/src/dialog-gtk.c
 @@ -54,6 +54,14 @@
  void
  console_type_create_dialog_gtk (void)
@@ -202,9 +191,8 @@ diff -ru xemacs-21.5.24.orig/src/dialog-gtk.c xemacs-21.5.24/src/dialog-gtk.c
    CONSOLE_HAS_METHOD (gtk, make_dialog_box_internal);
  }
  
-diff -ru xemacs-21.5.24.orig/src/dialog-msw.c xemacs-21.5.24/src/dialog-msw.c
---- xemacs-21.5.24.orig/src/dialog-msw.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/dialog-msw.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/dialog-msw.c
++++ xemacs-21.5.27.20070507/src/dialog-msw.c
 @@ -808,6 +808,14 @@
  void
  console_type_create_dialog_mswindows (void)
@@ -220,9 +208,8 @@ diff -ru xemacs-21.5.24.orig/src/dialog-msw.c xemacs-21.5.24/src/dialog-msw.c
    CONSOLE_HAS_METHOD (mswindows, make_dialog_box_internal);
  }
  
-diff -ru xemacs-21.5.24.orig/src/dialog-x.c xemacs-21.5.24/src/dialog-x.c
---- xemacs-21.5.24.orig/src/dialog-x.c	2004-09-20 21:19:38.000000000 +0200
-+++ xemacs-21.5.24/src/dialog-x.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/dialog-x.c
++++ xemacs-21.5.27.20070507/src/dialog-x.c
 @@ -302,6 +302,14 @@
  void
  console_type_create_dialog_x (void)
@@ -238,10 +225,9 @@ diff -ru xemacs-21.5.24.orig/src/dialog-x.c xemacs-21.5.24/src/dialog-x.c
    CONSOLE_HAS_METHOD (x, make_dialog_box_internal);
  }
  
-diff -ru xemacs-21.5.24.orig/src/elhash.c xemacs-21.5.24/src/elhash.c
---- xemacs-21.5.24.orig/src/elhash.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/elhash.c	2005-12-27 18:49:58.000000000 +0100
-@@ -905,6 +905,30 @@
+--- xemacs-21.5.27.20070507/src/elhash.c
++++ xemacs-21.5.27.20070507/src/elhash.c
+@@ -916,6 +916,30 @@
    structure_type_create_hash_table_structure_name (Qhashtable); /* compat */
  }
  
@@ -272,10 +258,9 @@ diff -ru xemacs-21.5.24.orig/src/elhash.c xemacs-21.5.24/src/elhash.c
  
  /************************************************************************/
  /*		Definition of Lisp-visible methods			*/
-diff -ru xemacs-21.5.24.orig/src/emacs.c xemacs-21.5.24/src/emacs.c
---- xemacs-21.5.24.orig/src/emacs.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/emacs.c	2005-12-27 18:49:58.000000000 +0100
-@@ -2497,6 +2497,136 @@
+--- xemacs-21.5.27.20070507/src/emacs.c
++++ xemacs-21.5.27.20070507/src/emacs.c
+@@ -2501,6 +2501,136 @@
  	 non-initialized case. */
        inhibit_non_essential_conversion_operations = 0;
  
@@ -412,9 +397,8 @@ diff -ru xemacs-21.5.24.orig/src/emacs.c xemacs-21.5.24/src/emacs.c
  #ifdef PDUMP
        if (!restart)	      /* after successful pdump_load()
  				 (note, we are inside ifdef PDUMP) */
-diff -ru xemacs-21.5.24.orig/src/event-msw.c xemacs-21.5.24/src/event-msw.c
---- xemacs-21.5.24.orig/src/event-msw.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/event-msw.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/event-msw.c
++++ xemacs-21.5.27.20070507/src/event-msw.c
 @@ -5155,6 +5155,14 @@
  void
  lstream_type_create_mswindows_selectable (void)
@@ -430,10 +414,9 @@ diff -ru xemacs-21.5.24.orig/src/event-msw.c xemacs-21.5.24/src/event-msw.c
  #ifndef CYGWIN
    init_slurp_stream ();
    init_shove_stream ();
-diff -ru xemacs-21.5.24.orig/src/faces.c xemacs-21.5.24/src/faces.c
---- xemacs-21.5.24.orig/src/faces.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/faces.c	2005-12-27 18:49:58.000000000 +0100
-@@ -1948,6 +1948,18 @@
+--- xemacs-21.5.27.20070507/src/faces.c
++++ xemacs-21.5.27.20070507/src/faces.c
+@@ -2149,6 +2149,18 @@
    define_structure_type_keyword (st, Qname, face_name_validate);
  }
  
@@ -452,10 +435,9 @@ diff -ru xemacs-21.5.24.orig/src/faces.c xemacs-21.5.24/src/faces.c
  void
  vars_of_faces (void)
  {
-diff -ru xemacs-21.5.24.orig/src/file-coding.c xemacs-21.5.24/src/file-coding.c
---- xemacs-21.5.24.orig/src/file-coding.c	2005-12-27 18:12:06.000000000 +0100
-+++ xemacs-21.5.24/src/file-coding.c	2005-12-27 18:49:58.000000000 +0100
-@@ -4445,6 +4445,14 @@
+--- xemacs-21.5.27.20070507/src/file-coding.c
++++ xemacs-21.5.27.20070507/src/file-coding.c
+@@ -4465,6 +4465,14 @@
  void
  lstream_type_create_file_coding (void)
  {
@@ -470,10 +452,9 @@ diff -ru xemacs-21.5.24.orig/src/file-coding.c xemacs-21.5.24/src/file-coding.c
    LSTREAM_HAS_METHOD (coding, reader);
    LSTREAM_HAS_METHOD (coding, writer);
    LSTREAM_HAS_METHOD (coding, rewinder);
-diff -ru xemacs-21.5.24.orig/src/frame-gtk.c xemacs-21.5.24/src/frame-gtk.c
---- xemacs-21.5.24.orig/src/frame-gtk.c	2005-12-27 18:12:07.000000000 +0100
-+++ xemacs-21.5.24/src/frame-gtk.c	2005-12-27 18:49:58.000000000 +0100
-@@ -1485,6 +1485,14 @@
+--- xemacs-21.5.27.20070507/src/frame-gtk.c
++++ xemacs-21.5.27.20070507/src/frame-gtk.c
+@@ -1496,6 +1496,14 @@
  void
  console_type_create_frame_gtk (void)
  {
@@ -488,9 +469,8 @@ diff -ru xemacs-21.5.24.orig/src/frame-gtk.c xemacs-21.5.24/src/frame-gtk.c
    /* frame methods */
    CONSOLE_HAS_METHOD (gtk, init_frame_1);
    CONSOLE_HAS_METHOD (gtk, init_frame_2);
-diff -ru xemacs-21.5.24.orig/src/frame-msw.c xemacs-21.5.24/src/frame-msw.c
---- xemacs-21.5.24.orig/src/frame-msw.c	2005-12-27 18:12:07.000000000 +0100
-+++ xemacs-21.5.24/src/frame-msw.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/frame-msw.c
++++ xemacs-21.5.27.20070507/src/frame-msw.c
 @@ -1152,6 +1152,14 @@
  void
  console_type_create_frame_mswindows (void)
@@ -506,9 +486,8 @@ diff -ru xemacs-21.5.24.orig/src/frame-msw.c xemacs-21.5.24/src/frame-msw.c
    /* Display frames */
    CONSOLE_HAS_METHOD (mswindows, init_frame_1);
    CONSOLE_HAS_METHOD (mswindows, init_frame_2);
-diff -ru xemacs-21.5.24.orig/src/frame-tty.c xemacs-21.5.24/src/frame-tty.c
---- xemacs-21.5.24.orig/src/frame-tty.c	2005-12-27 18:12:07.000000000 +0100
-+++ xemacs-21.5.24/src/frame-tty.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/frame-tty.c
++++ xemacs-21.5.27.20070507/src/frame-tty.c
 @@ -217,6 +217,14 @@
  void
  console_type_create_frame_tty (void)
@@ -524,10 +503,9 @@ diff -ru xemacs-21.5.24.orig/src/frame-tty.c xemacs-21.5.24/src/frame-tty.c
    CONSOLE_HAS_METHOD (tty, init_frame_1);
    CONSOLE_HAS_METHOD (tty, init_frame_3);
    CONSOLE_HAS_METHOD (tty, after_init_frame);
-diff -ru xemacs-21.5.24.orig/src/frame-x.c xemacs-21.5.24/src/frame-x.c
---- xemacs-21.5.24.orig/src/frame-x.c	2005-12-27 18:12:07.000000000 +0100
-+++ xemacs-21.5.24/src/frame-x.c	2005-12-27 18:49:58.000000000 +0100
-@@ -2785,6 +2785,14 @@
+--- xemacs-21.5.27.20070507/src/frame-x.c
++++ xemacs-21.5.27.20070507/src/frame-x.c
+@@ -2815,6 +2815,14 @@
  void
  console_type_create_frame_x (void)
  {
@@ -542,10 +520,9 @@ diff -ru xemacs-21.5.24.orig/src/frame-x.c xemacs-21.5.24/src/frame-x.c
    /* frame methods */
    CONSOLE_HAS_METHOD (x, init_frame_1);
    CONSOLE_HAS_METHOD (x, init_frame_2);
-diff -ru xemacs-21.5.24.orig/src/glyphs-eimage.c xemacs-21.5.24/src/glyphs-eimage.c
---- xemacs-21.5.24.orig/src/glyphs-eimage.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/glyphs-eimage.c	2005-12-27 18:49:58.000000000 +0100
-@@ -1396,8 +1396,54 @@
+--- xemacs-21.5.27.20070507/src/glyphs-eimage.c
++++ xemacs-21.5.27.20070507/src/glyphs-eimage.c
+@@ -1419,8 +1419,54 @@
    IIFORMAT_VALID_KEYWORD (tiff, Q_data, check_valid_string);
    IIFORMAT_VALID_KEYWORD (tiff, Q_file, check_valid_string);
  #endif
@@ -600,9 +577,8 @@ diff -ru xemacs-21.5.24.orig/src/glyphs-eimage.c xemacs-21.5.24/src/glyphs-eimag
  
  void
  vars_of_glyphs_eimage (void)
-diff -ru xemacs-21.5.24.orig/src/glyphs-gtk.c xemacs-21.5.24/src/glyphs-gtk.c
---- xemacs-21.5.24.orig/src/glyphs-gtk.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/glyphs-gtk.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/glyphs-gtk.c
++++ xemacs-21.5.27.20070507/src/glyphs-gtk.c
 @@ -2776,6 +2776,14 @@
  void
  console_type_create_glyphs_gtk (void)
@@ -697,9 +673,8 @@ diff -ru xemacs-21.5.24.orig/src/glyphs-gtk.c xemacs-21.5.24/src/glyphs-gtk.c
  void
  vars_of_glyphs_gtk (void)
  {
-diff -ru xemacs-21.5.24.orig/src/glyphs-msw.c xemacs-21.5.24/src/glyphs-msw.c
---- xemacs-21.5.24.orig/src/glyphs-msw.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/glyphs-msw.c	2005-12-27 18:49:58.000000000 +0100
+--- xemacs-21.5.27.20070507/src/glyphs-msw.c
++++ xemacs-21.5.27.20070507/src/glyphs-msw.c
 @@ -2952,6 +2952,14 @@
  void
  console_type_create_glyphs_mswindows (void)
@@ -748,9 +723,8 @@ diff -ru xemacs-21.5.24.orig/src/glyphs-msw.c xemacs-21.5.24/src/glyphs-msw.c
  void
  vars_of_glyphs_mswindows (void)
  {
-diff -ru xemacs-21.5.24.orig/src/glyphs-widget.c xemacs-21.5.24/src/glyphs-widget.c
---- xemacs-21.5.24.orig/src/glyphs-widget.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/glyphs-widget.c	2005-12-27 18:52:15.000000000 +0100
+--- xemacs-21.5.27.20070507/src/glyphs-widget.c
++++ xemacs-21.5.27.20070507/src/glyphs-widget.c
 @@ -1746,10 +1746,58 @@
    IIFORMAT_VALID_KEYWORD (type, Q_face, check_valid_face);		      \
  } while (0)
@@ -1094,9 +1068,8 @@ diff -ru xemacs-21.5.24.orig/src/glyphs-widget.c xemacs-21.5.24/src/glyphs-widge
  void
  reinit_vars_of_glyphs_widget (void)
  {
-diff -ru xemacs-21.5.24.orig/src/glyphs-x.c xemacs-21.5.24/src/glyphs-x.c
---- xemacs-21.5.24.orig/src/glyphs-x.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/glyphs-x.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/glyphs-x.c
++++ xemacs-21.5.27.20070507/src/glyphs-x.c
 @@ -2859,6 +2859,14 @@
  void
  console_type_create_glyphs_x (void)
@@ -1177,9 +1150,8 @@ diff -ru xemacs-21.5.24.orig/src/glyphs-x.c xemacs-21.5.24/src/glyphs-x.c
  void
  vars_of_glyphs_x (void)
  {
-diff -ru xemacs-21.5.24.orig/src/glyphs.c xemacs-21.5.24/src/glyphs.c
---- xemacs-21.5.24.orig/src/glyphs.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/glyphs.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/glyphs.c
++++ xemacs-21.5.27.20070507/src/glyphs.c
 @@ -5252,6 +5252,14 @@
  
    INITIALIZE_SPECIFIER_TYPE_WITH_DATA (image, "image", "imagep");
@@ -1296,9 +1268,8 @@ diff -ru xemacs-21.5.24.orig/src/glyphs.c xemacs-21.5.24/src/glyphs.c
  void
  complex_vars_of_glyphs (void)
  {
-diff -ru xemacs-21.5.24.orig/src/glyphs.h xemacs-21.5.24/src/glyphs.h
---- xemacs-21.5.24.orig/src/glyphs.h	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/glyphs.h	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/glyphs.h
++++ xemacs-21.5.27.20070507/src/glyphs.h
 @@ -267,6 +267,22 @@
  		entry);						\
    } while (0)
@@ -1322,9 +1293,8 @@ diff -ru xemacs-21.5.24.orig/src/glyphs.h xemacs-21.5.24/src/glyphs.h
  #define IIFORMAT_VALID_KEYWORD(format, keyw, validate_fun)	\
  IIFORMAT_VALID_GENERIC_KEYWORD(format, keyw, validate_fun, 1, 0)
  
-diff -ru xemacs-21.5.24.orig/src/gutter.c xemacs-21.5.24/src/gutter.c
---- xemacs-21.5.24.orig/src/gutter.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/gutter.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/gutter.c
++++ xemacs-21.5.27.20070507/src/gutter.c
 @@ -1216,6 +1216,19 @@
    SPECIFIER_HAS_METHOD (gutter_visible, validate);
  }
@@ -1396,10 +1366,9 @@ diff -ru xemacs-21.5.24.orig/src/gutter.c xemacs-21.5.24/src/gutter.c
 +			    right_gutter_specs_changed, 0);
 +}
 +#endif
-diff -ru xemacs-21.5.24.orig/src/lisp.h xemacs-21.5.24/src/lisp.h
---- xemacs-21.5.24.orig/src/lisp.h	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/lisp.h	2005-12-27 18:49:59.000000000 +0100
-@@ -3303,6 +3303,20 @@
+--- xemacs-21.5.27.20070507/src/lisp.h
++++ xemacs-21.5.27.20070507/src/lisp.h
+@@ -3105,6 +3105,20 @@
  #define CONCHECK_EPHEMERON(x) CONCHECK_RECORD (x, ephemeron)
  
  
@@ -1420,10 +1389,9 @@ diff -ru xemacs-21.5.24.orig/src/lisp.h xemacs-21.5.24/src/lisp.h
  /*---------------------------- weak lists ------------------------------*/
  
  enum weak_list_type
-diff -ru xemacs-21.5.24.orig/src/lread.c xemacs-21.5.24/src/lread.c
---- xemacs-21.5.24.orig/src/lread.c	2005-07-13 01:26:49.000000000 +0200
-+++ xemacs-21.5.24/src/lread.c	2005-12-27 18:49:59.000000000 +0100
-@@ -2079,6 +2079,49 @@
+--- xemacs-21.5.27.20070507/src/lread.c
++++ xemacs-21.5.27.20070507/src/lread.c
+@@ -2125,6 +2125,49 @@
    Dynarr_add (st->keywords, en);
  }
  
@@ -1473,9 +1441,8 @@ diff -ru xemacs-21.5.24.orig/src/lread.c xemacs-21.5.24/src/lread.c
  static struct structure_type *
  recognized_structure_type (Lisp_Object type)
  {
-diff -ru xemacs-21.5.24.orig/src/lstream.c xemacs-21.5.24/src/lstream.c
---- xemacs-21.5.24.orig/src/lstream.c	2005-12-27 18:12:09.000000000 +0100
-+++ xemacs-21.5.24/src/lstream.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/lstream.c
++++ xemacs-21.5.27.20070507/src/lstream.c
 @@ -1829,6 +1829,14 @@
  void
  lstream_type_create (void)
@@ -1491,9 +1458,8 @@ diff -ru xemacs-21.5.24.orig/src/lstream.c xemacs-21.5.24/src/lstream.c
    LSTREAM_HAS_METHOD (stdio, reader);
    LSTREAM_HAS_METHOD (stdio, writer);
    LSTREAM_HAS_METHOD (stdio, rewinder);
-diff -ru xemacs-21.5.24.orig/src/menubar-gtk.c xemacs-21.5.24/src/menubar-gtk.c
---- xemacs-21.5.24.orig/src/menubar-gtk.c	2005-01-25 00:34:03.000000000 +0100
-+++ xemacs-21.5.24/src/menubar-gtk.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/menubar-gtk.c
++++ xemacs-21.5.27.20070507/src/menubar-gtk.c
 @@ -1469,6 +1469,14 @@
  void
  console_type_create_menubar_gtk (void)
@@ -1509,9 +1475,8 @@ diff -ru xemacs-21.5.24.orig/src/menubar-gtk.c xemacs-21.5.24/src/menubar-gtk.c
    CONSOLE_HAS_METHOD (gtk, update_frame_menubars);
    CONSOLE_HAS_METHOD (gtk, free_frame_menubars);
    CONSOLE_HAS_METHOD (gtk, popup_menu);
-diff -ru xemacs-21.5.24.orig/src/menubar-msw.c xemacs-21.5.24/src/menubar-msw.c
---- xemacs-21.5.24.orig/src/menubar-msw.c	2005-01-25 00:34:03.000000000 +0100
-+++ xemacs-21.5.24/src/menubar-msw.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/menubar-msw.c
++++ xemacs-21.5.27.20070507/src/menubar-msw.c
 @@ -891,6 +891,14 @@
  void
  console_type_create_menubar_mswindows (void)
@@ -1527,9 +1492,8 @@ diff -ru xemacs-21.5.24.orig/src/menubar-msw.c xemacs-21.5.24/src/menubar-msw.c
    CONSOLE_HAS_METHOD (mswindows, update_frame_menubars);
    CONSOLE_HAS_METHOD (mswindows, free_frame_menubars);
    CONSOLE_HAS_METHOD (mswindows, popup_menu);
-diff -ru xemacs-21.5.24.orig/src/menubar-x.c xemacs-21.5.24/src/menubar-x.c
---- xemacs-21.5.24.orig/src/menubar-x.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/menubar-x.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/menubar-x.c
++++ xemacs-21.5.27.20070507/src/menubar-x.c
 @@ -1361,6 +1361,14 @@
  void
  console_type_create_menubar_x (void)
@@ -1545,9 +1509,8 @@ diff -ru xemacs-21.5.24.orig/src/menubar-x.c xemacs-21.5.24/src/menubar-x.c
    CONSOLE_HAS_METHOD (x, update_frame_menubars);
    CONSOLE_HAS_METHOD (x, free_frame_menubars);
    CONSOLE_HAS_METHOD (x, popup_menu);
-diff -ru xemacs-21.5.24.orig/src/menubar.c xemacs-21.5.24/src/menubar.c
---- xemacs-21.5.24.orig/src/menubar.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/menubar.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/menubar.c
++++ xemacs-21.5.27.20070507/src/menubar.c
 @@ -785,6 +785,16 @@
  			 menubar_visible_p_changed_in_frame, 0);
  }
@@ -1565,9 +1528,8 @@ diff -ru xemacs-21.5.24.orig/src/menubar.c xemacs-21.5.24/src/menubar.c
  void
  complex_vars_of_menubar (void)
  {
-diff -ru xemacs-21.5.24.orig/src/native-gtk-toolbar.c xemacs-21.5.24/src/native-gtk-toolbar.c
---- xemacs-21.5.24.orig/src/native-gtk-toolbar.c	2005-01-25 00:34:04.000000000 +0100
-+++ xemacs-21.5.24/src/native-gtk-toolbar.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/native-gtk-toolbar.c
++++ xemacs-21.5.27.20070507/src/native-gtk-toolbar.c
 @@ -239,6 +239,14 @@
  void
  console_type_create_toolbar_gtk (void)
@@ -1583,10 +1545,9 @@ diff -ru xemacs-21.5.24.orig/src/native-gtk-toolbar.c xemacs-21.5.24/src/native-
    CONSOLE_HAS_METHOD (gtk, output_frame_toolbars);
    CONSOLE_HAS_METHOD (gtk, initialize_frame_toolbars);
  }
-diff -ru xemacs-21.5.24.orig/src/objects-gtk.c xemacs-21.5.24/src/objects-gtk.c
---- xemacs-21.5.24.orig/src/objects-gtk.c	2005-01-28 03:58:51.000000000 +0100
-+++ xemacs-21.5.24/src/objects-gtk.c	2005-12-27 18:49:59.000000000 +0100
-@@ -453,6 +453,14 @@
+--- xemacs-21.5.27.20070507/src/objects-gtk.c
++++ xemacs-21.5.27.20070507/src/objects-gtk.c
+@@ -405,6 +405,14 @@
  void
  console_type_create_objects_gtk (void)
  {
@@ -1601,10 +1562,9 @@ diff -ru xemacs-21.5.24.orig/src/objects-gtk.c xemacs-21.5.24/src/objects-gtk.c
    /* object methods */
  
    CONSOLE_HAS_METHOD (gtk, initialize_color_instance);
-diff -ru xemacs-21.5.24.orig/src/objects-msw.c xemacs-21.5.24/src/objects-msw.c
---- xemacs-21.5.24.orig/src/objects-msw.c	2005-01-28 03:58:51.000000000 +0100
-+++ xemacs-21.5.24/src/objects-msw.c	2005-12-27 18:49:59.000000000 +0100
-@@ -2244,6 +2244,14 @@
+--- xemacs-21.5.27.20070507/src/objects-msw.c
++++ xemacs-21.5.27.20070507/src/objects-msw.c
+@@ -2245,6 +2245,14 @@
  void
  console_type_create_objects_mswindows (void)
  {
@@ -1619,10 +1579,9 @@ diff -ru xemacs-21.5.24.orig/src/objects-msw.c xemacs-21.5.24/src/objects-msw.c
    /* object methods */
    CONSOLE_HAS_METHOD (mswindows, initialize_color_instance);
  /*  CONSOLE_HAS_METHOD (mswindows, mark_color_instance); */
-diff -ru xemacs-21.5.24.orig/src/objects-tty.c xemacs-21.5.24/src/objects-tty.c
---- xemacs-21.5.24.orig/src/objects-tty.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/objects-tty.c	2005-12-27 18:49:59.000000000 +0100
-@@ -416,6 +416,14 @@
+--- xemacs-21.5.27.20070507/src/objects-tty.c
++++ xemacs-21.5.27.20070507/src/objects-tty.c
+@@ -417,6 +417,14 @@
  void
  console_type_create_objects_tty (void)
  {
@@ -1637,10 +1596,9 @@ diff -ru xemacs-21.5.24.orig/src/objects-tty.c xemacs-21.5.24/src/objects-tty.c
    /* object methods */
    CONSOLE_HAS_METHOD (tty, initialize_color_instance);
    CONSOLE_HAS_METHOD (tty, mark_color_instance);
-diff -ru xemacs-21.5.24.orig/src/objects-x.c xemacs-21.5.24/src/objects-x.c
---- xemacs-21.5.24.orig/src/objects-x.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/objects-x.c	2005-12-27 18:49:59.000000000 +0100
-@@ -1473,6 +1473,14 @@
+--- xemacs-21.5.27.20070507/src/objects-x.c
++++ xemacs-21.5.27.20070507/src/objects-x.c
+@@ -908,6 +908,14 @@
  void
  console_type_create_objects_x (void)
  {
@@ -1655,10 +1613,9 @@ diff -ru xemacs-21.5.24.orig/src/objects-x.c xemacs-21.5.24/src/objects-x.c
    /* object methods */
  
    CONSOLE_HAS_METHOD (x, initialize_color_instance);
-diff -ru xemacs-21.5.24.orig/src/objects.c xemacs-21.5.24/src/objects.c
---- xemacs-21.5.24.orig/src/objects.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/objects.c	2005-12-27 18:49:59.000000000 +0100
-@@ -1183,6 +1183,14 @@
+--- xemacs-21.5.27.20070507/src/objects.c
++++ xemacs-21.5.27.20070507/src/objects.c
+@@ -1225,6 +1225,14 @@
    INITIALIZE_SPECIFIER_TYPE_WITH_DATA (face_boolean, "face-boolean",
  					 "face-boolean-specifier-p");
  
@@ -1673,9 +1630,8 @@ diff -ru xemacs-21.5.24.orig/src/objects.c xemacs-21.5.24/src/objects.c
    SPECIFIER_HAS_METHOD (color, instantiate);
    SPECIFIER_HAS_METHOD (font, instantiate);
    SPECIFIER_HAS_METHOD (face_boolean, instantiate);
-diff -ru xemacs-21.5.24.orig/src/process-nt.c xemacs-21.5.24/src/process-nt.c
---- xemacs-21.5.24.orig/src/process-nt.c	2005-01-28 03:36:26.000000000 +0100
-+++ xemacs-21.5.24/src/process-nt.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/process-nt.c
++++ xemacs-21.5.27.20070507/src/process-nt.c
 @@ -1581,6 +1581,14 @@
  void
  process_type_create_nt (void)
@@ -1691,10 +1647,9 @@ diff -ru xemacs-21.5.24.orig/src/process-nt.c xemacs-21.5.24/src/process-nt.c
    PROCESS_HAS_METHOD (nt, alloc_process_data);
    PROCESS_HAS_METHOD (nt, finalize_process_data);
    PROCESS_HAS_METHOD (nt, init_process);
-diff -ru xemacs-21.5.24.orig/src/process-unix.c xemacs-21.5.24/src/process-unix.c
---- xemacs-21.5.24.orig/src/process-unix.c	2005-02-04 05:06:34.000000000 +0100
-+++ xemacs-21.5.24/src/process-unix.c	2005-12-27 18:49:59.000000000 +0100
-@@ -2326,6 +2326,14 @@
+--- xemacs-21.5.27.20070507/src/process-unix.c
++++ xemacs-21.5.27.20070507/src/process-unix.c
+@@ -2329,6 +2329,14 @@
  void
  process_type_create_unix (void)
  {
@@ -1709,9 +1664,8 @@ diff -ru xemacs-21.5.24.orig/src/process-unix.c xemacs-21.5.24/src/process-unix.
    PROCESS_HAS_METHOD (unix, alloc_process_data);
  #ifdef SIGCHLD
    PROCESS_HAS_METHOD (unix, init_process);
-diff -ru xemacs-21.5.24.orig/src/ralloc.c xemacs-21.5.24/src/ralloc.c
---- xemacs-21.5.24.orig/src/ralloc.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/ralloc.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/ralloc.c
++++ xemacs-21.5.27.20070507/src/ralloc.c
 @@ -121,7 +121,11 @@
                         & ~(page_size - 1))
  #define ROUND_TO_PAGE(addr) (addr & (~(page_size - 1)))
@@ -1724,9 +1678,8 @@ diff -ru xemacs-21.5.24.orig/src/ralloc.c xemacs-21.5.24/src/ralloc.c
  #define MEM_ROUNDUP(addr) (((unsigned long int)(addr) + MEM_ALIGN - 1) \
  				   & ~(MEM_ALIGN - 1))
  
-diff -ru xemacs-21.5.24.orig/src/rangetab.c xemacs-21.5.24/src/rangetab.c
---- xemacs-21.5.24.orig/src/rangetab.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/rangetab.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/rangetab.c
++++ xemacs-21.5.27.20070507/src/rangetab.c
 @@ -910,3 +910,16 @@
    define_structure_type_keyword (st, Qdata, rangetab_data_validate);
    define_structure_type_keyword (st, Qtype, rangetab_type_validate);
@@ -1744,9 +1697,8 @@ diff -ru xemacs-21.5.24.orig/src/rangetab.c xemacs-21.5.24/src/rangetab.c
 +  reinit_structure_type_keyword (st, Qdata, rangetab_data_validate);
 +}
 +#endif
-diff -ru xemacs-21.5.24.orig/src/redisplay-gtk.c xemacs-21.5.24/src/redisplay-gtk.c
---- xemacs-21.5.24.orig/src/redisplay-gtk.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/redisplay-gtk.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/redisplay-gtk.c
++++ xemacs-21.5.27.20070507/src/redisplay-gtk.c
 @@ -1717,6 +1717,14 @@
  void
  console_type_create_redisplay_gtk (void)
@@ -1762,9 +1714,8 @@ diff -ru xemacs-21.5.24.orig/src/redisplay-gtk.c xemacs-21.5.24/src/redisplay-gt
    /* redisplay methods */
    CONSOLE_HAS_METHOD (gtk, text_width);
    CONSOLE_HAS_METHOD (gtk, output_display_block);
-diff -ru xemacs-21.5.24.orig/src/redisplay-msw.c xemacs-21.5.24/src/redisplay-msw.c
---- xemacs-21.5.24.orig/src/redisplay-msw.c	2005-01-25 00:34:07.000000000 +0100
-+++ xemacs-21.5.24/src/redisplay-msw.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/redisplay-msw.c
++++ xemacs-21.5.27.20070507/src/redisplay-msw.c
 @@ -1246,6 +1246,14 @@
  void
  console_type_create_redisplay_mswindows (void)
@@ -1780,10 +1731,9 @@ diff -ru xemacs-21.5.24.orig/src/redisplay-msw.c xemacs-21.5.24/src/redisplay-ms
    /* redisplay methods - display*/
    CONSOLE_HAS_METHOD (mswindows, text_width);
    CONSOLE_HAS_METHOD (mswindows, output_display_block);
-diff -ru xemacs-21.5.24.orig/src/redisplay-tty.c xemacs-21.5.24/src/redisplay-tty.c
---- xemacs-21.5.24.orig/src/redisplay-tty.c	2005-01-25 00:34:07.000000000 +0100
-+++ xemacs-21.5.24/src/redisplay-tty.c	2005-12-27 18:49:59.000000000 +0100
-@@ -1496,6 +1496,14 @@
+--- xemacs-21.5.27.20070507/src/redisplay-tty.c
++++ xemacs-21.5.27.20070507/src/redisplay-tty.c
+@@ -1506,6 +1506,14 @@
  void
  console_type_create_redisplay_tty (void)
  {
@@ -1798,10 +1748,9 @@ diff -ru xemacs-21.5.24.orig/src/redisplay-tty.c xemacs-21.5.24/src/redisplay-tt
    /* redisplay methods */
    CONSOLE_HAS_METHOD (tty, text_width);
    CONSOLE_HAS_METHOD (tty, output_display_block);
-diff -ru xemacs-21.5.24.orig/src/redisplay-x.c xemacs-21.5.24/src/redisplay-x.c
---- xemacs-21.5.24.orig/src/redisplay-x.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/redisplay-x.c	2005-12-27 18:49:59.000000000 +0100
-@@ -2270,6 +2270,14 @@
+--- xemacs-21.5.27.20070507/src/redisplay-x.c
++++ xemacs-21.5.27.20070507/src/redisplay-x.c
+@@ -2386,6 +2386,14 @@
  void
  console_type_create_redisplay_x (void)
  {
@@ -1816,10 +1765,9 @@ diff -ru xemacs-21.5.24.orig/src/redisplay-x.c xemacs-21.5.24/src/redisplay-x.c
    /* redisplay methods */
    CONSOLE_HAS_METHOD (x, text_width);
    CONSOLE_HAS_METHOD (x, output_display_block);
-diff -ru xemacs-21.5.24.orig/src/redisplay.c xemacs-21.5.24/src/redisplay.c
---- xemacs-21.5.24.orig/src/redisplay.c	2005-12-27 18:12:13.000000000 +0100
-+++ xemacs-21.5.24/src/redisplay.c	2005-12-27 18:49:59.000000000 +0100
-@@ -10081,3 +10081,26 @@
+--- xemacs-21.5.27.20070507/src/redisplay.c
++++ xemacs-21.5.27.20070507/src/redisplay.c
+@@ -10084,3 +10084,26 @@
  			 0, 0, 0);
  
  }
@@ -1846,10 +1794,19 @@ diff -ru xemacs-21.5.24.orig/src/redisplay.c xemacs-21.5.24/src/redisplay.c
 +			    text_cursor_visible_p_changed, 0);
 +}
 +#endif
-diff -ru xemacs-21.5.24.orig/src/scrollbar-gtk.c xemacs-21.5.24/src/scrollbar-gtk.c
---- xemacs-21.5.24.orig/src/scrollbar-gtk.c	2005-12-27 18:12:14.000000000 +0100
-+++ xemacs-21.5.24/src/scrollbar-gtk.c	2005-12-27 18:49:59.000000000 +0100
-@@ -501,6 +501,14 @@
+--- xemacs-21.5.27.20070507/src/s/linux.h
++++ xemacs-21.5.27.20070507/src/s/linux.h
+@@ -208,6 +208,6 @@
+ 
+ /* The in-built malloc does not work on PPC64 or Alpha, so use the system
+    malloc for now. */
+-#if defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__)
++#if defined(__powerpc64__) || defined(__alpha__)
+ #define SYSTEM_MALLOC
+ #endif
+--- xemacs-21.5.27.20070507/src/scrollbar-gtk.c
++++ xemacs-21.5.27.20070507/src/scrollbar-gtk.c
+@@ -503,6 +503,14 @@
  void
  console_type_create_scrollbar_gtk (void)
  {
@@ -1864,10 +1821,9 @@ diff -ru xemacs-21.5.24.orig/src/scrollbar-gtk.c xemacs-21.5.24/src/scrollbar-gt
    CONSOLE_HAS_METHOD (gtk, inhibit_scrollbar_slider_size_change);
    CONSOLE_HAS_METHOD (gtk, free_scrollbar_instance);
    CONSOLE_HAS_METHOD (gtk, release_scrollbar_instance);
-diff -ru xemacs-21.5.24.orig/src/scrollbar-msw.c xemacs-21.5.24/src/scrollbar-msw.c
---- xemacs-21.5.24.orig/src/scrollbar-msw.c	2005-12-27 18:12:14.000000000 +0100
-+++ xemacs-21.5.24/src/scrollbar-msw.c	2005-12-27 18:49:59.000000000 +0100
-@@ -471,6 +471,14 @@
+--- xemacs-21.5.27.20070507/src/scrollbar-msw.c
++++ xemacs-21.5.27.20070507/src/scrollbar-msw.c
+@@ -473,6 +473,14 @@
  void
  console_type_create_scrollbar_mswindows (void)
  {
@@ -1882,10 +1838,9 @@ diff -ru xemacs-21.5.24.orig/src/scrollbar-msw.c xemacs-21.5.24/src/scrollbar-ms
    CONSOLE_HAS_METHOD (mswindows, create_scrollbar_instance);
    CONSOLE_HAS_METHOD (mswindows, free_scrollbar_instance);
    CONSOLE_HAS_METHOD (mswindows, release_scrollbar_instance);
-diff -ru xemacs-21.5.24.orig/src/scrollbar-x.c xemacs-21.5.24/src/scrollbar-x.c
---- xemacs-21.5.24.orig/src/scrollbar-x.c	2005-12-27 18:12:14.000000000 +0100
-+++ xemacs-21.5.24/src/scrollbar-x.c	2005-12-27 18:49:59.000000000 +0100
-@@ -722,6 +722,14 @@
+--- xemacs-21.5.27.20070507/src/scrollbar-x.c
++++ xemacs-21.5.27.20070507/src/scrollbar-x.c
+@@ -724,6 +724,14 @@
  void
  console_type_create_scrollbar_x (void)
  {
@@ -1900,9 +1855,8 @@ diff -ru xemacs-21.5.24.orig/src/scrollbar-x.c xemacs-21.5.24/src/scrollbar-x.c
    CONSOLE_HAS_METHOD (x, inhibit_scrollbar_slider_size_change);
    CONSOLE_HAS_METHOD (x, free_scrollbar_instance);
    CONSOLE_HAS_METHOD (x, release_scrollbar_instance);
-diff -ru xemacs-21.5.24.orig/src/scrollbar.c xemacs-21.5.24/src/scrollbar.c
---- xemacs-21.5.24.orig/src/scrollbar.c	2005-12-27 18:12:14.000000000 +0100
-+++ xemacs-21.5.24/src/scrollbar.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/scrollbar.c
++++ xemacs-21.5.27.20070507/src/scrollbar.c
 @@ -1087,6 +1087,33 @@
  			 frame_size_slipped, 0);
  }
@@ -1937,9 +1891,8 @@ diff -ru xemacs-21.5.24.orig/src/scrollbar.c xemacs-21.5.24/src/scrollbar.c
  void
  complex_vars_of_scrollbar (void)
  {
-diff -ru xemacs-21.5.24.orig/src/select-gtk.c xemacs-21.5.24/src/select-gtk.c
---- xemacs-21.5.24.orig/src/select-gtk.c	2005-02-28 21:21:50.000000000 +0100
-+++ xemacs-21.5.24/src/select-gtk.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/select-gtk.c
++++ xemacs-21.5.27.20070507/src/select-gtk.c
 @@ -484,6 +484,14 @@
  void
  console_type_create_select_gtk (void)
@@ -1955,10 +1908,9 @@ diff -ru xemacs-21.5.24.orig/src/select-gtk.c xemacs-21.5.24/src/select-gtk.c
    CONSOLE_HAS_METHOD (gtk, own_selection);
    CONSOLE_HAS_METHOD (gtk, disown_selection);
    CONSOLE_HAS_METHOD (gtk, selection_exists_p);
-diff -ru xemacs-21.5.24.orig/src/select-x.c xemacs-21.5.24/src/select-x.c
---- xemacs-21.5.24.orig/src/select-x.c	2005-03-02 19:31:57.000000000 +0100
-+++ xemacs-21.5.24/src/select-x.c	2005-12-27 18:49:59.000000000 +0100
-@@ -1493,6 +1493,14 @@
+--- xemacs-21.5.27.20070507/src/select-x.c
++++ xemacs-21.5.27.20070507/src/select-x.c
+@@ -1533,6 +1533,14 @@
  void
  console_type_create_select_x (void)
  {
@@ -1973,10 +1925,9 @@ diff -ru xemacs-21.5.24.orig/src/select-x.c xemacs-21.5.24/src/select-x.c
    CONSOLE_HAS_METHOD (x, own_selection);
    CONSOLE_HAS_METHOD (x, disown_selection);
    CONSOLE_HAS_METHOD (x, get_foreign_selection);
-diff -ru xemacs-21.5.24.orig/src/specifier.c xemacs-21.5.24/src/specifier.c
---- xemacs-21.5.24.orig/src/specifier.c	2005-12-27 18:12:14.000000000 +0100
-+++ xemacs-21.5.24/src/specifier.c	2005-12-27 18:49:59.000000000 +0100
-@@ -3034,6 +3034,24 @@
+--- xemacs-21.5.27.20070507/src/specifier.c
++++ xemacs-21.5.27.20070507/src/specifier.c
+@@ -3452,6 +3452,24 @@
    recompute_cached_specifier_everywhere (specifier);
  }
  
@@ -2001,7 +1952,7 @@ diff -ru xemacs-21.5.24.orig/src/specifier.c xemacs-21.5.24/src/specifier.c
  static void
  recompute_one_cached_specifier_in_window (Lisp_Object specifier,
  					  struct window *w)
-@@ -3475,6 +3493,20 @@
+@@ -3895,6 +3913,20 @@
    SPECIFIER_HAS_METHOD (display_table, validate);
  }
  
@@ -2022,9 +1973,8 @@ diff -ru xemacs-21.5.24.orig/src/specifier.c xemacs-21.5.24/src/specifier.c
  void
  reinit_specifier_type_create (void)
  {
-diff -ru xemacs-21.5.24.orig/src/specifier.h xemacs-21.5.24/src/specifier.h
---- xemacs-21.5.24.orig/src/specifier.h	2005-12-27 18:12:14.000000000 +0100
-+++ xemacs-21.5.24/src/specifier.h	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/specifier.h
++++ xemacs-21.5.27.20070507/src/specifier.h
 @@ -517,6 +517,15 @@
  			    (Lisp_Object specifier, struct frame *f,
  			     Lisp_Object oldval),
@@ -2041,10 +1991,9 @@ diff -ru xemacs-21.5.24.orig/src/specifier.h xemacs-21.5.24/src/specifier.h
  void set_specifier_fallback (Lisp_Object specifier,
  			     Lisp_Object fallback);
  void recompute_all_cached_specifiers_in_window (struct window *w);
-diff -ru xemacs-21.5.24.orig/src/symsinit.h xemacs-21.5.24/src/symsinit.h
---- xemacs-21.5.24.orig/src/symsinit.h	2005-12-27 18:12:14.000000000 +0100
-+++ xemacs-21.5.24/src/symsinit.h	2005-12-27 18:49:59.000000000 +0100
-@@ -560,4 +560,82 @@
+--- xemacs-21.5.27.20070507/src/symsinit.h
++++ xemacs-21.5.27.20070507/src/symsinit.h
+@@ -561,4 +561,82 @@
     interactions with the supporting libraries. */
  void init_number (void);
  
@@ -2127,9 +2076,8 @@ diff -ru xemacs-21.5.24.orig/src/symsinit.h xemacs-21.5.24/src/symsinit.h
 +#endif /* __ia64__ */
 +
  #endif /* INCLUDED_symsinit_h_ */
-diff -ru xemacs-21.5.24.orig/src/toolbar-gtk.c xemacs-21.5.24/src/toolbar-gtk.c
---- xemacs-21.5.24.orig/src/toolbar-gtk.c	2004-09-20 21:20:03.000000000 +0200
-+++ xemacs-21.5.24/src/toolbar-gtk.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/toolbar-gtk.c
++++ xemacs-21.5.27.20070507/src/toolbar-gtk.c
 @@ -63,6 +63,14 @@
  void
  console_type_create_toolbar_gtk (void)
@@ -2145,9 +2093,8 @@ diff -ru xemacs-21.5.24.orig/src/toolbar-gtk.c xemacs-21.5.24/src/toolbar-gtk.c
    CONSOLE_HAS_METHOD (gtk, output_frame_toolbars);
    CONSOLE_HAS_METHOD (gtk, clear_frame_toolbars);
    CONSOLE_HAS_METHOD (gtk, initialize_frame_toolbars);
-diff -ru xemacs-21.5.24.orig/src/toolbar-msw.c xemacs-21.5.24/src/toolbar-msw.c
---- xemacs-21.5.24.orig/src/toolbar-msw.c	2005-01-25 00:34:12.000000000 +0100
-+++ xemacs-21.5.24/src/toolbar-msw.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/toolbar-msw.c
++++ xemacs-21.5.27.20070507/src/toolbar-msw.c
 @@ -650,6 +650,14 @@
  void
  console_type_create_toolbar_mswindows (void)
@@ -2163,9 +2110,8 @@ diff -ru xemacs-21.5.24.orig/src/toolbar-msw.c xemacs-21.5.24/src/toolbar-msw.c
    CONSOLE_HAS_METHOD (mswindows, output_frame_toolbars);
    CONSOLE_HAS_METHOD (mswindows, clear_frame_toolbars);
    CONSOLE_HAS_METHOD (mswindows, initialize_frame_toolbars);
-diff -ru xemacs-21.5.24.orig/src/toolbar-x.c xemacs-21.5.24/src/toolbar-x.c
---- xemacs-21.5.24.orig/src/toolbar-x.c	2004-09-20 21:20:03.000000000 +0200
-+++ xemacs-21.5.24/src/toolbar-x.c	2005-12-27 18:49:59.000000000 +0100
+--- xemacs-21.5.27.20070507/src/toolbar-x.c
++++ xemacs-21.5.27.20070507/src/toolbar-x.c
 @@ -77,6 +77,14 @@
  void
  console_type_create_toolbar_x (void)
@@ -2181,9 +2127,8 @@ diff -ru xemacs-21.5.24.orig/src/toolbar-x.c xemacs-21.5.24/src/toolbar-x.c
    CONSOLE_HAS_METHOD (x, output_frame_toolbars);
    CONSOLE_HAS_METHOD (x, clear_frame_toolbars);
    CONSOLE_HAS_METHOD (x, initialize_frame_toolbars);
-diff -ru xemacs-21.5.24.orig/src/toolbar.c xemacs-21.5.24/src/toolbar.c
---- xemacs-21.5.24.orig/src/toolbar.c	2005-12-27 18:12:19.000000000 +0100
-+++ xemacs-21.5.24/src/toolbar.c	2005-12-27 18:50:00.000000000 +0100
+--- xemacs-21.5.27.20070507/src/toolbar.c
++++ xemacs-21.5.27.20070507/src/toolbar.c
 @@ -1375,6 +1375,14 @@
  {
    INITIALIZE_SPECIFIER_TYPE (toolbar, "toolbar", "toolbar-specifier-p");
@@ -2270,10 +2215,9 @@ diff -ru xemacs-21.5.24.orig/src/toolbar.c xemacs-21.5.24/src/toolbar.c
 +			    toolbar_buttons_captioned_p_changed, 0);
 +}
 +#endif
-diff -ru xemacs-21.5.24.orig/src/window.c xemacs-21.5.24/src/window.c
---- xemacs-21.5.24.orig/src/window.c	2005-12-27 18:12:19.000000000 +0100
-+++ xemacs-21.5.24/src/window.c	2005-12-27 18:50:00.000000000 +0100
-@@ -5749,3 +5749,22 @@
+--- xemacs-21.5.27.20070507/src/window.c
++++ xemacs-21.5.27.20070507/src/window.c
+@@ -5752,3 +5752,22 @@
  			 vertical_divider_changed_in_window,
  			 0, 0, 0);
  }
diff --git a/xemacs.changes b/xemacs.changes
index 600852f..7be75fc 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May  8 15:45:55 CEST 2007 - schwab@suse.de
+
+- Repair ia64 configuration.
+
 -------------------------------------------------------------------
 Mon May 07 16:34:41 CEST 2007 - mfabian@suse.de
 
diff --git a/xemacs.spec b/xemacs.spec
index dffad20..08d6e7c 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -31,7 +31,7 @@ Prereq:         permissions
 Requires:       xemacs-info xemacs-packages ctags
 Autoreqprov:    on
 Version:        21.5.27.20070507
-Release:        1
+Release:        3
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -137,7 +137,7 @@ Authors:
 %setup -q -n xemacs-%{version}
 %patch3 -p0 -b .appdef
 #%patch5 -p1 -b .fontmenu # appears to be not needed anymore
-%patch13 -p1 -b .ia64
+%patch13 -p1
 %patch14 -p1
 %patch18 -p0 -b .xevent
 %patch19 -p1 -b .ppc
@@ -420,7 +420,7 @@ install -m 0644 suse/README.SuSE $RPM_BUILD_ROOT/%{_docdir}/xemacs/README.SuSE
 ln -sf  /usr/share/xemacs/%{version}/etc $RPM_BUILD_ROOT/%{_docdir}/xemacs/etc
 #
 # replace buildroot in comments in .elc files by spaces with the same total length:
-RPM_BUILD_ROOT_REPLACEMENT=$(echo "$RPM_BUILD_ROOT" | tr [:print:] ' ')
+RPM_BUILD_ROOT_REPLACEMENT=$(echo "$RPM_BUILD_ROOT" | tr '[:print:]' ' ')
 for i in $(find $RPM_BUILD_ROOT -name "*.elc")
 do
     perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(/usr/share/xemacs/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i
@@ -552,6 +552,8 @@ mv $RPM_BUILD_ROOT/usr/share/applications/xemacs.desktop.new $RPM_BUILD_ROOT/usr
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Tue May 08 2007 - schwab@suse.de
+- Repair ia64 configuration.
 * Mon May 07 2007 - mfabian@suse.de
 - update to 21.5.27.20070507. From the CHANGES-beta file:
   • Get X11 window property correctly on 64-bit platforms