Mercurial > emacs

annotate msdos/sed2.inp @ 31538:46aca282e6b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(diff-apply-hunk): Function basically rewritten. Now understands non-unified diffs. Some functionality moved into `diff-hunk-text' and `diff-find-text'. Add OTHER-FILE, DRY-RUN, POPUP, and NOERROR arguments. If DRY-RUN is true, don't actually modify anything. Only reposition point in the patched file if the patch succeeds. Only pop up another window if POPUP is true. Emit a message describing what happened if successful, and at what line-offset. Automatically detect reversed hunks and do something appropriate. (diff-hunk-text, diff-find-text): New functions. (diff-filter-lines): Function removed. (diff-test-hunk): New function. (diff-goto-source): Rewritten in terms of diff-apply-hunk.
author Miles Bader <miles@gnu.org>
date Mon, 11 Sep 2000 13:49:38 +0000
parents 68e92dba3e27
children c3526389f463
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7204
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
1 # -sed2.inp-------------------------------------------------------------
7230
0dc95caa2188 Identify the file being patched as src/...
Richard M. Stallman <rms@gnu.org>
parents: 7204
diff changeset
2 # Configuration script for src/config.h
7204
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
3 # ----------------------------------------------------------------------
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
4 /^#undef LISP_FLOAT_TYPE *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
5 /^#undef GNU_MALLOC *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
6 /^#undef REL_ALLOC *$/s/undef/define/
15005
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
7 /^#undef HAVE_SYS_SELECT/i\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
8 #if defined(__DJGPP__) && __DJGPP__ > 1\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
9 /* In v2.0 and later almost everything is defined in <sys/config.h> */\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
10 #include <sys/config.h>\
27448
3d65a1b0f734 (HAVE_SETITIMER): Define.
Eli Zaretskii <eliz@gnu.org>
parents: 26497
diff changeset
11 #define HAVE_SETITIMER 1\
15005
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
12 #undef HAVE_SELECT\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
13 #undef _LIBC\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
14 #define HAVE_VFORK 1\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
15 #define HAVE_STRUCT_UTIMBUF 1\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
16 #define LOCALTIME_CACHE 1\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
17 #define HAVE_TZSET 1\
18836
fb373eed5b38 (HAVE_LOGB, HAVE_FREXP, HAVE_FMOD, HAVE_RINT):
Richard M. Stallman <rms@gnu.org>
parents: 15401
diff changeset
18 #define HAVE_LOGB 1\
fb373eed5b38 (HAVE_LOGB, HAVE_FREXP, HAVE_FMOD, HAVE_RINT):
Richard M. Stallman <rms@gnu.org>
parents: 15401
diff changeset
19 #define HAVE_FREXP 1\
fb373eed5b38 (HAVE_LOGB, HAVE_FREXP, HAVE_FMOD, HAVE_RINT):
Richard M. Stallman <rms@gnu.org>
parents: 15401
diff changeset
20 #define HAVE_FMOD 1\
fb373eed5b38 (HAVE_LOGB, HAVE_FREXP, HAVE_FMOD, HAVE_RINT):
Richard M. Stallman <rms@gnu.org>
parents: 15401
diff changeset
21 #define HAVE_RINT 1\
fb373eed5b38 (HAVE_LOGB, HAVE_FREXP, HAVE_FMOD, HAVE_RINT):
Richard M. Stallman <rms@gnu.org>
parents: 15401
diff changeset
22 #define HAVE_CBRT 1\
fb373eed5b38 (HAVE_LOGB, HAVE_FREXP, HAVE_FMOD, HAVE_RINT):
Richard M. Stallman <rms@gnu.org>
parents: 15401
diff changeset
23 #define HAVE_FPATHCONF 1\
fb373eed5b38 (HAVE_LOGB, HAVE_FREXP, HAVE_FMOD, HAVE_RINT):
Richard M. Stallman <rms@gnu.org>
parents: 15401
diff changeset
24 #define HAVE_SETRLIMIT 1\
26497
d7fc0ed0cd81 sed2.inp (HAVE_TM_GMTOFF, HAVE_MBLEN): Define.
Eli Zaretskii <eliz@gnu.org>
parents: 19333
diff changeset
25 #define HAVE_TM_GMTOFF 1\
d7fc0ed0cd81 sed2.inp (HAVE_TM_GMTOFF, HAVE_MBLEN): Define.
Eli Zaretskii <eliz@gnu.org>
parents: 19333
diff changeset
26 #define HAVE_MBLEN 1\
29950
f67c8d694c3a Define HAVE_STRUCT_TIMEZONE in src/config.h.
Eli Zaretskii <eliz@gnu.org>
parents: 28135
diff changeset
27 #define HAVE_STRUCT_TIMEZONE 1\
31261
68e92dba3e27 (HAVE_INDEX, HAVE_RINDEX): Define.
Eli Zaretskii <eliz@gnu.org>
parents: 29950
diff changeset
28 #define HAVE_INDEX 1\
68e92dba3e27 (HAVE_INDEX, HAVE_RINDEX): Define.
Eli Zaretskii <eliz@gnu.org>
parents: 29950
diff changeset
29 #define HAVE_RINDEX 1\
15005
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
30 #else /* not __DJGPP__ > 1 */
12133
e7d81d04043b Define STDC_HEADERS.
Karl Heuer <kwzh@gnu.org>
parents: 9572
diff changeset
31 /^#undef STDC_HEADERS *$/s/undef/define/
7204
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
32 /^#undef HAVE_SYS_TIMEB_H *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
33 /^#undef HAVE_SYS_TIME_H *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
34 # /^#undef HAVE_UNISTD_H *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
35 /^#undef HAVE_GETTIMEOFDAY *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
36 /^#undef HAVE_GETHOSTNAME *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
37 /^#undef HAVE_DUP2 *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
38 /^#undef HAVE_TM_ZONE *$/s/undef/define/
14259
c52f7f0d5fd5 (LOCALTIME_CACHE, HAVE_TZSET): Define these.
Karl Heuer <kwzh@gnu.org>
parents: 12991
diff changeset
39 /^#undef LOCALTIME_CACHE *$/s/undef/define/
c52f7f0d5fd5 (LOCALTIME_CACHE, HAVE_TZSET): Define these.
Karl Heuer <kwzh@gnu.org>
parents: 12991
diff changeset
40 /^#undef HAVE_TZSET *$/s/undef/define/
7204
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
41 /^#undef TM_IN_SYS_TIME *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
42 /^#undef TIME_WITH_SYS_TIME *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
43 /^#undef HAVE_RENAME *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
44 /^#undef HAVE_CLOSEDIR *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
45 /^#undef HAVE_RANDOM *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
46 /^#undef HAVE_MKDIR *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
47 /^#undef HAVE_RMDIR *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
48 /^#undef HAVE_BCMP *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
49 /^#undef HAVE_BCOPY *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
50 /^#undef HAVE_FREXP *$/s/undef/define/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
51 /^#undef HAVE_FTIME *$/s/undef/define/
15005
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
52 /^#undef HAVE_MKTIME *$/s/undef/define/
8249
6a072f705d7d (HAVE_STRERROR): Define.
Richard M. Stallman <rms@gnu.org>
parents: 8197
diff changeset
53 /^#undef HAVE_STRERROR *$/s/undef/define/
12991
00db8b604656 Define STDC_HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 12135
diff changeset
54 /^#undef HAVE_TIMEVAL *$/s/undef/define/
15005
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
55 / HAVE_TIMEVAL/a\
4d6af48d7446 Under DJGPP v2, use <sys/config.h> instead of most of config.h.in.
Richard M. Stallman <rms@gnu.org>
parents: 14259
diff changeset
56 #endif /* not __DJGPP__ > 1 */
7204
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
57 s/^#define USER_FULL_NAME .*$/#define USER_FULL_NAME (getenv ("NAME"))/
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
58 s/^#undef STACK_DIRECTION *$/#define STACK_DIRECTION -1/
19333
af9d0a7cd7cd EMACS_CONFIGURATION: Set to i386-pc-msdosdjgpp.
Eli Zaretskii <eliz@gnu.org>
parents: 18836
diff changeset
59 s/^#undef EMACS_CONFIGURATION *$/#define EMACS_CONFIGURATION "i386-pc-msdosdjgpp"/
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 8249
diff changeset
60 s/^#undef EMACS_CONFIG_OPTIONS *$/#define EMACS_CONFIG_OPTIONS "-"/
7204
6e219f77e69e We have bcmp. Configuration is "msdos". Get rid of ^Ms.
Richard M. Stallman <rms@gnu.org>
parents: 5219
diff changeset
61 s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"!
8197
d6a441681fb4 Use "m/intel386" instead of "m/dos386.h".
Richard M. Stallman <rms@gnu.org>
parents: 7596
diff changeset
62 s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"!
28135
fc8364eb65b1 Add PROTOTYPES and POINTER_TYPE, per the new config.in.
Eli Zaretskii <eliz@gnu.org>
parents: 27448
diff changeset
63 s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/
fc8364eb65b1 Add PROTOTYPES and POINTER_TYPE, per the new config.in.
Eli Zaretskii <eliz@gnu.org>
parents: 27448
diff changeset
64 s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/