Commit d2729198 authored by Jim Blandy's avatar Jim Blandy
Browse files

entered into RCS

parent bd307392
......@@ -2546,13 +2546,13 @@ TEX_funcs (fi)
TEX_toktab = TEX_decode_env ("TEXTAGS", TEX_defenv);
while (!feof (fi))
{ /* Scan each line in file */
{ /* Scan each line in file */
lineno++;
linecharno = charno;
charno += readline (&lb, fi);
dbp = lb.buffer;
lasthit = dbp;
while (dbp = etags_index (dbp, TEX_esc)) /* Look at each escape in line */
while (dbp = etags_index (dbp, TEX_esc)) /* Look at each escape in line */
{
register int i;
......@@ -2564,7 +2564,7 @@ TEX_funcs (fi)
if (0 <= i)
{
TEX_getit (lasthit, TEX_toktab[i].len);
break; /* We only save a line once */
break; /* We only save a line once */
}
}
}
......
......@@ -27,6 +27,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define USG5
#define USG5_3
/* SYSTEM_TYPE should indicate the kind of system you are using.
It sets the Lisp variable system-type. */
......@@ -63,12 +65,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.
*/
/* SVr3.2 ports of X include an emulation of select in the libraries. */
#ifdef HAVE_X_WINDOWS
#define HAVE_SELECT
#endif /* HAVE_X_WINDOWS */
#endif
/*
* Define HAVE_PTYS if the system supports pty devices.
......@@ -164,7 +166,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define _setjmp setjmp
#define _longjmp longjmp
/* On USG systems the system calls are interruptable by signals
/* On USG systems the system calls are interruptible by signals
that the user program has elected to catch. Thus the system call
must be retried in these cases. To handle this without massive
changes in the source code, we remap the standard system call names
......@@ -181,7 +183,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define INTERRUPTIBLE_IO
/* On USG systems these have different names */
#define index strchr
#define rindex strrchr
......@@ -199,6 +200,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define TERMINFO
/* Some variants have TIOCGETC, but the structures to go with it
are not declared. */
#define BROKEN_TIOCGETC
/* AT&T SVr3 X wants to be linked with shared libraries */
#define LIB_X11_LIB -lX11_s
......@@ -206,12 +212,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* X needs to talk on the network, so search the network library. */
#define LIBX10_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 LIBX11_SYSTEM -lnsl -lnsl_s -lpt -lc_s
#define BROKEN_TIOCGETC
/* The docs for system V/386 suggest v.3 has sigpause,
so let's give it a try. */
#define HAVE_SYSV_SIGPAUSE
/* Some variants have TIOCGWINSZ, but the structures to go with it
are not declared. */
......
......@@ -41,7 +41,26 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_X11
/* It turns out that we can auto-detect whether we're being compiled
/* HAVE_X11R4 is defined if we have the features of X11R4. It should
be defined when we're using X11R5, since X11R5 has the features of
X11R4. If, in the future, we find we need more of these flags
(HAVE_X11R5, for example), code should always be written to test
the most recent flag first:
#ifdef HAVE_X11R5
...
#elif HAVE_X11R4
...
#elif HAVE_X11
...
#endif
If you ever find yourself writing a "#ifdef HAVE_FOO" clause that
looks a lot like another one, consider moving the text into a macro
whose definition is configuration-dependent, but whose usage is
universal - like the stuff in systime.h.
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
......@@ -333,6 +352,10 @@ struct x_display
to the mask as we go. */
XWMHints wm_hints;
};
/* Return the window associated with the frame F. */
#define FRAME_X_WINDOW(f) ((f)->display.x->window_desc)
/* When X windows are used, a glyf may be a 16 bit unsigned datum.
The high order byte is the face number and is used as an index
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment