10 files changed, 282 insertions, 524 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 145f4f4df87..1b141a42064 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001
+# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
@@ -38,12 +38,22 @@ handle SIGALRM ignore
 # Set up a mask to use.
 # This should be EMACS_INT, but in some cases that is a macro.
 # long ought to work in all cases right now.
-set $valmask = ((long)1 << gdb_valbits) - 1
-set $nonvalbits = gdb_emacs_intbits - gdb_valbits
+
+define xgetptr
+  set $ptr = (gdb_use_union ? $arg0.u.val : $arg0 & $valmask) | gdb_data_seg_bits
+end
+
+define xgetint
+  set $int = gdb_use_union ? $arg0.s.val : (gdb_use_lsb ? $arg0 : $arg0 << gdb_gctypebits) >> gdb_gctypebits
+end
+
+define xgettype
+  set $type = gdb_use_union ? $arg0.s.type : (enum Lisp_Type) (gdb_use_lsb ? $arg0 & $tagmask : $arg0 >> gdb_valbits)
+end
 
 # Set up something to print out s-expressions.
 define pr
-set debug_print ($)
+  set debug_print ($)
 end
 document pr
 Print the emacs s-expression which is $.
@@ -51,115 +61,135 @@ Works only when an inferior emacs is executing.
 end
 
 define xtype
-output (enum Lisp_Type) (($ >> gdb_valbits) & 0x7)
-echo \n
-output ((($ >> gdb_valbits) & 0x7) == Lisp_Misc ? (enum Lisp_Misc_Type) (((struct Lisp_Free *) (($ & $valmask) | gdb_data_seg_bits))->type) : (($ >> gdb_valbits) & 0x7) == Lisp_Vectorlike ? ($size = ((struct Lisp_Vector *) (($ & $valmask) | gdb_data_seg_bits))->size, (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)) : 0)
-echo \n
+  xgettype $
+  output $type
+  echo \n
+  if $type == Lisp_Misc
+    xmisctype
+  else
+    if $type == Lisp_Vectorlike
+      xvectype
+    end
+  end
 end
 document xtype
 Print the type of $, assuming it is an Emacs Lisp value.
 If the first type printed is Lisp_Vector or Lisp_Misc,
-the second line gives the more precise type.
-Otherwise the second line doesn't mean anything.
+a second line gives the more precise type.
 end
 
 define xvectype
