HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(cl-macroexpand-all): Declare.
[bpt/emacs.git]
/
src
/
termcap.c
diff --git
a/src/termcap.c
b/src/termcap.c
index
a1c068e
..
2ad31d7
100644
(file)
--- a/
src/termcap.c
+++ b/
src/termcap.c
@@
-1,6
+1,6
@@
/* Work-alike for termcap, plus extra features.
/* Work-alike for termcap, plus extra features.
- Copyright (C) 1985,
86, 93, 94, 95, 2000, 2001
- Free Software Foundation, Inc.
+ Copyright (C) 1985,
1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
+
2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-14,8
+14,8
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING. If not, write to
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-Boston, MA 0211
1-1307
, USA. */
+the Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+Boston, MA 0211
0-1301
, USA. */
/* Emacs config.h may rename various library functions such as malloc. */
#ifdef HAVE_CONFIG_H
/* Emacs config.h may rename various library functions such as malloc. */
#ifdef HAVE_CONFIG_H
@@
-144,9
+144,6
@@
find_capability (bp, cap)
return NULL;
}
return NULL;
}
-/* These are already defined in the System framework in Mac OS X and
- cause prebinding to fail. */
-#ifndef MAC_OSX
int
tgetnum (cap)
char *cap;
int
tgetnum (cap)
char *cap;
@@
-180,7
+177,6
@@
tgetstr (cap, area)
return NULL;
return tgetst1 (ptr, area);
}
return NULL;
return tgetst1 (ptr, area);
}
-#endif /* MAC_OSX */
#ifdef IS_EBCDIC_HOST
/* Table, indexed by a character in range 0200 to 0300 with 0200 subtracted,
#ifdef IS_EBCDIC_HOST
/* Table, indexed by a character in range 0200 to 0300 with 0200 subtracted,
@@
-345,11
+341,7
@@
short ospeed;
int tputs_baud_rate;
#endif
int tputs_baud_rate;
#endif
-/* Already defined in the System framework in Mac OS X and causes
- prebinding to fail. */
-#ifndef MAC_OSX
char PC;
char PC;
-#endif /* MAC_OSX */
#ifndef emacs
/* Actual baud rate if positive;
#ifndef emacs
/* Actual baud rate if positive;
@@
-357,20
+349,12
@@
char PC;
static int speeds[] =
{
static int speeds[] =
{
-#ifdef VMS
- 0, 50, 75, 110, 134, 150, -3, -6, -12, -18,
- -20, -24, -36, -48, -72, -96, -192
-#else /* not VMS */
0, 50, 75, 110, 135, 150, -2, -3, -6, -12,
-18, -24, -48, -96, -192, -288, -384, -576, -1152
0, 50, 75, 110, 135, 150, -2, -3, -6, -12,
-18, -24, -48, -96, -192, -288, -384, -576, -1152
-#endif /* not VMS */
};
#endif /* not emacs */
};
#endif /* not emacs */
-/* Already defined in the System framework in Mac OS X and causes
- prebinding to fail. */
-#ifndef MAC_OSX
void
tputs (str, nlines, outfun)
register char *str;
void
tputs (str, nlines, outfun)
register char *str;
@@
-433,7
+417,6
@@
tputs (str, nlines, outfun)
while (padcount-- > 0)
(*outfun) (PC);
}
while (padcount-- > 0)
(*outfun) (PC);
}
-#endif /* MAC_OSX */
\f
/* Finding the termcap entry in the termcap data base. */
\f
/* Finding the termcap entry in the termcap data base. */
@@
-453,33
+436,6
@@
static char *gobble_line ();
static int compare_contin ();
static int name_match ();
static int compare_contin ();
static int name_match ();
-#ifdef VMS
-
-#include <rmsdef.h>
-#include <fab.h>
-#include <nam.h>
-
-static int
-valid_filename_p (fn)
- char *fn;
-{
- struct FAB fab = cc$rms_fab;
- struct NAM nam = cc$rms_nam;
- char esa[NAM$C_MAXRSS];
-
- fab.fab$l_fna = fn;
- fab.fab$b_fns = strlen(fn);
- fab.fab$l_nam = &nam;
- fab.fab$l_fop = FAB$M_NAM;
-
- nam.nam$l_esa = esa;
- nam.nam$b_ess = sizeof esa;
-
- return SYS$PARSE(&fab, 0, 0) == RMS$_NORMAL;
-}
-
-#else /* !VMS */
-
#ifdef MSDOS /* MW, May 1993 */
static int
valid_filename_p (fn)
#ifdef MSDOS /* MW, May 1993 */
static int
valid_filename_p (fn)
@@
-491,8
+447,6
@@
valid_filename_p (fn)
#define valid_filename_p(fn) (*(fn) == '/')
#endif
#define valid_filename_p(fn) (*(fn) == '/')
#endif
-#endif /* !VMS */
-
/* Find the termcap entry data for terminal type NAME
and store it in the block that BP points to.
Record its address for future use.
/* Find the termcap entry data for terminal type NAME
and store it in the block that BP points to.
Record its address for future use.
@@
-504,9
+458,6
@@
valid_filename_p (fn)
0 if the data base is accessible but the type NAME is not defined
in it, and some other value otherwise. */
0 if the data base is accessible but the type NAME is not defined
in it, and some other value otherwise. */
-/* Already defined in the System framework in Mac OS X and causes
- prebinding to fail. */
-#ifndef MAC_OSX
int
tgetent (bp, name)
char *bp, *name;
int
tgetent (bp, name)
char *bp, *name;
@@
-665,7
+616,6
@@
tgetent (bp, name)
term_entry = bp;
return 1;
}
term_entry = bp;
return 1;
}
-#endif /* MAC_OSX */
/* Given file open on FD and buffer BUFP,
scan the file from the beginning until a line is found
/* Given file open on FD and buffer BUFP,
scan the file from the beginning until a line is found