7 files changed, 68 insertions, 29 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index bffa48df534..28fe00672d4 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -9,8 +9,8 @@ Works only when an inferior emacs is executing.
 end
 
 define xtype
-print (enum Lisp_Type) (($ >> 24) & 0x7f)
-p $$
+output (enum Lisp_Type) (($ >> 24) & 0x7f)
+echo \n
 end
 document xtype
 Print the type of $, assuming it is an Elisp value.
@@ -32,12 +32,11 @@ end
 
 define xwindow
 print (struct window *) ($ & 0x00ffffff)
-print ($->left)@4
-print $$
+printf "%dx%d+%d+%d\n", $->width, $->height, $->left, $->top
 end
 document xwindow
 Print $ as a window pointer, assuming it is an Elisp window value.
-Print the window's position as { left, top, height, width }.
+Print the window's position as "WIDTHxHEIGHT+LEFT+TOP".
 end
 
 define xmarker
@@ -49,8 +48,8 @@ end
 
 define xbuffer
 print (struct buffer *) ($ & 0x00ffffff)
-print &((struct Lisp_String *) (($->name) & 0x00ffffff))->data
-print $$
+output &((struct Lisp_String *) (($->name) & 0x00ffffff))->data
+echo \n
 end
 document xbuffer
 Set $ as a buffer pointer, assuming it is an Elisp buffer value.
@@ -59,8 +58,8 @@ end
 
 define xsymbol
 print (struct Lisp_Symbol *) ($ & 0x00ffffff)
-print &$->name->data
-print $$
+output &$->name->data
+echo \n
 end
 document xsymbol
 Print the name and address of the symbol $.
@@ -69,8 +68,8 @@ end
 
 define xstring
 print (struct Lisp_String *) ($ & 0x00ffffff)
-print ($->size > 10000) ? "big string" : ($->data[0])@($->size)
-print $$
+output ($->size > 10000) ? "big string" : ($->data[0])@($->size)
+echo \n
 end
 document xstring
 Print the contents and address of the string $.
@@ -78,9 +77,9 @@ This command assumes that $ is an Elisp string value.
 end
 
 define xvector
-set $temp = (struct Lisp_Vector *) ($ & 0x00ffffff)
-print ($temp->size > 10000) ? "big vector" : ($temp->contents[0])@($temp->size)
-print $temp
+print (struct Lisp_Vector *) ($ & 0x00ffffff)
+output ($->size > 1000) ? "big vector" : ($->contents[0])@($->size)
+echo \n
 end
 document xvector
 Print the contents and address of the vector $.
@@ -96,8 +95,8 @@ end
 
 define xcons
 print (struct Lisp_Cons *) ($ & 0x00ffffff)
-print *$
-print $$
+output *(struct Lisp_Cons *) ($ & 0x00ffffff)
+echo \n
 end
 document xcons
 Print the contents of $, assuming it is an Elisp cons.
@@ -121,6 +120,7 @@ set print pretty on
 
 unset environment TERMCAP
 unset environment TERM
+echo TERMCAP and TERM environment variables unset.\n
 show environment DISPLAY
 set args -q
 
diff --git a/src/lisp.h b/src/lisp.h
index 070ad977f0a..7c5f9dd5e0c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -667,8 +667,8 @@ extern void defvar_int ();
 #define DEFVAR_LISP_NOPRO(lname, vname, doc) defvar_lisp_nopro (lname, vname)
 #define DEFVAR_BOOL(lname, vname, doc) defvar_bool (lname, vname)
 #define DEFVAR_INT(lname, vname, doc) defvar_int (lname, vname)
-#define DEFVAR_PER_BUFFER(lname, vname, doc)  \
- defvar_per_buffer (lname, vname)
+#define DEFVAR_PER_BUFFER(lname, vname, type, doc)  \
+ defvar_per_buffer (lname, vname, type, 0)
 
 /* Structure for recording Lisp call stack for backtrace purposes */
 
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index e098cfcd74f..305718d2e76 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -63,9 +63,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 /*
  *      Define HAVE_SELECT if the system supports the `select' system call.
+ *      SVr3.2 X ports include an emulation.
  */
 
-/* #define HAVE_SELECT */
+#ifdef HAVE_X_WINDOWS
+#define HAVE_SELECT
+#endif /* HAVE_X_WINDOWS */
 
 /*
  *      Define HAVE_PTYS if the system supports pty devices.
@@ -192,24 +195,39 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define ADDR_CORRECT(x) (x)
 
-/* Prevent -lg from being used for debugging.  Not implemented?  */
-
-#define LIBS_DEBUG
-
 /* Use terminfo instead of termcap.  */
 
 #define TERMINFO
 
+/* AT&T SVr3 X wants to be linked with shared libraries */
+
+#define LIB_X11_LIB -lX11_s
+
 /* X needs to talk on the network, so search the network library.  */
 
 #define LIBX10_SYSTEM -lnsl_s
-#define LIBX11_SYSTEM -lnsl_s
+#define LIBX11_SYSTEM -lnls -lnsl_s -lpt -lc_s
 
 /* Some variants have TIOCGETC, but the structures to go with it
    are not declared.  */
 
 #define BROKEN_TIOCGETC
 
+/* Some variants have TIOCGWINSZ, but the structures to go with it
+   are not declared.  */
+
+#define BROKEN_TIOCGWINSZ
+
+/* SVr3 does not have utimes(2) */
+
+#define USE_UTIME
+
+/* If we're using the System V X port, BSD bstring functions will be handy */
+
+#ifdef HAVE_X_WINDOWS
+#define BSTRING
+#endif /* HAVE_X_WINDOWS */
+
 /* Enable support for shared libraries in unexec.  */
 
 #define USG_SHARED_LIBRARIES
@@ -217,4 +235,3 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* On USG systems signal handlers return void */
 
 #define SIGTYPE void
-
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index c977bb1c978..f94b5251e29 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -68,7 +68,7 @@ and this notice must be preserved on all copies.  */
 #undef SIGIO
 #endif
 
-/* libc has this stuff, but not utimes. */
+/* libc has this stuff, but still not utimes. */
 
 #define HAVE_RENAME
 #define HAVE_SELECT
@@ -77,8 +77,6 @@ and this notice must be preserved on all copies.  */
 #define HAVE_GETTIMEOFDAY
 #define HAVE_DUP2
 
-#define USE_UTIME
-
 /* <sys/stat.h> *defines* stat(2) as a static function.  If "static"
  * is blank, then many files will have a public definition for stat(2).
  */
diff --git a/src/systime.h b/src/systime.h
index b5a850da1dc..9dab2deacfa 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -102,7 +102,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define EMACS_TIME int
 #define EMACS_SECS(time)                    (time)
+#define EMACS_USECS(time)                   0
 #define EMACS_SET_SECS(time, seconds)       ((time) = (seconds))
+#define EMACS_SET_USECS(time, usecs)        0
 
 #define EMACS_GET_TIME(t) ((t) = time ((long *) 0))
 #define EMACS_ADD_TIME(dest, src1, src2) ((dest) = (src1) + (src2))
@@ -118,7 +120,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define EMACS_SET_UTIMES(path, atime, mtime)                    \
   {                                                             \
-    struct time_t tv[2];                                        \
+    time_t tv[2];                                               \
     tv[0] = EMACS_SECS (atime);                                 \
     tv[1] = EMACS_SECS (mtime);                                 \
     utime ((path), tv);                                         \
diff --git a/src/systty.h b/src/systty.h
index 910810dc15d..662d6c090f2 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -169,6 +169,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Just ignore this for now and hope for the best */
 #define EMACS_GET_TTY_PGRP(fd, pgid) 0
+#define EMACS_SET_TTY_PGRP(fd, pgif) 0
 
 #endif
 
diff --git a/src/xterm.h b/src/xterm.h
index bdce1c5aeb2..3adc4dc3572 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -40,6 +40,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define MAXHEIGHT 80
 
 #ifdef HAVE_X11
+
+/* It turns out that we can auto-detect whether we're being compiled
+   with X11R3 or X11R4 by looking for the flag macros for R4 structure
+   members that R3 doesn't have.  */
+#ifdef PBaseSize
+#define HAVE_X11R4
+#endif
+
 #define PIX_TYPE unsigned long
 #define XDISPLAY x_current_display,
 #define XFlushQueue() XFlush(x_current_display)
@@ -311,6 +319,19 @@ struct x_display
   /* What kind of text cursor is drawn in this window right now?  (If
      there is no cursor (phys_cursor_x < 0), then this means nothing.  */
   enum text_cursor_kinds text_cursor_kind;
+
+  /* These are the current window manager hints.  It seems that
+     XSetWMHints, when presented with an unset bit in the `flags'
+     member of the hints structure, does not leave the corresponding
+     attribute unchanged; rather, it resets that attribute to its
+     default value.  For example, unless you set the `icon_pixmap'
+     field and the `IconPixmapHint' bit, XSetWMHints will forget what
+     your icon pixmap was.  This is rather troublesome, since some of
+     the members (for example, `input' and `icon_pixmap') want to stay
+     the same throughout the execution of Emacs.  So, we keep this
+     structure around, just leaving values in it and adding new bits
+     to the mask as we go.  */
+  XWMHints wm_hints;
 };
 
 /* When X windows are used, a glyf may be a 16 bit unsigned datum.