-set $size = ((struct Lisp_Vector *) (($ & $valmask) | gdb_data_seg_bits))->size
-output (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)
-echo \n
+  xgetptr $
+  set $size = ((struct Lisp_Vector *) $ptr)->size
+  output ($size & PVEC_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : $size
+  echo \n
 end
 document xvectype
-Print the vector subtype of $, assuming it is a vector or pseudovector.
+Print the size or vector subtype of $, assuming it is a vector or pseudovector.
 end
 
 define xmisctype
-output (enum Lisp_Misc_Type) (((struct Lisp_Free *) (($ & $valmask) | gdb_data_seg_bits))->type)
-echo \n
+  xgetptr $
+  output (enum Lisp_Misc_Type) (((struct Lisp_Free *) $ptr)->type)
+  echo \n
 end
 document xmisctype
 Print the specific type of $, assuming it is some misc type.
 end
 
 define xint
-print (($ & $valmask) << $nonvalbits) >> $nonvalbits
+  xgetint $
+  print $int
 end
 document xint
 Print $, assuming it is an Emacs Lisp integer.  This gets the sign right.
 end
 
 define xptr
-print (void *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (void *) $ptr
 end
 document xptr
 Print the pointer portion of $, assuming it is an Emacs Lisp value.
 end
 
 define xmarker
-print (struct Lisp_Marker *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Marker *) $ptr
 end
 document xmarker
 Print $ as a marker pointer, assuming it is an Emacs Lisp marker value.
 end
 
 define xoverlay
-print (struct Lisp_Overlay *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Overlay *) $ptr
 end
 document xoverlay
 Print $ as a overlay pointer, assuming it is an Emacs Lisp overlay value.
 end
 
 define xmiscfree
-print (struct Lisp_Free *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Free *) $ptr
 end
 document xmiscfree
 Print $ as a misc free-cell pointer, assuming it is an Emacs Lisp Misc value.
 end
 
 define xintfwd
-print (struct Lisp_Intfwd *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Intfwd *) $ptr
 end
 document xintfwd
 Print $ as an integer forwarding pointer, assuming it is an Emacs Lisp Misc value.
 end
 
 define xboolfwd
-print (struct Lisp_Boolfwd *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Boolfwd *) $ptr
 end
 document xboolfwd
 Print $ as a boolean forwarding pointer, assuming it is an Emacs Lisp Misc value.
 end
 
 define xobjfwd
-print (struct Lisp_Objfwd *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Objfwd *) $ptr
 end
 document xobjfwd
 Print $ as an object forwarding pointer, assuming it is an Emacs Lisp Misc value.
 end
 
 define xbufobjfwd
-print (struct Lisp_Buffer_Objfwd *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Buffer_Objfwd *) $ptr
 end
 document xbufobjfwd
 Print $ as a buffer-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
 end
 
 define xkbobjfwd
-print (struct Lisp_Kboard_Objfwd *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Kboard_Objfwd *) $ptr
 end
 document xkbobjfwd
 Print $ as a kboard-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
 end
 
 define xbuflocal
-print (struct Lisp_Buffer_Local_Value *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Buffer_Local_Value *) $ptr
 end
 document xbuflocal
 Print $ as a buffer-local-value pointer, assuming it is an Emacs Lisp Misc value.
 end
 
 define xsymbol
-print (struct Lisp_Symbol *) ((((int) $) & $valmask) | gdb_data_seg_bits)
-xprintsym $
+  xgetptr $
+  print (struct Lisp_Symbol *) $ptr
+  xprintsym $
+  echo \n
 end
 document xsymbol
 Print the name and address of the symbol $.
@@ -167,9 +197,10 @@ This command assumes that $ is an Emacs Lisp symbol value.
 end
 
 define xstring
-print (struct Lisp_String *) (($ & $valmask) | gdb_data_seg_bits)
-output ($->size > 1000) ? 0 : ($->data[0])@($->size_byte < 0 ? $->size : $->size_byte)
-echo \n
+  xgetptr $
+  print (struct Lisp_String *) $ptr
+  output ($->size > 1000) ? 0 : ($->data[0])@($->size_byte < 0 ? $->size : $->size_byte)
+  echo \n
 end
 document xstring
 Print the contents and address of the string $.
@@ -177,8 +208,9 @@ This command assumes that $ is an Emacs Lisp string value.
 end
 
 define xvector
-print (struct Lisp_Vector *) (($ & $valmask) | gdb_data_seg_bits)
-output ($->size > 50) ? 0 : ($->contents[0])@($->size)
+  xgetptr $
+  print (struct Lisp_Vector *) $ptr
+  output ($->size > 50) ? 0 : ($->contents[0])@($->size)
 echo \n
 end
 document xvector
@@ -187,32 +219,36 @@ This command assumes that $ is an Emacs Lisp vector value.
 end
 
 define xprocess
-print (struct Lisp_Process *) (($ & $valmask) | gdb_data_seg_bits)
-output *$
-echo \n
+  xgetptr $
+  print (struct Lisp_Process *) $ptr
+  output *$
+  echo \n
 end
 document xprocess
 Print the address of the struct Lisp_process which the Lisp_Object $ points to.
 end
 
 define xframe
-print (struct frame *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct frame *) $ptr
 end
 document xframe
 Print $ as a frame pointer, assuming it is an Emacs Lisp frame value.
 end
 
 define xcompiled
-print (struct Lisp_Vector *) (($ & $valmask) | gdb_data_seg_bits)
-output ($->contents[0])@($->size & 0xff)
+  xgetptr $
+  print (struct Lisp_Vector *) $ptr
+  output ($->contents[0])@($->size & 0xff)
 end
 document xcompiled
 Print $ as a compiled function pointer, assuming it is an Emacs Lisp compiled value.
 end
 
 define xwindow
-print (struct window *) (($ & $valmask) | gdb_data_seg_bits)
-printf "%dx%d+%d+%d\n", $->width, $->height, $->left, $->top
+  xgetptr $
+  print (struct window *) $ptr
+  printf "%dx%d+%d+%d\n", $->width, $->height, $->left, $->top
 end
 document xwindow
 Print $ as a window pointer, assuming it is an Emacs Lisp window value.
@@ -220,27 +256,30 @@ Print the window's position as "WIDTHxHEIGHT+LEFT+TOP".
 end
 
 define xwinconfig
-print (struct save_window_data *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct save_window_data *) $ptr
 end
 document xwinconfig
 Print $ as a window configuration pointer, assuming it is an Emacs Lisp window configuration value.
 end
 
 define xsubr
-print (struct Lisp_Subr *) (($ & $valmask) | gdb_data_seg_bits)
-output *$
-echo \n
+  xgetptr $
+  print (struct Lisp_Subr *) $ptr
+  output *$
+  echo \n
 end
 document xsubr
 Print the address of the subr which the Lisp_Object $ points to.
 end
 
 define xchartable
-print (struct Lisp_Char_Table *) (($ & $valmask) | gdb_data_seg_bits)
-printf "Purpose: "
-output (char*)&((struct Lisp_Symbol *) ((((int) $->purpose) & $valmask) | gdb_data_seg_bits))->name->data
-printf "  %d extra slots", ($->size & 0x1ff) - 388
-echo \n
+  xgetptr $
+  print (struct Lisp_Char_Table *) $ptr
+  printf "Purpose: "
+  xprintsym $->purpose
+  printf "  %d extra slots", ($->size & 0x1ff) - 388
+  echo \n
 end
 document xchartable
 Print the address of the char-table $, and its purpose.
@@ -248,9 +287,10 @@ This command assumes that $ is an Emacs Lisp char-table value.
 end
 
 define xboolvector
-print (struct Lisp_Bool_Vector *) (($ & $valmask) | gdb_data_seg_bits)
-output ($->size > 256) ? 0 : ($->data[0])@(($->size + 7)/ 8)
-echo \n
+  xgetptr $
+  print (struct Lisp_Bool_Vector *) $ptr
+  output ($->size > 256) ? 0 : ($->data[0])@(($->size + 7)/ 8)
+  echo \n
 end
 document xboolvector
 Print the contents and address of the bool-vector $.
@@ -258,9 +298,11 @@ This command assumes that $ is an Emacs Lisp bool-vector value.
 end
 
 define xbuffer
-print (struct buffer *) (($ & $valmask) | gdb_data_seg_bits)
-output ((struct Lisp_String *) ((($->name) & $valmask) | gdb_data_seg_bits))->data
-echo \n
+  xgetptr $
+  print (struct buffer *) $ptr
+  xgetptr $->name
+  output ((struct Lisp_String *) $ptr)->data
+  echo \n
 end
 document xbuffer
 Set $ as a buffer pointer, assuming it is an Emacs Lisp buffer value.
@@ -268,24 +310,26 @@ Print the name of the buffer.
 end
 
 define xhashtable
-print (struct Lisp_Hash_Table *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct Lisp_Hash_Table *) $ptr
 end
 document xhashtable
 Set $ as a hash table pointer, assuming it is an Emacs Lisp hash table value.
 end
 
 define xcons
-print (struct Lisp_Cons *) (($ & $valmask) | gdb_data_seg_bits)
-output/x *$
-echo \n
+  xgetptr $
+  print (struct Lisp_Cons *) $ptr
+  output/x *$
+  echo \n
 end
 document xcons
 Print the contents of $, assuming it is an Emacs Lisp cons.
 end
 
 define nextcons
-p $.cdr
-xcons
+  p $.cdr
+  xcons
 end
 document nextcons
 Print the contents of the next cell in a list.
@@ -293,28 +337,34 @@ This assumes that the last thing you printed was a cons cell contents
 (type struct Lisp_Cons) or a pointer to one.
 end
 define xcar
-print/x ((($ >> gdb_valbits) & 0xf) == Lisp_Cons ? ((struct Lisp_Cons *) (($ & $valmask) | gdb_data_seg_bits))->car : 0)
+  xgetptr $
+  xgettype $
+  print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->car : 0)
 end
 document xcar
 Print the car of $, assuming it is an Emacs Lisp pair.
 end
 
 define xcdr
-print/x ((($ >> gdb_valbits) & 0xf) == Lisp_Cons ? ((struct Lisp_Cons *) (($ & $valmask) | gdb_data_seg_bits))->cdr : 0)
+  xgetptr $
+  xgettype $
+  print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->cdr : 0)
 end
 document xcdr
 Print the cdr of $, assuming it is an Emacs Lisp pair.
 end
 
 define xfloat
-print ((struct Lisp_Float *) (($ & $valmask) | gdb_data_seg_bits))->data
+  xgetptr $
+  print ((struct Lisp_Float *) $ptr)->data
 end
 document xfloat
 Print $ assuming it is a lisp floating-point number.
 end
 
 define xscrollbar
-print (struct scrollbar *) (($ & $valmask) | gdb_data_seg_bits)
+  xgetptr $
+  print (struct scrollbar *) $ptr
 output *$
 echo \n
 end
@@ -323,10 +373,11 @@ Print $ as a scrollbar pointer.
 end
 
 define xprintsym
-  set $sym = (struct Lisp_Symbol *) ((((int) $arg0) & $valmask) | gdb_data_seg_bits)
-  set $sym_name = ((struct Lisp_String *)(($sym->xname & $valmask) | gdb_data_seg_bits))
+  xgetptr $arg0
+  set $sym = (struct Lisp_Symbol *) $ptr
+  xgetptr $sym->xname
+  set $sym_name = (struct Lisp_String *) $ptr
   output ($sym_name->data[0])@($sym_name->size_byte < 0 ? $sym_name->size : $sym_name->size_byte)
-  echo \n
 end
 document xprintsym
   Print argument as a symbol.
@@ -335,14 +386,16 @@ end
 define xbacktrace
   set $bt = backtrace_list
   while $bt
-    set $type = (enum Lisp_Type) ((*$bt->function >> gdb_valbits) & 0x7)
+    xgettype (*$bt->function)
     if $type == Lisp_Symbol
-      xprintsym *$bt->function
+      xprintsym (*$bt->function)
+      echo \n
     else
       printf "0x%x ", *$bt->function
       if $type == Lisp_Vectorlike
-        set $size = ((struct Lisp_Vector *) ((*$bt->function & $valmask) | gdb_data_seg_bits))->size
-        output (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)
+        xgetptr (*$bt->function)
+        set $size = ((struct Lisp_Vector *) $ptr)->size
+        output ($size & PVEC_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : $size
       else
         printf "Lisp type %d", $type
       end
@@ -358,16 +411,17 @@ document xbacktrace
 end
 
 define xreload
-  set $valmask = ((long)1 << gdb_valbits) - 1
-  set $nonvalbits = gdb_emacs_intbits - gdb_valbits
+  set $tagmask = (((long)1 << gdb_gctypebits) - 1)
+  set $valmask = gdb_use_lsb ? ~($tagmask) : ((long)1 << gdb_valbits) - 1
 end
 document xreload
   When starting Emacs a second time in the same gdb session under
-  FreeBSD 2.2.5, gdb 4.13, $valmask and $nonvalbits have lost
+  FreeBSD 2.2.5, gdb 4.13, $valmask have lost
   their values.  (The same happens on current (2000) versions of GNU/Linux
   with gdb 5.0.)
   This function reloads them.
 end
+xreload
 
 define hook-run
   xreload
diff --git a/src/.gdbinit-union b/src/.gdbinit-union
deleted file mode 100644
index 1af2c0976c4..00000000000
--- a/src/.gdbinit-union
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001
-#   Free Software Foundation, Inc.
-#
-# This file is part of GNU Emacs.
-#
-# GNU Emacs is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Force loading of symbols, enough to give us gdb_valbits etc.
-set main
-
-# Find lwlib source files too.
-dir ../lwlib
-#dir /gd/gnu/lesstif-0.89.9/lib/Xm
-
-# Don't enter GDB when user types C-g to quit.
-# This has one unfortunate effect: you can't type C-c
-# at the GDB to stop Emacs, when using X.
-# However, C-z works just as well in that case.
-handle 2 noprint pass
-
-# Don't pass SIGALRM to Emacs.  This makes problems when
-# debugging.
-handle SIGALRM ignore
-
-# Set up a mask to use.
-# This should be EMACS_INT, but in some cases that is a macro.
-# long ought to work in all cases right now.
-set $valmask = ((long)1 << gdb_valbits) - 1
-set $nonvalbits = gdb_emacs_intbits - gdb_valbits
-
-# Set up something to print out s-expressions.
-define pr
-set debug_print ($)
-end
-document pr
-Print the emacs s-expression which is $.
-Works only when an inferior emacs is executing.
-end
-
-define xtype
-output (enum Lisp_Type) (($.i >> gdb_valbits) & 0x7)
-echo \n
-output ((($.i >> gdb_valbits) & 0x7) == Lisp_Misc ? (enum Lisp_Misc_Type) (((struct Lisp_Free *) (($.i & $valmask) | gdb_data_seg_bits))->type) : (($.i >> gdb_valbits) & 0x7) == Lisp_Vectorlike ? ($size = ((struct Lisp_Vector *) (($.i & $valmask) | gdb_data_seg_bits))->size, (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)) : 0)
-echo \n
-end
-document xtype
-Print the type of $, assuming it is an Emacs Lisp value.
-If the first type printed is Lisp_Vector or Lisp_Misc,
-the second line gives the more precise type.
-Otherwise the second line doesn't mean anything.
-end
-
-define xvectype
-  set $size = ((struct Lisp_Vector *) (($.i & $valmask) | gdb_data_seg_bits))->size
-  output (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)
-  echo \n
-end
-document xvectype
-  Print the vector subtype of $, assuming it is a vector or pseudovector.
-end
-
-define xmisctype
-  output (enum Lisp_Misc_Type) (((struct Lisp_Free *) (($.i & $valmask) | gdb_data_seg_bits))->type)
-  echo \n
-end
-document xmisctype
-  Print the specific type of $, assuming it is some misc type.
-end
-
-define xint
-  print (($.i & $valmask) << $nonvalbits) >> $nonvalbits
-end
-document xint
-  Print $, assuming it is an Emacs Lisp integer.  This gets the sign right.
-end
-
-define xptr
-  print (void *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xptr
-  Print the pointer portion of $, assuming it is an Emacs Lisp value.
-end
-
-define xmarker
-  print (struct Lisp_Marker *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xmarker
-  Print $ as a marker pointer, assuming it is an Emacs Lisp marker value.
-end
-
-define xoverlay
-  print (struct Lisp_Overlay *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xoverlay
-  Print $ as a overlay pointer, assuming it is an Emacs Lisp overlay value.
-end
-
-define xmiscfree
-  print (struct Lisp_Free *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xmiscfree
-  Print $ as a misc free-cell pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xintfwd
-  print (struct Lisp_Intfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xintfwd
-  Print $ as an integer forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xboolfwd
-  print (struct Lisp_Boolfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xboolfwd
-  Print $ as a boolean forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xobjfwd
-  print (struct Lisp_Objfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xobjfwd
-  Print $ as an object forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xbufobjfwd
-  print (struct Lisp_Buffer_Objfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xbufobjfwd
-  Print $ as a buffer-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xkbobjfwd
-  print (struct Lisp_Kboard_Objfwd *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xkbobjfwd
-  Print $ as a kboard-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xbuflocal
-  print (struct Lisp_Buffer_Local_Value *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xbuflocal
-  Print $ as a buffer-local-value pointer, assuming it is an Emacs Lisp Misc value.
-end
-
-define xsymbol
-  print (struct Lisp_Symbol *) (($.i & $valmask) | gdb_data_seg_bits)
-  xprintsymptr $
-end
-document xsymbol
-  Print the name and address of the symbol $.
-  This command assumes that $ is an Emacs Lisp symbol value.
-end
-
-define xstring
-  print (struct Lisp_String *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ($->size > 1000) ? 0 : ($->data[0])@($->size_byte < 0 ? $->size : $->size_byte)
-  echo \n
-end
-document xstring
-  Print the contents and address of the string $.
-  This command assumes that $ is an Emacs Lisp string value.
-end
-
-define xvector
-  print (struct Lisp_Vector *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ($->size > 50) ? 0 : ($->contents[0])@($->size)
-  echo \n
-end
-document xvector
-  Print the contents and address of the vector $.
-  This command assumes that $ is an Emacs Lisp vector value.
-end
-
-define xprocess
-  print (struct Lisp_Process *) (($.i & $valmask) | gdb_data_seg_bits)
-  output *$
-  echo \n
-end
-document xprocess
-  Print the address of the struct Lisp_process which the Lisp_Object $ points to.
-end
-
-define xframe
-  print (struct frame *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xframe
-  Print $ as a frame pointer, assuming it is an Emacs Lisp frame value.
-end
-
-define xcompiled
-  print (struct Lisp_Vector *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ($->contents[0])@($->size & 0xff)
-end
-document xcompiled
-  Print $ as a compiled function pointer, assuming it is an Emacs Lisp compiled value.
-end
-
-define xwindow
-  print (struct window *) (($.i & $valmask) | gdb_data_seg_bits)
-  printf "%dx%d+%d+%d\n", $->width, $->height, $->left, $->top
-end
-document xwindow
-  Print $ as a window pointer, assuming it is an Emacs Lisp window value.
-  Print the window's position as "WIDTHxHEIGHT+LEFT+TOP".
-end
-
-define xwinconfig
-  print (struct save_window_data *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xwinconfig
-  Print $ as a window configuration pointer, assuming it is an Emacs Lisp window configuration value.
-end
-
-define xsubr
-  print (struct Lisp_Subr *) (($.i & $valmask) | gdb_data_seg_bits)
-  output *$
-  echo \n
-end
-document xsubr
-  Print the address of the subr which the Lisp_Object $ points to.
-end
-
-define xchartable
-  print (struct Lisp_Char_Table *) (($.i & $valmask) | gdb_data_seg_bits)
-  printf "Purpose: "
-  output (char*)&((struct Lisp_Symbol *) (($->purpose.i & $valmask) | gdb_data_seg_bits))->name->data
-  printf "  %d extra slots", ($->size & 0x1ff) - 388
-  echo \n
-end
-document xchartable
-  Print the address of the char-table $, and its purpose.
-  This command assumes that $ is an Emacs Lisp char-table value.
-end
-
-define xboolvector
-  print (struct Lisp_Bool_Vector *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ($->size > 256) ? 0 : ($->data[0])@(($->size + 7)/ 8)
-  echo \n
-end
-document xboolvector
-  Print the contents and address of the bool-vector $.
-  This command assumes that $ is an Emacs Lisp bool-vector value.
-end
-
-define xbuffer
-  print (struct buffer *) (($.i & $valmask) | gdb_data_seg_bits)
-  output ((struct Lisp_String *) (($->name.i & $valmask) | gdb_data_seg_bits))->data
-  echo \n
-end
-document xbuffer
-  Set $ as a buffer pointer, assuming it is an Emacs Lisp buffer value.
-  Print the name of the buffer.
-end
-
-define xhashtable
-  print (struct Lisp_Hash_Table *) (($.i & $valmask) | gdb_data_seg_bits)
-end
-document xhashtable
-  Set $ as a hash table pointer, assuming it is an Emacs Lisp hash table value.
-end
-
-define xcons
-  print (struct Lisp_Cons *) (($.i & $valmask) | gdb_data_seg_bits)
-  output/x *$
-  echo \n
-end
-document xcons
-  Print the contents of $, assuming it is an Emacs Lisp cons.
-end
-
-define nextcons
-  p $.cdr
-  xcons
-end
-document nextcons
-  Print the contents of the next cell in a list.
-  This assumes that the last thing you printed was a cons cell contents
-  (type struct Lisp_Cons) or a pointer to one.
-end
-
-define xcar
-  print/x ((($.i >> gdb_valbits) & 0xf) == Lisp_Cons ? ((struct Lisp_Cons *) (($.i & $valmask) | gdb_data_seg_bits))->car : 0)
-end
-document xcar
-  Print the car of $, assuming it is an Emacs Lisp pair.
-end
-
-define xcdr
-  print/x ((($.i >> gdb_valbits) & 0xf) == Lisp_Cons ? ((struct Lisp_Cons *) (($.i & $valmask) | gdb_data_seg_bits))->cdr : 0)
-end
-document xcdr
-  Print the cdr of $, assuming it is an Emacs Lisp pair.
-end
-
-define xfloat
-  print ((struct Lisp_Float *) (($.i & $valmask) | gdb_data_seg_bits))->data
-end
-document xfloat
-  Print $ assuming it is a lisp floating-point number.
-end
-
-define xscrollbar
-  print (struct scrollbar *) (($.i & $valmask) | gdb_data_seg_bits)
-  output *$
-  echo \n
-end
-document xscrollbar
-  Print $ as a scrollbar pointer.
-end
-
-define xprintsym
-  set $sym = ((struct Lisp_Symbol *) (($arg0.i & $valmask) | gdb_data_seg_bits))
-  xprintsymptr $sym
-end
-document xprintsym
-  Print argument as a symbol.
-end
-define xprintsymptr
-  set $sym = $arg0
-  set $sym_name = ((struct Lisp_String *)(($sym->xname.i & $valmask) | gdb_data_seg_bits))
-  output ($sym_name->data[0])@($sym_name->size_byte < 0 ? $sym_name->size : $sym_name->size_byte)
-  echo \n
-end
-
-define xbacktrace
-  set $bt = backtrace_list
-  while $bt
-    set $type = (enum Lisp_Type) (((*$bt->function).i >> gdb_valbits) & 0x7)
-    if $type == Lisp_Symbol
-      xprintsym (*$bt->function)
-    else
-      printf "0x%x ", (*$bt->function).i
-      if $type == Lisp_Vectorlike
-        set $size = ((struct Lisp_Vector *) (((*$bt->function).i & $valmask) | gdb_data_seg_bits))->size
-        output (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)
-      else
-        printf "Lisp type %d", $type
-      end
-      echo \n
-    end
-    set $bt = $bt->next
-  end
-end
-document xbacktrace
-  Print a backtrace of Lisp function calls from backtrace_list.
-  Set a breakpoint at Fsignal and call this to see from where
-  an error was signaled.
-end
-
-define xreload
-  set $valmask = ((long)1 << gdb_valbits) - 1
-  set $nonvalbits = gdb_emacs_intbits - gdb_valbits
-end
-document xreload
-  When starting Emacs a second time in the same gdb session under
-  FreeBSD 2.2.5, gdb 4.13, $valmask and $nonvalbits have lost
-  their values.  (The same happens on current (2000) versions of GNU/Linux
-  with gdb 5.0.)
-  This function reloads them.
-end
-
-define hook-run
-  xreload
-end
-
-# Call xreload if a new Emacs executable is loaded.
-define hookpost-run
-  xreload
-end
-
-set print pretty on
-set print sevenbit-strings
-
-# show environment DISPLAY
-# show environment TERM
-# set args -geometry 80x40+0+0
-
-# Don't let abort actually run, as it will make
-# stdio stop working and therefore the `pr' command above as well.
-# break abort
-
-# If we are running in synchronous mode, we want a chance to look around
-# before Emacs exits.  Perhaps we should put the break somewhere else
-# instead...
-# break x_error_quitter
-
-# arch-tag: 08f4d20d-0254-4374-a80c-179d5a517915
diff --git a/src/ChangeLog b/src/ChangeLog
index 357060188a5..a1c384ce535 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2004-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * .gdbinit-union: Remove.
+
+        * .gdbinit: Make it work for USE_LSB_TAG and !NO_LISP_UNION.
+        (xgetptr, xgetint, xgettype): New funs.  Use them everywhere.
+        ($nonvalbits): Remove.
+        ($valmask): Set it by calling xreload to avoid redundancy.
+
+        * emacs.c (gdb_use_union, gdb_use_lsb): New vars.
+        (gdb_emacs_intbits): Remove.
+
+2004-03-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * data.c (Fbyteorder): Make test work even if unsigned is not 4 bytes.
+
+2004-03-30  Kenichi Handa  <handa@m17n.org>
+
+        * editfns.c (Fformat): Fix initialization of the array info.
+
+2004-03-30  Kim F. Storm  <storm@cua.dk>
+
+        * xterm.c (x_mouse_click_focus_ignore_position): New var.
+        (syms_of_xterm): DEFVAR_BOOL it.
+        (ignore_next_mouse_click_timeout): New var.
+        (handle_one_xevent): Clear it on KeyPress, set it on EnterNotify.
+        Use it to filter mouse clicks following focus event.
+
+2004-03-29  David Ponce  <david@dponce.com>
+
+        * callint.c (Fcall_interactively): Fix last change.
+
+2004-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Fcommandp): Simplify.
+
+        * data.c (Finteractive_form): Rename from Fsubr_interactive_form.
+        Extend to handle all kinds of functions.
+
+        * lisp.h (Finteractive_form): Declare.
+
+        * callint.c (Fcall_interactively): Use it.
+
 2004-03-26  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (syms_of_xdisp): Include `void-variable' in list_of_error
@@ -39,7 +82,7 @@
         * image.c (Qcenter): Move to xdisp.c.
 
         * xdisp.c (Qcenter): Declare here.
-        (syms_of_xdisp): intern and staticpro it.
+        (syms_of_xdisp): Intern and staticpro it.
         (handle_single_display_prop): Allow space display property on all
         platforms.
         (display_mode_line): Set mode_line_p before displaying line.
diff --git a/src/callint.c b/src/callint.c
index 21a6bd0b1ad..1d7d6f9f89f 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -1,5 +1,5 @@
 /* Call a Lisp function interactively.
-   Copyright (C) 1985, 86, 93, 94, 95, 1997, 2000, 02, 2003
+   Copyright (C) 1985, 86, 93, 94, 95, 1997, 2000, 02, 03, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -347,25 +347,17 @@ supply if the command inquires which events were used to invoke it.  */)
         goto lose;
       specs = XVECTOR (fun)->contents[COMPILED_INTERACTIVE];
     }
-  else if (!CONSP (fun))
-    goto lose;
-  else if (funcar = XCAR (fun), EQ (funcar, Qautoload))
+  else
     {
+      Lisp_Object form;
       GCPRO2 (function, prefix_arg);
-      do_autoload (fun, function);
+      form = Finteractive_form (function);
       UNGCPRO;
-      goto retry;
-    }
-  else if (EQ (funcar, Qlambda))
-    {
-      specs = Fassq (Qinteractive, Fcdr (XCDR (fun)));
-      if (NILP (specs))
+      if (CONSP (form))
+        specs = filter_specs = Fcar (XCDR (form));
+      else
         goto lose;
-      filter_specs = Fnth (make_number (1), specs);
-      specs = Fcar (Fcdr (specs));
     }
-  else
-    goto lose;
 
   /* If either SPECS or STRING is set to a string, use it.  */
   if (STRINGP (specs))
diff --git a/src/data.c b/src/data.c
index bff2baaed27..c3cf05e0f10 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,5 +1,5 @@
 /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985,86,88,93,94,95,97,98,99, 2000, 2001, 2003
+   Copyright (C) 1985,86,88,93,94,95,97,98,99, 2000, 2001, 03, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -761,17 +761,39 @@ function with `&rest' args, or `unevalled' for a special form.  */)
     return Fcons (make_number (minargs), make_number (maxargs));
 }
 
-DEFUN ("subr-interactive-form", Fsubr_interactive_form, Ssubr_interactive_form, 1, 1, 0,
-       doc: /* Return the interactive form of SUBR or nil if none.
-SUBR must be a built-in function.  Value, if non-nil, is a list
+DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0,
+       doc: /* Return the interactive form of CMD or nil if none.
+CMD must be a command.  Value, if non-nil, is a list
 \(interactive SPEC).  */)
-     (subr)
-     Lisp_Object subr;
+     (cmd)
+     Lisp_Object cmd;
 {
-  if (!SUBRP (subr))
-    wrong_type_argument (Qsubrp, subr);
-  if (XSUBR (subr)->prompt)
-    return list2 (Qinteractive, build_string (XSUBR (subr)->prompt));
+  Lisp_Object fun = indirect_function (cmd);
+
+  if (SUBRP (fun))
+    {
+      if (XSUBR (fun)->prompt)
+        return list2 (Qinteractive, build_string (XSUBR (fun)->prompt));
+    }
+  else if (COMPILEDP (fun))
+    {
+      if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) > COMPILED_INTERACTIVE)
+        return list2 (Qinteractive, AREF (fun, COMPILED_INTERACTIVE));
+    }
+  else if (CONSP (fun))
+    {
+      Lisp_Object funcar = XCAR (fun);
+      if (EQ (funcar, Qlambda))
+        return Fassq (Qinteractive, Fcdr (XCDR (fun)));
+      else if (EQ (funcar, Qautoload))
+        {
+          struct gcpro gcpro1;
+          GCPRO1 (cmd);
+          do_autoload (fun, cmd);
+          UNGCPRO;
+          return Finteractive_form (cmd);
+        }
+    }
   return Qnil;
 }
 
@@ -2887,7 +2909,7 @@ lowercase l) for small endian machines.  */)
      ()
 {
   unsigned i = 0x04030201;
-  int order = *(char *)&i == 4 ? 66 : 108;
+  int order = *(char *)&i == 1 ? 108 : 66;
 
   return make_number (order);
 }
@@ -3209,7 +3231,7 @@ syms_of_data ()
   staticpro (&Qhash_table);
 
   defsubr (&Sindirect_variable);
-  defsubr (&Ssubr_interactive_form);
+  defsubr (&Sinteractive_form);
   defsubr (&Seq);
   defsubr (&Snull);
   defsubr (&Stype_of);
diff --git a/src/editfns.c b/src/editfns.c
index df183155c4b..ce075f2696c 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3280,7 +3280,7 @@ usage: (format STRING &rest OBJECTS)  */)
     int i;
     info = (struct info *) alloca (nbytes);
     bzero (info, nbytes);
-    for (i = 0; i <= nargs; i++)
+    for (i = 0; i < nargs; i++)
       info[i].start = -1;
     discarded = (char *) alloca (SBYTES (args[0]));
     bzero (discarded, SBYTES (args[0]));
diff --git a/src/emacs.c b/src/emacs.c
index 1c7d595d3d3..011d66c5cab 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,5 +1,5 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
-   Copyright (C) 1985,86,87,93,94,95,97,98,1999,2001,02,2003
+   Copyright (C) 1985,86,87,93,94,95,97,98,1999,2001,02,03,2004
       Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -87,9 +87,18 @@ extern char *index P_ ((const char *, int));
 
 /* Make these values available in GDB, which doesn't see macros.  */
 
+#ifdef USE_LSB_TAG
+int gdb_use_lsb = 1;
+#else
+int gdb_use_lsb = 0;
+#endif
+#ifdef NO_UNION_TYPE
+int gdb_use_union = 0;
+#else
+int gdb_use_union = 1;
+#endif
 EMACS_INT gdb_valbits = VALBITS;
 EMACS_INT gdb_gctypebits = GCTYPEBITS;
-EMACS_INT gdb_emacs_intbits = sizeof (EMACS_INT) * BITS_PER_CHAR;
 #ifdef DATA_SEG_BITS
 EMACS_INT gdb_data_seg_bits = DATA_SEG_BITS;
 #else
diff --git a/src/eval.c b/src/eval.c
index a5f66b295a6..0326a828a81 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,5 +1,5 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 99, 2000, 2001, 2002
+   Copyright (C) 1985, 86, 87, 93, 94, 95, 99, 2000, 2001, 02, 2004
      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1812,13 +1812,11 @@ then strings and vectors are not accepted.  */)
   /* Lists may represent commands.  */
   if (!CONSP (fun))
     return Qnil;
-  funcar = Fcar (fun);
-  if (!SYMBOLP (funcar))
-    return Fsignal (Qinvalid_function, Fcons (fun, Qnil));
+  funcar = XCAR (fun);
   if (EQ (funcar, Qlambda))
-    return Fassq (Qinteractive, Fcdr (Fcdr (fun)));
+    return Fassq (Qinteractive, Fcdr (XCDR (fun)));
   if (EQ (funcar, Qautoload))
-    return Fcar (Fcdr (Fcdr (Fcdr (fun))));
+    return Fcar (Fcdr (Fcdr (XCDR (fun))));
   else
     return Qnil;
 }
diff --git a/src/lisp.h b/src/lisp.h
index 2135f80f5e8..48b9c0c7912 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2034,6 +2034,7 @@ extern Lisp_Object Qnumberp, Qnumber_or_marker_p;
 extern Lisp_Object Qinteger;
 
 extern void circular_list_error P_ ((Lisp_Object));
+EXFUN (Finteractive_form, 1);
 
 /* Defined in frame.c */
 extern Lisp_Object Qframep;
diff --git a/src/xterm.c b/src/xterm.c
index a297faa2ac0..fe1dca7fd71 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -216,6 +216,17 @@ static String Xt_default_resources[] = {0};
 
 static int toolkit_scroll_bar_interaction;
 
+/* Non-zero means to not move point as a result of clicking on a
+   frame to focus it (when focus-follows-mouse is nil).  */
+
+int x_mouse_click_focus_ignore_position;
+
+/* Non-zero timeout value means ignore next mouse click if it arrives
+   before that timeout elapses (i.e. as part of the same sequence of
+   events resulting from clicking on a frame to select it).  */
+
+static unsigned long ignore_next_mouse_click_timeout;
+
 /* Mouse movement.
 
    Formerly, we used PointerMotionHintMask (in standard_event_mask)
@@ -748,13 +759,13 @@ x_draw_fringe_bitmap (w, row, p)
 
       if (p->overlay_p)
         {
-          clipmask = XCreatePixmapFromBitmapData (display, 
+          clipmask = XCreatePixmapFromBitmapData (display,
                                                   FRAME_X_DISPLAY_INFO (f)->root_window,
-                                                  bits, p->wd, p->h, 
+                                                  bits, p->wd, p->h,
                                                   1, 0, 1);
           gcv.clip_mask = clipmask;
           gcv.clip_x_origin = p->x;
-          gcv.clip_y_origin = p->y; 
+          gcv.clip_y_origin = p->y;
           XChangeGC (display, gc, GCClipMask | GCClipXOrigin | GCClipYOrigin, &gcv);
         }
 
@@ -5733,7 +5744,7 @@ event_handler_gdk (gxev, ev, data)
       else
         {
           current_count +=
-            handle_one_xevent (dpyinfo, xev, &current_finish, 
+            handle_one_xevent (dpyinfo, xev, &current_finish,
                                current_hold_quit);
         }
     }
@@ -6175,6 +6186,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 
     case KeyPress:
 
+      ignore_next_mouse_click_timeout = 0;
+
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
       /* Dispatch KeyPress events when in menu.  */
       if (popup_activated ())
@@ -6534,6 +6547,9 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 
       f = x_any_window_to_frame (dpyinfo, event.xcrossing.window);
 
+      if (f && x_mouse_click_focus_ignore_position)
+        ignore_next_mouse_click_timeout = event.xmotion.time + 200;
+
 #if 0
       if (event.xcrossing.focus)
         {
@@ -6777,7 +6793,21 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
                   if (! popup_activated ())
 #endif
-                    construct_mouse_click (&inev, &event, f);
+                    {
+                      if (ignore_next_mouse_click_timeout)
+                        {
+                          if (event.type == ButtonPress
+                              && (int)(event.xbutton.time - ignore_next_mouse_click_timeout) > 0)
+                            {
+                              ignore_next_mouse_click_timeout = 0;
+                              construct_mouse_click (&inev, &event, f);
+                            }
+                          if (event.type == ButtonRelease)
+                            ignore_next_mouse_click_timeout = 0;
+                        }
+                      else
+                        construct_mouse_click (&inev, &event, f);
+                    }
                 }
           }
         else
@@ -6925,7 +6955,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           any_help_event_p = 1;
           gen_help_event (help_echo_string, frame, help_echo_window,
                           help_echo_object, help_echo_pos);
-        } 
+        }
       else
         {
           help_echo_string = Qnil;
@@ -8241,7 +8271,7 @@ x_set_offset (f, xoff, yoff, change_gravity)
       f->win_gravity = NorthWestGravity;
     }
   x_calc_absolute_position (f);
- 
+
   BLOCK_INPUT;
   x_wm_set_size_hint (f, (long) 0, 0);
 
@@ -10365,7 +10395,7 @@ x_term_init (display_name, xrm_option, resource_name)
       get_bits_and_offset (dpyinfo->visual->green_mask,
                            &dpyinfo->green_bits, &dpyinfo->green_offset);
     }
-      
+
   /* See if a private colormap is requested.  */
   if (dpyinfo->visual == DefaultVisualOfScreen (dpyinfo->screen))
     {
@@ -10790,6 +10820,7 @@ x_initialize ()
   x_noop_count = 0;
   last_tool_bar_item = -1;
   any_help_event_p = 0;
+  ignore_next_mouse_click_timeout = 0;
 
 #ifdef USE_GTK
   current_count = -1;
@@ -10877,6 +10908,16 @@ UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
 to 4.1, set this to nil.  */);
   x_use_underline_position_properties = 1;
 
+  DEFVAR_BOOL ("x-mouse-click-focus-ignore-position",
+               &x_mouse_click_focus_ignore_position,
+    doc: /* Non-nil means that a mouse click to focus a frame does not move point.
+This variable is only used when the window manager requires that you
+click on a frame to select it (give it focus).  In that case, a value
+of nil, means that the selected window and cursor position changes to
+reflect the mouse click position, while a non-nil value means that the
+selected window or cursor position is preserved.  */);
+  x_mouse_click_focus_ignore_position = 0;
+
   DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
     doc: /* What X toolkit scroll bars Emacs uses.
 A value of nil means Emacs doesn't use X toolkit scroll bars.