aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2012-05-24 20:39:12 +0200
committerJoakim Verona2012-05-24 20:39:12 +0200
commit44fce8ffe7198991c41c985ff4e67ec7d407907e (patch)
tree81e28bf1b327f55c0c50b30c1c1c6d1e78c6849d
parent207460f292db1b9ede6b8ddad3ed7ac6bba026b5 (diff)
parentf18b81e6d670ea83e3ccb7c7b6aff50933120018 (diff)
downloademacs-44fce8ffe7198991c41c985ff4e67ec7d407907e.tar.gz
emacs-44fce8ffe7198991c41c985ff4e67ec7d407907e.zip
upstream
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--admin/CPP-DEFINES7
-rw-r--r--admin/ChangeLog8
-rw-r--r--admin/MAINTAINERS2
-rw-r--r--autogen/Makefile.in5
-rw-r--r--autogen/aclocal.m42
-rw-r--r--autogen/config.in57
-rwxr-xr-xautogen/configure385
-rw-r--r--configure.in168
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/misc/ChangeLog18
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/makefile.w32-in9
-rw-r--r--lib/makefile.w32-in10
-rw-r--r--lisp/ChangeLog27
-rw-r--r--lisp/emacs-lisp/edebug.el8
-rw-r--r--lisp/faces.el10
-rw-r--r--lisp/gnus/ChangeLog11
-rw-r--r--lisp/gnus/gnus.el21
-rw-r--r--lisp/gnus/nnspool.el19
-rw-r--r--lisp/mail/rmail.el36
-rw-r--r--lisp/paths.el60
-rw-r--r--lisp/progmodes/which-func.el3
-rw-r--r--lisp/version.el7
-rwxr-xr-xmake-dist6
-rw-r--r--msdos/ChangeLog5
-rw-r--r--msdos/mainmake.v23
-rw-r--r--nt/ChangeLog8
-rw-r--r--nt/config.nt35
-rw-r--r--src/ChangeLog45
-rw-r--r--src/Makefile.in7
-rw-r--r--src/alloc.c4
-rw-r--r--src/lisp.h45
-rw-r--r--src/m/README7
-rw-r--r--src/m/alpha.h53
-rw-r--r--src/m/amdx86-64.h35
-rw-r--r--src/m/ia64.h32
-rw-r--r--src/m/ibmrs6000.h46
-rw-r--r--src/m/ibms390x.h32
-rw-r--r--src/m/intel386.h29
-rw-r--r--src/m/m68k.h32
-rw-r--r--src/m/macppc.h24
-rw-r--r--src/m/sparc.h30
-rw-r--r--src/m/template.h34
-rw-r--r--src/makefile.w32-in5
-rw-r--r--src/mem-limits.h2
-rw-r--r--src/puresize.h2
-rw-r--r--src/s/aix4-2.h11
-rw-r--r--src/s/gnu-linux.h6
-rw-r--r--src/s/gnu.h2
-rw-r--r--src/s/irix6-5.h4
-rw-r--r--src/s/ms-w32.h2
-rw-r--r--src/window.h5
53 files changed, 370 insertions, 1074 deletions
diff --git a/ChangeLog b/ChangeLog
index f70731e0e67..9da0a32d568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
12012-05-22 Paul Eggert <eggert@cs.ucla.edu> 12012-05-22 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Remove src/m/*.
4 * configure.in: Remove all mention of src/m/*.
5 (machine, machfile, M_FILE, config_machfile, and_machfile): Remove.
6 All uses removed.
7 (BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
8 (BITS_PER_LONG_LONG): Move to src/lisp.h.
9 * lib/makefile.w32-in: Remove dependencies on
10 $(EMACS_ROOT)/src/m/intel386.h.
11 * make-dist: Don't make links to src/m.
12
132012-05-22 Paul Eggert <eggert@cs.ucla.edu>
14
3 * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529) 15 * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
4 Without this further fix, aclocal was being invoked unnecessarily. 16 Without this further fix, aclocal was being invoked unnecessarily.
5 17
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index d736f2354f7..c03bf6156ab 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -63,16 +63,11 @@ USER_FULL_NAME If defined, overrides the default pw->pw_gecos for getting at t
63 63
64** Replace, the definition is trivial: SWITCH_ENUM_CAST 64** Replace, the definition is trivial: SWITCH_ENUM_CAST
65 65
66** Defines from src/m/*.h and src/s/*.h. Some of these might not be used in the code anymore, so they can be removed. The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/[sm]/*.h. 66** Defines from src/s/*.h. Some of these might not be used in the code anymore, so they can be removed. The HAVE_* definitions are probably handled by autoconf, so it might be possible to just remove them from src/s/*.h.
67 67
68 68
69AIX 69AIX
70AMPERSAND_FULL_NAME 70AMPERSAND_FULL_NAME
71BITS_PER_EMACS_INT
72BITS_PER_LONG
73BITS_PER_CHAR
74BITS_PER_SHORT
75BITS_PER_INT
76BROKEN_DATAGRAM_SOCKETS 71BROKEN_DATAGRAM_SOCKETS
77BROKEN_FIONREAD 72BROKEN_FIONREAD
78BROKEN_GET_CURRENT_DIR_NAME 73BROKEN_GET_CURRENT_DIR_NAME
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5ee31127006..c9e9d4a1acc 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
12012-05-22 Paul Eggert <eggert@cs.ucla.edu>
2
3 Remove src/m/*.
4 * CPP-DEFINES: Do not mention src/m/*.h.
5 (BITS_PER_EMACS_INT, BITS_PER_LONG, BITS_PER_CHAR)
6 (BITS_PER_SHORT, BITS_PER_INT): Remove.
7 * MAINTAINERS: Remove src/m/.
8
12012-05-21 Paul Eggert <eggert@cs.ucla.edu> 92012-05-21 Paul Eggert <eggert@cs.ucla.edu>
2 10
3 Use full name for m4/gnulib-comp.m4. (Bug#11529) 11 Use full name for m4/gnulib-comp.m4. (Bug#11529)
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index bfac347eb15..86d319d65d5 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -171,7 +171,6 @@ src/insdel.c
171src/image.c 171src/image.c
172src/lastfile.c 172src/lastfile.c
173src/lread.c 173src/lread.c
174src/m/
175src/macros.c 174src/macros.c
176src/makefile.w32-in 175src/makefile.w32-in
177src/marker.c 176src/marker.c
@@ -220,4 +219,3 @@ src/xmenu.c
220src/xrdb.c 219src/xrdb.c
221src/xselect.c 220src/xselect.c
222src/xterm.c 221src/xterm.c
223
diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index a4d5f11ca9c..4e733f74759 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -66,8 +66,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
66 $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/c-strtod.m4 \ 66 $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/c-strtod.m4 \
67 $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/extensions.m4 \ 67 $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/extensions.m4 \
68 $(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/getloadavg.m4 \ 68 $(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/getloadavg.m4 \
69 $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gl-comp.m4 \ 69 $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gnulib-common.m4 \
70 $(top_srcdir)/m4/gnulib-common.m4 \ 70 $(top_srcdir)/m4/gnulib-comp.m4 \
71 $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inttypes.m4 \ 71 $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inttypes.m4 \
72 $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/longlong.m4 \ 72 $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/longlong.m4 \
73 $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/manywarnings.m4 \ 73 $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/manywarnings.m4 \
@@ -535,7 +535,6 @@ MAINT = @MAINT@
535MAKEINFO = @MAKEINFO@ 535MAKEINFO = @MAKEINFO@
536MKDEPDIR = @MKDEPDIR@ 536MKDEPDIR = @MKDEPDIR@
537MKDIR_P = @MKDIR_P@ 537MKDIR_P = @MKDIR_P@
538M_FILE = @M_FILE@
539NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ 538NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
540NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ 539NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
541NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ 540NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
diff --git a/autogen/aclocal.m4 b/autogen/aclocal.m4
index f74fb730dc9..a334fa54709 100644
--- a/autogen/aclocal.m4
+++ b/autogen/aclocal.m4
@@ -992,8 +992,8 @@ m4_include([m4/extensions.m4])
992m4_include([m4/filemode.m4]) 992m4_include([m4/filemode.m4])
993m4_include([m4/getloadavg.m4]) 993m4_include([m4/getloadavg.m4])
994m4_include([m4/getopt.m4]) 994m4_include([m4/getopt.m4])
995m4_include([m4/gl-comp.m4])
996m4_include([m4/gnulib-common.m4]) 995m4_include([m4/gnulib-common.m4])
996m4_include([m4/gnulib-comp.m4])
997m4_include([m4/include_next.m4]) 997m4_include([m4/include_next.m4])
998m4_include([m4/inttypes.m4]) 998m4_include([m4/inttypes.m4])
999m4_include([m4/largefile.m4]) 999m4_include([m4/largefile.m4])
diff --git a/autogen/config.in b/autogen/config.in
index b08960e0fd4..61439b72487 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1006,13 +1006,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1006/* Define to the version of this package. */ 1006/* Define to the version of this package. */
1007#undef PACKAGE_VERSION 1007#undef PACKAGE_VERSION
1008 1008
1009/* Define as `void' if your compiler accepts `void *'; otherwise define as
1010 `char'. */
1011#undef POINTER_TYPE
1012
1013/* Define to 1 if the C compiler supports function prototypes. */
1014#undef PROTOTYPES
1015
1016/* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno. 1009/* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno.
1017 */ 1010 */
1018#undef PTHREAD_SIGMASK_FAILS_WITH_ERRNO 1011#undef PTHREAD_SIGMASK_FAILS_WITH_ERRNO
@@ -1222,9 +1215,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1222 used. */ 1215 used. */
1223#undef __GETOPT_PREFIX 1216#undef __GETOPT_PREFIX
1224 1217
1225/* Define like PROTOTYPES; this can be used by system headers. */
1226#undef __PROTOTYPES
1227
1228/* Ensure that <stdint.h> defines the limit macros, since gnulib's 1218/* Ensure that <stdint.h> defines the limit macros, since gnulib's
1229 <inttypes.h> relies on them. */ 1219 <inttypes.h> relies on them. */
1230#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS 1220#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS
@@ -1236,15 +1226,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1236 declarations. Define as empty for no equivalent. */ 1226 declarations. Define as empty for no equivalent. */
1237#undef __restrict_arr 1227#undef __restrict_arr
1238 1228
1239/* Define to the used machine dependent file. */
1240#undef config_machfile
1241
1242/* Define to the used os dependent file. */ 1229/* Define to the used os dependent file. */
1243#undef config_opsysfile 1230#undef config_opsysfile
1244 1231
1245/* Define to empty if `const' does not conform to ANSI C. */
1246#undef const
1247
1248/* A replacement for va_copy, if needed. */ 1232/* A replacement for va_copy, if needed. */
1249#define gl_va_copy(a,b) ((a) = (b)) 1233#define gl_va_copy(a,b) ((a) = (b))
1250 1234
@@ -1338,10 +1322,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1338/* Define as `fork' if `vfork' does not work. */ 1322/* Define as `fork' if `vfork' does not work. */
1339#undef vfork 1323#undef vfork
1340 1324
1341/* Define to empty if the keyword `volatile' does not work. Warning: valid
1342 code using `volatile' can become incorrect without. Disable with care. */
1343#undef volatile
1344
1345 1325
1346/* On AIX 3 this must be included before any other include file. */ 1326/* On AIX 3 this must be included before any other include file. */
1347#include <alloca.h> 1327#include <alloca.h>
@@ -1362,11 +1342,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1362 1342
1363#define subprocesses 1343#define subprocesses
1364 1344
1365/* Include the os and machine dependent files. */ 1345/* Include the os dependent file. */
1366#include config_opsysfile 1346#include config_opsysfile
1367#ifdef config_machfile
1368# include config_machfile
1369#endif
1370 1347
1371/* GNUstep needs a bit more pure memory. Of the existing knobs, 1348/* GNUstep needs a bit more pure memory. Of the existing knobs,
1372 SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. 1349 SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.
@@ -1390,38 +1367,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1390#endif 1367#endif
1391#endif 1368#endif
1392 1369
1393/* These default definitions are good for almost all machines.
1394 Any exceptions should override them in m/MACHINE.h.
1395 They must be usable in preprocessor conditionals. */
1396
1397#ifndef BITS_PER_CHAR
1398#define BITS_PER_CHAR 8
1399#endif
1400
1401#ifndef BITS_PER_SHORT
1402#define BITS_PER_SHORT 16
1403#endif
1404
1405#ifndef BITS_PER_INT
1406#define BITS_PER_INT 32
1407#endif
1408
1409#ifndef BITS_PER_LONG
1410#ifdef _LP64
1411#define BITS_PER_LONG 64
1412#else
1413#define BITS_PER_LONG 32
1414#endif
1415#endif
1416
1417#if !defined BITS_PER_LONG_LONG && HAVE_LONG_LONG_INT
1418#define BITS_PER_LONG_LONG 64
1419#endif
1420
1421/* Define if the compiler supports function prototypes. It may do so but
1422 not define __STDC__ (e.g. DEC C by default) or may define it as zero. */
1423#undef PROTOTYPES
1424
1425#include <string.h> 1370#include <string.h>
1426#include <stdlib.h> 1371#include <stdlib.h>
1427 1372
diff --git a/autogen/configure b/autogen/configure
index edd092f7f81..2a5ad68e59e 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1108,7 +1108,6 @@ ns_appresdir
1108ns_appbindir 1108ns_appbindir
1109ns_appdir 1109ns_appdir
1110S_FILE 1110S_FILE
1111M_FILE
1112X_TOOLKIT_TYPE 1111X_TOOLKIT_TYPE
1113GNUSTEP_CFLAGS 1112GNUSTEP_CFLAGS
1114C_SWITCH_X_SITE 1113C_SWITCH_X_SITE
@@ -2397,45 +2396,6 @@ $as_echo "$ac_res" >&6; }
2397 2396
2398} # ac_fn_c_check_header_compile 2397} # ac_fn_c_check_header_compile
2399 2398
2400# ac_fn_c_check_decl LINENO SYMBOL VAR
2401# ------------------------------------
2402# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
2403ac_fn_c_check_decl ()
2404{
2405 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2406 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
2407$as_echo_n "checking whether $2 is declared... " >&6; }
2408if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2409 $as_echo_n "(cached) " >&6
2410else
2411 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2412/* end confdefs.h. */
2413$4
2414int
2415main ()
2416{
2417#ifndef $2
2418 (void) $2;
2419#endif
2420
2421 ;
2422 return 0;
2423}
2424_ACEOF
2425if ac_fn_c_try_compile "$LINENO"; then :
2426 eval "$3=yes"
2427else
2428 eval "$3=no"
2429fi
2430rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2431fi
2432eval ac_res=\$$3
2433 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2434$as_echo "$ac_res" >&6; }
2435 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2436
2437} # ac_fn_c_check_decl
2438
2439# ac_fn_c_try_link LINENO 2399# ac_fn_c_try_link LINENO
2440# ----------------------- 2400# -----------------------
2441# Try to link conftest.$ac_ext, and return whether this succeeded. 2401# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -2482,6 +2442,45 @@ fi
2482 2442
2483} # ac_fn_c_try_link 2443} # ac_fn_c_try_link
2484 2444
2445# ac_fn_c_check_decl LINENO SYMBOL VAR
2446# ------------------------------------
2447# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
2448ac_fn_c_check_decl ()
2449{
2450 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2451 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
2452$as_echo_n "checking whether $2 is declared... " >&6; }
2453if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2454 $as_echo_n "(cached) " >&6
2455else
2456 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2457/* end confdefs.h. */
2458$4
2459int
2460main ()
2461{
2462#ifndef $2
2463 (void) $2;
2464#endif
2465
2466 ;
2467 return 0;
2468}
2469_ACEOF
2470if ac_fn_c_try_compile "$LINENO"; then :
2471 eval "$3=yes"
2472else
2473 eval "$3=no"
2474fi
2475rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2476fi
2477eval ac_res=\$$3
2478 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2479$as_echo "$ac_res" >&6; }
2480 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2481
2482} # ac_fn_c_check_decl
2483
2485# ac_fn_c_check_header_preproc LINENO HEADER VAR 2484# ac_fn_c_check_header_preproc LINENO HEADER VAR
2486# ---------------------------------------------- 2485# ----------------------------------------------
2487# Tests whether HEADER is present, setting the cache variable VAR accordingly. 2486# Tests whether HEADER is present, setting the cache variable VAR accordingly.
@@ -4422,8 +4421,8 @@ case "${srcdir}" in
4422 * ) srcdir="`(cd ${srcdir}; pwd)`" ;; 4421 * ) srcdir="`(cd ${srcdir}; pwd)`" ;;
4423esac 4422esac
4424 4423
4425#### Given the configuration name, set machfile and opsysfile to the 4424#### Given the configuration name, set opsysfile to the
4426#### names of the m/*.h and s/*.h files we should use. 4425#### name of s/*.h file we should use.
4427 4426
4428### Canonicalize the configuration name. 4427### Canonicalize the configuration name.
4429 4428
@@ -4505,13 +4504,11 @@ configuration=${host_alias-${build_alias-$host}}
4505 4504
4506### If you add support for a new configuration, add code to this 4505### If you add support for a new configuration, add code to this
4507### switch statement to recognize your configuration name and select 4506### switch statement to recognize your configuration name and select
4508### the appropriate operating system and machine description files. 4507### the appropriate operating system file.
4509 4508
4510### You would hope that you could choose an m/*.h file pretty much 4509### You would hope that you could choose an s/*.h
4511### based on the machine portion of the configuration name, and an s/*.h
4512### file based on the operating system portion. However, it turns out 4510### file based on the operating system portion. However, it turns out
4513### that each m/*.h file is pretty manufacturer-specific - for 4511### that each s/*.h file is pretty manufacturer-specific.
4514### example mips.h is MIPS
4515### So we basically have to have a special case for each 4512### So we basically have to have a special case for each
4516### configuration name. 4513### configuration name.
4517### 4514###
@@ -4521,82 +4518,40 @@ configuration=${host_alias-${build_alias-$host}}
4521### prepared to handle anything reasonably. If version numbers 4518### prepared to handle anything reasonably. If version numbers
4522### matter, be sure /etc/MACHINES says something about it. 4519### matter, be sure /etc/MACHINES says something about it.
4523 4520
4524machine='' opsys='' unported=no 4521opsys='' unported=no
4525case "${canonical}" in 4522case "${canonical}" in
4526 4523
4527 ## GNU/Linux and similar ports 4524 ## GNU/Linux and similar ports
4528 *-*-linux* ) 4525 *-*-linux* )
4529 opsys=gnu-linux 4526 opsys=gnu-linux
4530 case ${canonical} in
4531 alpha*) machine=alpha ;;
4532 s390x-*) machine=ibms390x ;;
4533 powerpc*) machine=macppc ;;
4534 sparc*) machine=sparc ;;
4535 ia64*) machine=ia64 ;;
4536 m68k*) machine=m68k ;;
4537 x86_64*) machine=amdx86-64 ;;
4538 esac
4539 ;; 4527 ;;
4540 4528
4541 ## FreeBSD ports 4529 ## FreeBSD ports
4542 *-*-freebsd* ) 4530 *-*-freebsd* )
4543 opsys=freebsd 4531 opsys=freebsd
4544 case "${canonical}" in
4545 alpha*) machine=alpha ;;
4546 amd64-*|x86_64-*) machine=amdx86-64 ;;
4547 ia64-*) machine=ia64 ;;
4548 i[3456]86-*) machine=intel386 ;;
4549 powerpc-*) machine=macppc ;;
4550 sparc-*) machine=sparc ;;
4551 sparc64-*) machine=sparc ;;
4552 esac
4553 ;; 4532 ;;
4554 4533
4555 ## FreeBSD kernel + glibc based userland 4534 ## FreeBSD kernel + glibc based userland
4556 *-*-kfreebsd*gnu* ) 4535 *-*-kfreebsd*gnu* )
4557 opsys=gnu-kfreebsd 4536 opsys=gnu-kfreebsd
4558 case "${canonical}" in
4559 alpha*) machine=alpha ;;
4560 amd64-*|x86_64-*) machine=amdx86-64 ;;
4561 ia64-*) machine=ia64 ;;
4562 i[3456]86-*) machine=intel386 ;;
4563 powerpc-*) machine=macppc ;;
4564 sparc-*) machine=sparc ;;
4565 sparc64-*) machine=sparc ;;
4566 esac
4567 ;; 4537 ;;
4568 4538
4569 ## NetBSD ports 4539 ## NetBSD ports
4570 *-*-netbsd* ) 4540 *-*-netbsd* )
4571 opsys=netbsd 4541 opsys=netbsd
4572 case "${canonical}" in
4573 alpha*) machine=alpha ;;
4574 x86_64-*) machine=amdx86-64 ;;
4575 i[3456]86-*) machine=intel386 ;;
4576 m68k-*) machine=m68k ;;
4577 powerpc-*) machine=macppc ;;
4578 sparc*-) machine=sparc ;;
4579 esac
4580 ;; 4542 ;;
4581 4543
4582 ## OpenBSD ports 4544 ## OpenBSD ports
4583 *-*-openbsd* ) 4545 *-*-openbsd* )
4584 opsys=openbsd 4546 opsys=openbsd
4585 case "${canonical}" in
4586 alpha*) machine=alpha ;;
4587 x86_64-*) machine=amdx86-64 ;;
4588 i386-*) machine=intel386 ;;
4589 powerpc-*) machine=macppc ;;
4590 sparc*) machine=sparc ;;
4591 esac
4592 ;; 4547 ;;
4593 4548
4594 ## Apple Darwin / Mac OS X 4549 ## Apple Darwin / Mac OS X
4595 *-apple-darwin* ) 4550 *-apple-darwin* )
4596 case "${canonical}" in 4551 case "${canonical}" in
4597 i[3456]86-* ) machine=intel386 ;; 4552 i[3456]86-* ) ;;
4598 powerpc-* ) machine=macppc ;; 4553 powerpc-* ) ;;
4599 x86_64-* ) machine=amdx86-64 ;; 4554 x86_64-* ) ;;
4600 * ) unported=yes ;; 4555 * ) unported=yes ;;
4601 esac 4556 esac
4602 opsys=darwin 4557 opsys=darwin
@@ -4619,16 +4574,16 @@ case "${canonical}" in
4619 4574
4620 ## IBM machines 4575 ## IBM machines
4621 rs6000-ibm-aix4.[23]* ) 4576 rs6000-ibm-aix4.[23]* )
4622 machine=ibmrs6000 opsys=aix4-2 4577 opsys=aix4-2
4623 ;; 4578 ;;
4624 powerpc-ibm-aix4.[23]* ) 4579 powerpc-ibm-aix4.[23]* )
4625 machine=ibmrs6000 opsys=aix4-2 4580 opsys=aix4-2
4626 ;; 4581 ;;
4627 rs6000-ibm-aix[56]* ) 4582 rs6000-ibm-aix[56]* )
4628 machine=ibmrs6000 opsys=aix4-2 4583 opsys=aix4-2
4629 ;; 4584 ;;
4630 powerpc-ibm-aix[56]* ) 4585 powerpc-ibm-aix[56]* )
4631 machine=ibmrs6000 opsys=aix4-2 4586 opsys=aix4-2
4632 ;; 4587 ;;
4633 4588
4634 ## Silicon Graphics machines 4589 ## Silicon Graphics machines
@@ -4646,9 +4601,9 @@ case "${canonical}" in
4646 | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \ 4601 | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
4647 | x86_64-*-solaris2* | x86_64-*-sunos5*) 4602 | x86_64-*-solaris2* | x86_64-*-sunos5*)
4648 case "${canonical}" in 4603 case "${canonical}" in
4649 i[3456]86-*-* ) machine=intel386 ;; 4604 i[3456]86-*-* ) ;;
4650 amd64-*-*|x86_64-*-*) machine=amdx86-64 ;; 4605 amd64-*-*|x86_64-*-*) ;;
4651 sparc* ) machine=sparc ;; 4606 sparc* ) ;;
4652 * ) unported=yes ;; 4607 * ) unported=yes ;;
4653 esac 4608 esac
4654 case "${canonical}" in 4609 case "${canonical}" in
@@ -4680,7 +4635,6 @@ case "${canonical}" in
4680 4635
4681 ## Intel 386 machines where we don't care about the manufacturer. 4636 ## Intel 386 machines where we don't care about the manufacturer.
4682 i[3456]86-*-* ) 4637 i[3456]86-*-* )
4683 machine=intel386
4684 case "${canonical}" in 4638 case "${canonical}" in
4685 *-cygwin ) opsys=cygwin ;; 4639 *-cygwin ) opsys=cygwin ;;
4686 *-darwin* ) opsys=darwin ;; 4640 *-darwin* ) opsys=darwin ;;
@@ -4718,11 +4672,6 @@ if test $unported = yes; then
4718Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5 4672Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5
4719fi 4673fi
4720 4674
4721if test -n "$machine"; then
4722 machfile="m/${machine}.h"
4723else
4724 machfile=
4725fi
4726opsysfile="s/${opsys}.h" 4675opsysfile="s/${opsys}.h"
4727 4676
4728 4677
@@ -7805,23 +7754,6 @@ fi
7805 7754
7806 7755
7807 7756
7808## Although we're running on an amd64 kernel, we're actually compiling for
7809## the x86 architecture. The user should probably have provided an
7810## explicit --build to `configure', but if everything else than the kernel
7811## is running in i386 mode, we can help them out.
7812if test "$machine" = "amdx86-64"; then
7813 ac_fn_c_check_decl "$LINENO" "i386" "ac_cv_have_decl_i386" "$ac_includes_default"
7814if test "x$ac_cv_have_decl_i386" = x""yes; then :
7815
7816fi
7817
7818 if test "$ac_cv_have_decl_i386" = "yes"; then
7819 canonical=`echo "$canonical" | sed -e 's/^amd64/i386/' -e 's/^x86_64/i386/'`
7820 machine=intel386
7821 machfile="m/${machine}.h"
7822 fi
7823fi
7824
7825# Extract the first word of "install-info", so it can be a program name with args. 7757# Extract the first word of "install-info", so it can be a program name with args.
7826set dummy install-info; ac_word=$2 7758set dummy install-info; ac_word=$2
7827{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7759{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -8197,7 +8129,8 @@ esac
8197 8129
8198 8130
8199C_SWITCH_MACHINE= 8131C_SWITCH_MACHINE=
8200if test "$machine" = "alpha"; then 8132case $canonical in
8133 alpha*)
8201 ac_fn_c_check_decl "$LINENO" "__ELF__" "ac_cv_have_decl___ELF__" "$ac_includes_default" 8134 ac_fn_c_check_decl "$LINENO" "__ELF__" "ac_cv_have_decl___ELF__" "$ac_includes_default"
8202if test "x$ac_cv_have_decl___ELF__" = x""yes; then : 8135if test "x$ac_cv_have_decl___ELF__" = x""yes; then :
8203 8136
@@ -8217,7 +8150,8 @@ fi
8217 else 8150 else
8218 UNEXEC_OBJ=unexalpha.o 8151 UNEXEC_OBJ=unexalpha.o
8219 fi 8152 fi
8220fi 8153 ;;
8154esac
8221 8155
8222 8156
8223 8157
@@ -9397,170 +9331,6 @@ fi
9397>>>>>>> MERGE-SOURCE 9331>>>>>>> MERGE-SOURCE
9398 9332
9399 9333
9400
9401{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function prototypes" >&5
9402$as_echo_n "checking for function prototypes... " >&6; }
9403if test "$ac_cv_prog_cc_c89" != no; then
9404 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9405$as_echo "yes" >&6; }
9406
9407$as_echo "#define PROTOTYPES 1" >>confdefs.h
9408
9409
9410$as_echo "#define __PROTOTYPES 1" >>confdefs.h
9411
9412else
9413 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9414$as_echo "no" >&6; }
9415fi
9416
9417{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
9418$as_echo_n "checking for working volatile... " >&6; }
9419if test "${ac_cv_c_volatile+set}" = set; then :
9420 $as_echo_n "(cached) " >&6
9421else
9422 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9423/* end confdefs.h. */
9424
9425int
9426main ()
9427{
9428
9429volatile int x;
9430int * volatile y = (int *) 0;
9431return !x && !y;
9432 ;
9433 return 0;
9434}
9435_ACEOF
9436if ac_fn_c_try_compile "$LINENO"; then :
9437 ac_cv_c_volatile=yes
9438else
9439 ac_cv_c_volatile=no
9440fi
9441rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9442fi
9443{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
9444$as_echo "$ac_cv_c_volatile" >&6; }
9445if test $ac_cv_c_volatile = no; then
9446
9447$as_echo "#define volatile /**/" >>confdefs.h
9448
9449fi
9450
9451{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
9452$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
9453if test "${ac_cv_c_const+set}" = set; then :
9454 $as_echo_n "(cached) " >&6
9455else
9456 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9457/* end confdefs.h. */
9458
9459int
9460main ()
9461{
9462/* FIXME: Include the comments suggested by Paul. */
9463#ifndef __cplusplus
9464 /* Ultrix mips cc rejects this. */
9465 typedef int charset[2];
9466 const charset cs;
9467 /* SunOS 4.1.1 cc rejects this. */
9468 char const *const *pcpcc;
9469 char **ppc;
9470 /* NEC SVR4.0.2 mips cc rejects this. */
9471 struct point {int x, y;};
9472 static struct point const zero = {0,0};
9473 /* AIX XL C 1.02.0.0 rejects this.
9474 It does not let you subtract one const X* pointer from another in
9475 an arm of an if-expression whose if-part is not a constant
9476 expression */
9477 const char *g = "string";
9478 pcpcc = &g + (g ? g-g : 0);
9479 /* HPUX 7.0 cc rejects these. */
9480 ++pcpcc;
9481 ppc = (char**) pcpcc;
9482 pcpcc = (char const *const *) ppc;
9483 { /* SCO 3.2v4 cc rejects this. */
9484 char *t;
9485 char const *s = 0 ? (char *) 0 : (char const *) 0;
9486
9487 *t++ = 0;
9488 if (s) return 0;
9489 }
9490 { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
9491 int x[] = {25, 17};
9492 const int *foo = &x[0];
9493 ++foo;
9494 }
9495 { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
9496 typedef const int *iptr;
9497 iptr p = 0;
9498 ++p;
9499 }
9500 { /* AIX XL C 1.02.0.0 rejects this saying
9501 "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
9502 struct s { int j; const int *ap[3]; };
9503 struct s *b; b->j = 5;
9504 }
9505 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
9506 const int foo = 10;
9507 if (!foo) return 0;
9508 }
9509 return !cs[0] && !zero.x;
9510#endif
9511
9512 ;
9513 return 0;
9514}
9515_ACEOF
9516if ac_fn_c_try_compile "$LINENO"; then :
9517 ac_cv_c_const=yes
9518else
9519 ac_cv_c_const=no
9520fi
9521rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9522fi
9523{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
9524$as_echo "$ac_cv_c_const" >&6; }
9525if test $ac_cv_c_const = no; then
9526
9527$as_echo "#define const /**/" >>confdefs.h
9528
9529fi
9530
9531{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for void * support" >&5
9532$as_echo_n "checking for void * support... " >&6; }
9533if test "${emacs_cv_void_star+set}" = set; then :
9534 $as_echo_n "(cached) " >&6
9535else
9536 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9537/* end confdefs.h. */
9538
9539int
9540main ()
9541{
9542void * foo;
9543 ;
9544 return 0;
9545}
9546_ACEOF
9547if ac_fn_c_try_compile "$LINENO"; then :
9548 emacs_cv_void_star=yes
9549else
9550 emacs_cv_void_star=no
9551fi
9552rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9553fi
9554{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_void_star" >&5
9555$as_echo "$emacs_cv_void_star" >&6; }
9556if test $emacs_cv_void_star = yes; then
9557 $as_echo "#define POINTER_TYPE void" >>confdefs.h
9558
9559else
9560 $as_echo "#define POINTER_TYPE char" >>confdefs.h
9561
9562fi
9563
9564 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 9334 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
9565$as_echo_n "checking whether byte ordering is bigendian... " >&6; } 9335$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
9566if test "${ac_cv_c_bigendian+set}" = set; then : 9336if test "${ac_cv_c_bigendian+set}" = set; then :
@@ -10432,7 +10202,7 @@ case ${HAVE_X11} in
10432 yes ) HAVE_MENUS=yes ;; 10202 yes ) HAVE_MENUS=yes ;;
10433esac 10203esac
10434 10204
10435# Do the opsystem or machine files prohibit the use of the GNU malloc? 10205# Does the opsystem file prohibit the use of the GNU malloc?
10436# Assume not, until told otherwise. 10206# Assume not, until told otherwise.
10437GNU_MALLOC=yes 10207GNU_MALLOC=yes
10438 10208
@@ -16186,11 +15956,6 @@ version=$PACKAGE_VERSION
16186 15956
16187## Used in lwlib/Makefile.in. 15957## Used in lwlib/Makefile.in.
16188 15958
16189if test -n "${machfile}"; then
16190 M_FILE="\$(srcdir)/${machfile}"
16191else
16192 M_FILE=
16193fi
16194S_FILE="\$(srcdir)/${opsysfile}" 15959S_FILE="\$(srcdir)/${opsysfile}"
16195 15960
16196 15961
@@ -16201,7 +15966,6 @@ S_FILE="\$(srcdir)/${opsysfile}"
16201 15966
16202 15967
16203 15968
16204
16205cat >>confdefs.h <<_ACEOF 15969cat >>confdefs.h <<_ACEOF
16206#define EMACS_CONFIGURATION "${canonical}" 15970#define EMACS_CONFIGURATION "${canonical}"
16207_ACEOF 15971_ACEOF
@@ -16211,13 +15975,6 @@ cat >>confdefs.h <<_ACEOF
16211#define EMACS_CONFIG_OPTIONS "${ac_configure_args}" 15975#define EMACS_CONFIG_OPTIONS "${ac_configure_args}"
16212_ACEOF 15976_ACEOF
16213 15977
16214if test -n "$machfile"; then
16215
16216cat >>confdefs.h <<_ACEOF
16217#define config_machfile "${machfile}"
16218_ACEOF
16219
16220fi
16221 15978
16222cat >>confdefs.h <<_ACEOF 15979cat >>confdefs.h <<_ACEOF
16223#define config_opsysfile "${opsysfile}" 15980#define config_opsysfile "${opsysfile}"
@@ -24457,8 +24214,7 @@ case "$opsys" in
24457 ## #ifndef LD_SWITCH_SYSTEM 24214 ## #ifndef LD_SWITCH_SYSTEM
24458 ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF))) 24215 ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
24459 ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to: 24216 ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to:
24460 ## not using gcc, darwin system not on an alpha (ie darwin, since 24217 ## not using gcc, darwin.
24461 ## darwin + alpha does not occur).
24462 ## Because this was done in src/Makefile.in, the resulting part of 24218 ## Because this was done in src/Makefile.in, the resulting part of
24463 ## LD_SWITCH_SYSTEM was not used in configure (ie, in ac_link). 24219 ## LD_SWITCH_SYSTEM was not used in configure (ie, in ac_link).
24464 ## It therefore seems cleaner to put this in LD_SWITCH_SYSTEM_TEMACS, 24220 ## It therefore seems cleaner to put this in LD_SWITCH_SYSTEM_TEMACS,
@@ -24498,12 +24254,12 @@ case "$opsys" in
24498 ## will also work on earlier NetBSD releases. 24254 ## will also work on earlier NetBSD releases.
24499 netbsd|openbsd) LD_FIRSTFLAG="-nostartfiles" ;; 24255 netbsd|openbsd) LD_FIRSTFLAG="-nostartfiles" ;;
24500 24256
24501 ## macpcc: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says 24257 ## powerpc*: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says
24502 ## MkLinux/LinuxPPC needs this. 24258 ## MkLinux/LinuxPPC needs this.
24503 ## ibms390x only supports opsys = gnu-linux so it can be added here. 24259 ## s390x-* only supports opsys = gnu-linux so it can be added here.
24504 gnu-*) 24260 gnu-*)
24505 case "$machine" in 24261 case "$canonical" in
24506 macppc|ibms390x) LD_FIRSTFLAG="-nostdlib" ;; 24262 powerpc*|s390x-*) LD_FIRSTFLAG="-nostdlib" ;;
24507 esac 24263 esac
24508 ;; 24264 ;;
24509esac 24265esac
@@ -24517,7 +24273,7 @@ $as_echo "#define ORDINARY_LINK 1" >>confdefs.h
24517 24273
24518 24274
24519## The system files defining neither ORDINARY_LINK nor LD_FIRSTFLAG are: 24275## The system files defining neither ORDINARY_LINK nor LD_FIRSTFLAG are:
24520## freebsd, gnu-* not on macppc|ibms390x. 24276## freebsd, gnu-* not on powerpc*|s390x*.
24521elif test "x$GCC" = "xyes" && test "x$LD_FIRSTFLAG" = "x"; then 24277elif test "x$GCC" = "xyes" && test "x$LD_FIRSTFLAG" = "x"; then
24522 24278
24523 ## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure 24279 ## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
@@ -24590,17 +24346,12 @@ if test "${HAVE_GTK}" = "yes"; then
24590 USE_X_TOOLKIT=GTK 24346 USE_X_TOOLKIT=GTK
24591fi 24347fi
24592 24348
24593and_machfile=
24594if test -n "$machfile"; then
24595 and_machfile=" and \`${machfile}'"
24596fi
24597
24598echo " 24349echo "
24599Configured for \`${canonical}'. 24350Configured for \`${canonical}'.
24600 24351
24601 Where should the build process find the source code? ${srcdir} 24352 Where should the build process find the source code? ${srcdir}
24602 What operating system and machine description files should Emacs use? 24353 What operating system file should Emacs use?
24603 \`${opsysfile}'${and_machfile} 24354 \`${opsysfile}'
24604 What compiler should emacs be built with? ${CC} ${CFLAGS} 24355 What compiler should emacs be built with? ${CC} ${CFLAGS}
24605 Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason} 24356 Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason}
24606 Should Emacs use a relocating allocator for buffers? ${REL_ALLOC} 24357 Should Emacs use a relocating allocator for buffers? ${REL_ALLOC}
diff --git a/configure.in b/configure.in
index e4962b0a405..97ed460c7ec 100644
--- a/configure.in
+++ b/configure.in
@@ -377,8 +377,8 @@ case "${srcdir}" in
377 * ) srcdir="`(cd ${srcdir}; pwd)`" ;; 377 * ) srcdir="`(cd ${srcdir}; pwd)`" ;;
378esac 378esac
379 379
380#### Given the configuration name, set machfile and opsysfile to the 380#### Given the configuration name, set opsysfile to the
381#### names of the m/*.h and s/*.h files we should use. 381#### name of s/*.h file we should use.
382 382
383### Canonicalize the configuration name. 383### Canonicalize the configuration name.
384 384
@@ -398,13 +398,11 @@ dnl quotation begins
398 398
399### If you add support for a new configuration, add code to this 399### If you add support for a new configuration, add code to this
400### switch statement to recognize your configuration name and select 400### switch statement to recognize your configuration name and select
401### the appropriate operating system and machine description files. 401### the appropriate operating system file.
402 402
403### You would hope that you could choose an m/*.h file pretty much 403### You would hope that you could choose an s/*.h
404### based on the machine portion of the configuration name, and an s/*.h
405### file based on the operating system portion. However, it turns out 404### file based on the operating system portion. However, it turns out
406### that each m/*.h file is pretty manufacturer-specific - for 405### that each s/*.h file is pretty manufacturer-specific.
407### example mips.h is MIPS
408### So we basically have to have a special case for each 406### So we basically have to have a special case for each
409### configuration name. 407### configuration name.
410### 408###
@@ -414,82 +412,40 @@ dnl quotation begins
414### prepared to handle anything reasonably. If version numbers 412### prepared to handle anything reasonably. If version numbers
415### matter, be sure /etc/MACHINES says something about it. 413### matter, be sure /etc/MACHINES says something about it.
416 414
417machine='' opsys='' unported=no 415opsys='' unported=no
418case "${canonical}" in 416case "${canonical}" in
419 417
420 ## GNU/Linux and similar ports 418 ## GNU/Linux and similar ports
421 *-*-linux* ) 419 *-*-linux* )
422 opsys=gnu-linux 420 opsys=gnu-linux
423 case ${canonical} in
424 alpha*) machine=alpha ;;
425 s390x-*) machine=ibms390x ;;
426 powerpc*) machine=macppc ;;
427 sparc*) machine=sparc ;;
428 ia64*) machine=ia64 ;;
429 m68k*) machine=m68k ;;
430 x86_64*) machine=amdx86-64 ;;
431 esac
432 ;; 421 ;;
433 422
434 ## FreeBSD ports 423 ## FreeBSD ports
435 *-*-freebsd* ) 424 *-*-freebsd* )
436 opsys=freebsd 425 opsys=freebsd
437 case "${canonical}" in
438 alpha*) machine=alpha ;;
439 amd64-*|x86_64-*) machine=amdx86-64 ;;
440 ia64-*) machine=ia64 ;;
441 i[3456]86-*) machine=intel386 ;;
442 powerpc-*) machine=macppc ;;
443 sparc-*) machine=sparc ;;
444 sparc64-*) machine=sparc ;;
445 esac
446 ;; 426 ;;
447 427
448 ## FreeBSD kernel + glibc based userland 428 ## FreeBSD kernel + glibc based userland
449 *-*-kfreebsd*gnu* ) 429 *-*-kfreebsd*gnu* )
450 opsys=gnu-kfreebsd 430 opsys=gnu-kfreebsd
451 case "${canonical}" in
452 alpha*) machine=alpha ;;
453 amd64-*|x86_64-*) machine=amdx86-64 ;;
454 ia64-*) machine=ia64 ;;
455 i[3456]86-*) machine=intel386 ;;
456 powerpc-*) machine=macppc ;;
457 sparc-*) machine=sparc ;;
458 sparc64-*) machine=sparc ;;
459 esac
460 ;; 431 ;;
461 432
462 ## NetBSD ports 433 ## NetBSD ports
463 *-*-netbsd* ) 434 *-*-netbsd* )
464 opsys=netbsd 435 opsys=netbsd
465 case "${canonical}" in
466 alpha*) machine=alpha ;;
467 x86_64-*) machine=amdx86-64 ;;
468 i[3456]86-*) machine=intel386 ;;
469 m68k-*) machine=m68k ;;
470 powerpc-*) machine=macppc ;;
471 sparc*-) machine=sparc ;;
472 esac
473 ;; 436 ;;
474 437
475 ## OpenBSD ports 438 ## OpenBSD ports
476 *-*-openbsd* ) 439 *-*-openbsd* )
477 opsys=openbsd 440 opsys=openbsd
478 case "${canonical}" in
479 alpha*) machine=alpha ;;
480 x86_64-*) machine=amdx86-64 ;;
481 i386-*) machine=intel386 ;;
482 powerpc-*) machine=macppc ;;
483 sparc*) machine=sparc ;;
484 esac
485 ;; 441 ;;
486 442
487 ## Apple Darwin / Mac OS X 443 ## Apple Darwin / Mac OS X
488 *-apple-darwin* ) 444 *-apple-darwin* )
489 case "${canonical}" in 445 case "${canonical}" in
490 i[3456]86-* ) machine=intel386 ;; 446 i[3456]86-* ) ;;
491 powerpc-* ) machine=macppc ;; 447 powerpc-* ) ;;
492 x86_64-* ) machine=amdx86-64 ;; 448 x86_64-* ) ;;
493 * ) unported=yes ;; 449 * ) unported=yes ;;
494 esac 450 esac
495 opsys=darwin 451 opsys=darwin
@@ -512,16 +468,16 @@ case "${canonical}" in
512 468
513 ## IBM machines 469 ## IBM machines
514 rs6000-ibm-aix4.[23]* ) 470 rs6000-ibm-aix4.[23]* )
515 machine=ibmrs6000 opsys=aix4-2 471 opsys=aix4-2
516 ;; 472 ;;
517 powerpc-ibm-aix4.[23]* ) 473 powerpc-ibm-aix4.[23]* )
518 machine=ibmrs6000 opsys=aix4-2 474 opsys=aix4-2
519 ;; 475 ;;
520 rs6000-ibm-aix[56]* ) 476 rs6000-ibm-aix[56]* )
521 machine=ibmrs6000 opsys=aix4-2 477 opsys=aix4-2
522 ;; 478 ;;
523 powerpc-ibm-aix[56]* ) 479 powerpc-ibm-aix[56]* )
524 machine=ibmrs6000 opsys=aix4-2 480 opsys=aix4-2
525 ;; 481 ;;
526 482
527 ## Silicon Graphics machines 483 ## Silicon Graphics machines
@@ -539,9 +495,9 @@ case "${canonical}" in
539 | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \ 495 | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
540 | x86_64-*-solaris2* | x86_64-*-sunos5*) 496 | x86_64-*-solaris2* | x86_64-*-sunos5*)
541 case "${canonical}" in 497 case "${canonical}" in
542 i[3456]86-*-* ) machine=intel386 ;; 498 i[3456]86-*-* ) ;;
543 amd64-*-*|x86_64-*-*) machine=amdx86-64 ;; 499 amd64-*-*|x86_64-*-*) ;;
544 sparc* ) machine=sparc ;; 500 sparc* ) ;;
545 * ) unported=yes ;; 501 * ) unported=yes ;;
546 esac 502 esac
547 case "${canonical}" in 503 case "${canonical}" in
@@ -573,7 +529,6 @@ case "${canonical}" in
573 529
574 ## Intel 386 machines where we don't care about the manufacturer. 530 ## Intel 386 machines where we don't care about the manufacturer.
575 i[3456]86-*-* ) 531 i[3456]86-*-* )
576 machine=intel386
577 case "${canonical}" in 532 case "${canonical}" in
578 *-cygwin ) opsys=cygwin ;; 533 *-cygwin ) opsys=cygwin ;;
579 *-darwin* ) opsys=darwin ;; 534 *-darwin* ) opsys=darwin ;;
@@ -612,11 +567,6 @@ if test $unported = yes; then
612Check `etc/MACHINES' for recognized configuration names.]) 567Check `etc/MACHINES' for recognized configuration names.])
613fi 568fi
614 569
615if test -n "$machine"; then
616 machfile="m/${machine}.h"
617else
618 machfile=
619fi
620opsysfile="s/${opsys}.h" 570opsysfile="s/${opsys}.h"
621 571
622 572
@@ -760,19 +710,6 @@ dnl if test "x$RANLIB" = x; then
760dnl AC_PROG_RANLIB 710dnl AC_PROG_RANLIB
761dnl fi 711dnl fi
762 712
763## Although we're running on an amd64 kernel, we're actually compiling for
764## the x86 architecture. The user should probably have provided an
765## explicit --build to `configure', but if everything else than the kernel
766## is running in i386 mode, we can help them out.
767if test "$machine" = "amdx86-64"; then
768 AC_CHECK_DECL([i386])
769 if test "$ac_cv_have_decl_i386" = "yes"; then
770 canonical=`echo "$canonical" | sed -e 's/^amd64/i386/' -e 's/^x86_64/i386/'`
771 machine=intel386
772 machfile="m/${machine}.h"
773 fi
774fi
775
776AC_PATH_PROG(INSTALL_INFO, install-info) 713AC_PATH_PROG(INSTALL_INFO, install-info)
777AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin) 714AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin)
778AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) 715AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)
@@ -943,7 +880,8 @@ esac
943 880
944 881
945C_SWITCH_MACHINE= 882C_SWITCH_MACHINE=
946if test "$machine" = "alpha"; then 883case $canonical in
884 alpha*)
947 AC_CHECK_DECL([__ELF__]) 885 AC_CHECK_DECL([__ELF__])
948 if test "$ac_cv_have_decl___ELF__" = "yes"; then 886 if test "$ac_cv_have_decl___ELF__" = "yes"; then
949 ## With ELF, make sure that all common symbols get allocated to in the 887 ## With ELF, make sure that all common symbols get allocated to in the
@@ -959,7 +897,8 @@ if test "$machine" = "alpha"; then
959 else 897 else
960 UNEXEC_OBJ=unexalpha.o 898 UNEXEC_OBJ=unexalpha.o
961 fi 899 fi
962fi 900 ;;
901esac
963AC_SUBST(C_SWITCH_MACHINE) 902AC_SUBST(C_SWITCH_MACHINE)
964 903
965AC_SUBST(UNEXEC_OBJ) 904AC_SUBST(UNEXEC_OBJ)
@@ -1644,7 +1583,7 @@ case ${HAVE_X11} in
1644 yes ) HAVE_MENUS=yes ;; 1583 yes ) HAVE_MENUS=yes ;;
1645esac 1584esac
1646 1585
1647# Do the opsystem or machine files prohibit the use of the GNU malloc? 1586# Does the opsystem file prohibit the use of the GNU malloc?
1648# Assume not, until told otherwise. 1587# Assume not, until told otherwise.
1649GNU_MALLOC=yes 1588GNU_MALLOC=yes
1650 1589
@@ -3269,13 +3208,7 @@ AC_SUBST(GNUSTEP_CFLAGS)
3269AC_SUBST(CFLAGS) 3208AC_SUBST(CFLAGS)
3270## Used in lwlib/Makefile.in. 3209## Used in lwlib/Makefile.in.
3271AC_SUBST(X_TOOLKIT_TYPE) 3210AC_SUBST(X_TOOLKIT_TYPE)
3272if test -n "${machfile}"; then
3273 M_FILE="\$(srcdir)/${machfile}"
3274else
3275 M_FILE=
3276fi
3277S_FILE="\$(srcdir)/${opsysfile}" 3211S_FILE="\$(srcdir)/${opsysfile}"
3278AC_SUBST(M_FILE)
3279AC_SUBST(S_FILE) 3212AC_SUBST(S_FILE)
3280AC_SUBST(ns_appdir) 3213AC_SUBST(ns_appdir)
3281AC_SUBST(ns_appbindir) 3214AC_SUBST(ns_appbindir)
@@ -3288,10 +3221,6 @@ AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
3288 [Define to the canonical Emacs configuration name.]) 3221 [Define to the canonical Emacs configuration name.])
3289AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}", 3222AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
3290 [Define to the options passed to configure.]) 3223 [Define to the options passed to configure.])
3291if test -n "$machfile"; then
3292 AC_DEFINE_UNQUOTED(config_machfile, "${machfile}",
3293 [Define to the used machine dependent file.])
3294fi
3295AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", 3224AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}",
3296 [Define to the used os dependent file.]) 3225 [Define to the used os dependent file.])
3297 3226
@@ -3470,8 +3399,7 @@ case "$opsys" in
3470 ## #ifndef LD_SWITCH_SYSTEM 3399 ## #ifndef LD_SWITCH_SYSTEM
3471 ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF))) 3400 ## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
3472 ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to: 3401 ## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to:
3473 ## not using gcc, darwin system not on an alpha (ie darwin, since 3402 ## not using gcc, darwin.
3474 ## darwin + alpha does not occur).
3475 ## Because this was done in src/Makefile.in, the resulting part of 3403 ## Because this was done in src/Makefile.in, the resulting part of
3476 ## LD_SWITCH_SYSTEM was not used in configure (ie, in ac_link). 3404 ## LD_SWITCH_SYSTEM was not used in configure (ie, in ac_link).
3477 ## It therefore seems cleaner to put this in LD_SWITCH_SYSTEM_TEMACS, 3405 ## It therefore seems cleaner to put this in LD_SWITCH_SYSTEM_TEMACS,
@@ -3511,12 +3439,12 @@ case "$opsys" in
3511 ## will also work on earlier NetBSD releases. 3439 ## will also work on earlier NetBSD releases.
3512 netbsd|openbsd) LD_FIRSTFLAG="-nostartfiles" ;; 3440 netbsd|openbsd) LD_FIRSTFLAG="-nostartfiles" ;;
3513 3441
3514 ## macpcc: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says 3442 ## powerpc*: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says
3515 ## MkLinux/LinuxPPC needs this. 3443 ## MkLinux/LinuxPPC needs this.
3516 ## ibms390x only supports opsys = gnu-linux so it can be added here. 3444 ## s390x-* only supports opsys = gnu-linux so it can be added here.
3517 gnu-*) 3445 gnu-*)
3518 case "$machine" in 3446 case "$canonical" in
3519 macppc|ibms390x) LD_FIRSTFLAG="-nostdlib" ;; 3447 powerpc*|s390x-*) LD_FIRSTFLAG="-nostdlib" ;;
3520 esac 3448 esac
3521 ;; 3449 ;;
3522esac 3450esac
@@ -3528,7 +3456,7 @@ if test "x$ORDINARY_LINK" = "xyes"; then
3528 AC_DEFINE(ORDINARY_LINK, 1, [Define if the C compiler is the linker.]) 3456 AC_DEFINE(ORDINARY_LINK, 1, [Define if the C compiler is the linker.])
3529 3457
3530## The system files defining neither ORDINARY_LINK nor LD_FIRSTFLAG are: 3458## The system files defining neither ORDINARY_LINK nor LD_FIRSTFLAG are:
3531## freebsd, gnu-* not on macppc|ibms390x. 3459## freebsd, gnu-* not on powerpc*|s390x*.
3532elif test "x$GCC" = "xyes" && test "x$LD_FIRSTFLAG" = "x"; then 3460elif test "x$GCC" = "xyes" && test "x$LD_FIRSTFLAG" = "x"; then
3533 3461
3534 ## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure 3462 ## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
@@ -3636,11 +3564,8 @@ AH_BOTTOM([
3636 3564
3637#define subprocesses 3565#define subprocesses
3638 3566
3639/* Include the os and machine dependent files. */ 3567/* Include the os dependent file. */
3640#include config_opsysfile 3568#include config_opsysfile
3641#ifdef config_machfile
3642# include config_machfile
3643#endif
3644 3569
3645/* GNUstep needs a bit more pure memory. Of the existing knobs, 3570/* GNUstep needs a bit more pure memory. Of the existing knobs,
3646 SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. 3571 SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.
@@ -3664,34 +3589,6 @@ AH_BOTTOM([
3664#endif 3589#endif
3665#endif 3590#endif
3666 3591
3667/* These default definitions are good for almost all machines.
3668 Any exceptions should override them in m/MACHINE.h.
3669 They must be usable in preprocessor conditionals. */
3670
3671#ifndef BITS_PER_CHAR
3672#define BITS_PER_CHAR 8
3673#endif
3674
3675#ifndef BITS_PER_SHORT
3676#define BITS_PER_SHORT 16
3677#endif
3678
3679#ifndef BITS_PER_INT
3680#define BITS_PER_INT 32
3681#endif
3682
3683#ifndef BITS_PER_LONG
3684#ifdef _LP64
3685#define BITS_PER_LONG 64
3686#else
3687#define BITS_PER_LONG 32
3688#endif
3689#endif
3690
3691#if !defined BITS_PER_LONG_LONG && HAVE_LONG_LONG_INT
3692#define BITS_PER_LONG_LONG 64
3693#endif
3694
3695#include <string.h> 3592#include <string.h>
3696#include <stdlib.h> 3593#include <stdlib.h>
3697 3594
@@ -3759,17 +3656,12 @@ if test "${HAVE_GTK}" = "yes"; then
3759 USE_X_TOOLKIT=GTK 3656 USE_X_TOOLKIT=GTK
3760fi 3657fi
3761 3658
3762and_machfile=
3763if test -n "$machfile"; then
3764 and_machfile=" and \`${machfile}'"
3765fi
3766
3767echo " 3659echo "
3768Configured for \`${canonical}'. 3660Configured for \`${canonical}'.
3769 3661
3770 Where should the build process find the source code? ${srcdir} 3662 Where should the build process find the source code? ${srcdir}
3771 What operating system and machine description files should Emacs use? 3663 What operating system file should Emacs use?
3772 \`${opsysfile}'${and_machfile} 3664 \`${opsysfile}'
3773 What compiler should emacs be built with? ${CC} ${CFLAGS} 3665 What compiler should emacs be built with? ${CC} ${CFLAGS}
3774 Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason} 3666 Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason}
3775 Should Emacs use a relocating allocator for buffers? ${REL_ALLOC} 3667 Should Emacs use a relocating allocator for buffers? ${REL_ALLOC}
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e944e161494..97707118b65 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -167,7 +167,7 @@
167 (Input Methods): Copyedits. Use "^" for the postfix example, 167 (Input Methods): Copyedits. Use "^" for the postfix example,
168 because it is less confusing inside Info's `quotes'. 168 because it is less confusing inside Info's `quotes'.
169 169
170 * custom.texi (Specifying File Variables): Fix "unibyte" description. 170 * custom.texi (Specifying File Variables): Fix "unibyte" description.
171 Update for "Disabling Multibyte" node name change. 171 Update for "Disabling Multibyte" node name change.
172 * emacs.texi: Update for "Disabling Multibyte" node name change. 172 * emacs.texi: Update for "Disabling Multibyte" node name change.
173 173
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 420fde36b2f..a10f65b085c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -642,7 +642,7 @@
642 * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for 642 * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for
643 release 8.3. 643 release 8.3.
644 (Preface): Updated support information. 644 (Preface): Updated support information.
645 (From Bill Wohler): Reset text to original version. As a 645 (From Bill Wohler): Reset text to original version. As a
646 historical quote, the tense should be correct in the time that it 646 historical quote, the tense should be correct in the time that it
647 was written. 647 was written.
648 648
@@ -659,11 +659,11 @@
659 659
6602011-08-15 Suvayu Ali <fatkasuvayu+linux@gmail.com> (tiny change) 6602011-08-15 Suvayu Ali <fatkasuvayu+linux@gmail.com> (tiny change)
661 661
662 * org.texi (Images in LaTeX export): rewrite. 662 * org.texi (Images in LaTeX export): Rewrite.
663 663
6642011-08-15 Bastien Guerry <bzg@gnu.org> 6642011-08-15 Bastien Guerry <bzg@gnu.org>
665 665
666 * org.texi (Using the mapping API): mention 'region as a possible 666 * org.texi (Using the mapping API): Mention 'region as a possible
667 scope for `org-map-entries'. 667 scope for `org-map-entries'.
668 668
6692011-08-15 Carsten Dominik <carsten.dominik@gmail.com> 6692011-08-15 Carsten Dominik <carsten.dominik@gmail.com>
@@ -672,7 +672,7 @@
672 672
6732011-08-15 Bastien Guerry <bzg@gnu.org> 6732011-08-15 Bastien Guerry <bzg@gnu.org>
674 674
675 * org.texi (Template expansion): order template sequences in the 675 * org.texi (Template expansion): Order template sequences in the
676 proper order. 676 proper order.
677 677
6782011-08-15 Eric Schulte <schulte.eric@gmail.com> 6782011-08-15 Eric Schulte <schulte.eric@gmail.com>
@@ -686,11 +686,11 @@
686 686
6872011-08-15 Achim Gratz <stromeko@nexgo.de> 6872011-08-15 Achim Gratz <stromeko@nexgo.de>
688 688
689 * org.texi: document that both CLOCK_INTO_DRAWER and 689 * org.texi: Document that both CLOCK_INTO_DRAWER and
690 LOG_INTO_DRAWER can be used to override the contents of variable 690 LOG_INTO_DRAWER can be used to override the contents of variable
691 org-clock-into-drawer (or if unset, org-log-into-drawer). 691 org-clock-into-drawer (or if unset, org-log-into-drawer).
692 692
693 * org.texi: replace @xref->@pxref. 693 * org.texi: Replace @xref->@pxref.
694 694
6952011-08-15 Eric Schulte <schulte.eric@gmail.com> 6952011-08-15 Eric Schulte <schulte.eric@gmail.com>
696 696
@@ -714,7 +714,7 @@
714 714
7152011-08-15 Eric Schulte <schulte.eric@gmail.com> 7152011-08-15 Eric Schulte <schulte.eric@gmail.com>
716 716
717 * org.texi (Structure of code blocks): explicitly state that the 717 * org.texi (Structure of code blocks): Explicitly state that the
718 behavior of multiple blocks of the same name is undefined 718 behavior of multiple blocks of the same name is undefined
719 719
7202011-08-15 Christian Egli <christian.egli@sbszh.ch> 7202011-08-15 Christian Egli <christian.egli@sbszh.ch>
@@ -838,7 +838,7 @@
838 838
8392011-08-15 Bastien Guerry <bzg@gnu.org> 8392011-08-15 Bastien Guerry <bzg@gnu.org>
840 840
841 * org.texi (LaTeX and PDF export): add a note about a limitation 841 * org.texi (LaTeX and PDF export): Add a note about a limitation
842 of the LaTeX export: the org file has to be properly structured. 842 of the LaTeX export: the org file has to be properly structured.
843 843
8442011-08-15 Bastien Guerry <bzg@gnu.org> 8442011-08-15 Bastien Guerry <bzg@gnu.org>
@@ -1648,7 +1648,7 @@
1648 1648
16492010-11-11 Eric Schulte <schulte.eric@gmail.com> 16492010-11-11 Eric Schulte <schulte.eric@gmail.com>
1650 1650
1651 * org.texi: multi-line header arguments :PROPERTIES: :ID: 1651 * org.texi: Multi-line header arguments :PROPERTIES: :ID:
1652 b77c8857-6c76-4ea9-8a61-ddc2648d96c4 :END:. 1652 b77c8857-6c76-4ea9-8a61-ddc2648d96c4 :END:.
1653 1653
16542010-11-11 Carsten Dominik <carsten.dominik@gmail.com> 16542010-11-11 Carsten Dominik <carsten.dominik@gmail.com>
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4e0ad922da2..b32e0607c94 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
12012-05-22 Paul Eggert <eggert@cs.ucla.edu>
2
3 Remove src/m/*.
4 * makefile.w32-in: Remove dependencies on
5 $(EMACS_ROOT)/src/m/intel386.h.
6
12012-05-22 Glenn Morris <rgm@gnu.org> 72012-05-22 Glenn Morris <rgm@gnu.org>
2 8
3 * Makefile.in (install): Remove unneeded chmods. 9 * Makefile.in (install): Remove unneeded chmods.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 316e4fb127f..83b818ed6c6 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -354,7 +354,6 @@ SRC = .
354$(BLD)/alloca.$(O) : \ 354$(BLD)/alloca.$(O) : \
355 $(SRC)/alloca.c \ 355 $(SRC)/alloca.c \
356 $(EMACS_ROOT)/src/s/ms-w32.h \ 356 $(EMACS_ROOT)/src/s/ms-w32.h \
357 $(EMACS_ROOT)/src/m/intel386.h \
358 $(EMACS_ROOT)/src/config.h \ 357 $(EMACS_ROOT)/src/config.h \
359 $(EMACS_ROOT)/src/blockinput.h 358 $(EMACS_ROOT)/src/blockinput.h
360 359
@@ -363,7 +362,6 @@ $(BLD)/ctags.$(O) : \
363 $(EMACS_ROOT)/nt/inc/sys/param.h \ 362 $(EMACS_ROOT)/nt/inc/sys/param.h \
364 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 363 $(EMACS_ROOT)/nt/inc/sys/stat.h \
365 $(EMACS_ROOT)/src/s/ms-w32.h \ 364 $(EMACS_ROOT)/src/s/ms-w32.h \
366 $(EMACS_ROOT)/src/m/intel386.h \
367 $(EMACS_ROOT)/lib-src/../src/config.h \ 365 $(EMACS_ROOT)/lib-src/../src/config.h \
368 $(SRC)/ntlib.h \ 366 $(SRC)/ntlib.h \
369 $(EMACS_ROOT)/lib/getopt.h 367 $(EMACS_ROOT)/lib/getopt.h
@@ -372,14 +370,12 @@ $(BLD)/ebrowse.$(O) : \
372 $(SRC)/ebrowse.c \ 370 $(SRC)/ebrowse.c \
373 $(EMACS_ROOT)/lib/min-max.h \ 371 $(EMACS_ROOT)/lib/min-max.h \
374 $(EMACS_ROOT)/src/s/ms-w32.h \ 372 $(EMACS_ROOT)/src/s/ms-w32.h \
375 $(EMACS_ROOT)/src/m/intel386.h \
376 $(EMACS_ROOT)/lib-src/../src/config.h 373 $(EMACS_ROOT)/lib-src/../src/config.h
377 374
378$(BLD)/emacsclient.$(O) : \ 375$(BLD)/emacsclient.$(O) : \
379 $(SRC)/emacsclient.c \ 376 $(SRC)/emacsclient.c \
380 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 377 $(EMACS_ROOT)/nt/inc/sys/stat.h \
381 $(EMACS_ROOT)/src/s/ms-w32.h \ 378 $(EMACS_ROOT)/src/s/ms-w32.h \
382 $(EMACS_ROOT)/src/m/intel386.h \
383 $(EMACS_ROOT)/lib-src/../src/config.h 379 $(EMACS_ROOT)/lib-src/../src/config.h
384 380
385$(BLD)/etags.$(O) : \ 381$(BLD)/etags.$(O) : \
@@ -387,7 +383,6 @@ $(BLD)/etags.$(O) : \
387 $(EMACS_ROOT)/nt/inc/sys/param.h \ 383 $(EMACS_ROOT)/nt/inc/sys/param.h \
388 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 384 $(EMACS_ROOT)/nt/inc/sys/stat.h \
389 $(EMACS_ROOT)/src/s/ms-w32.h \ 385 $(EMACS_ROOT)/src/s/ms-w32.h \
390 $(EMACS_ROOT)/src/m/intel386.h \
391 $(EMACS_ROOT)/lib-src/../src/config.h \ 386 $(EMACS_ROOT)/lib-src/../src/config.h \
392 $(SRC)/ntlib.h \ 387 $(SRC)/ntlib.h \
393 $(EMACS_ROOT)/lib/getopt.h 388 $(EMACS_ROOT)/lib/getopt.h
@@ -395,7 +390,6 @@ $(BLD)/etags.$(O) : \
395$(BLD)/getdate.$(O) : \ 390$(BLD)/getdate.$(O) : \
396 $(SRC)/getdate.c \ 391 $(SRC)/getdate.c \
397 $(EMACS_ROOT)/src/s/ms-w32.h \ 392 $(EMACS_ROOT)/src/s/ms-w32.h \
398 $(EMACS_ROOT)/src/m/intel386.h \
399 $(EMACS_ROOT)/src/config.h \ 393 $(EMACS_ROOT)/src/config.h \
400 $(MSTOOLS_SYS)/types.h 394 $(MSTOOLS_SYS)/types.h
401 395
@@ -415,7 +409,6 @@ $(BLD)/make-path.$(O) : \
415$(BLD)/movemail.$(O) : \ 409$(BLD)/movemail.$(O) : \
416 $(SRC)/movemail.c \ 410 $(SRC)/movemail.c \
417 $(EMACS_ROOT)/src/s/ms-w32.h \ 411 $(EMACS_ROOT)/src/s/ms-w32.h \
418 $(EMACS_ROOT)/src/m/intel386.h \
419 $(EMACS_ROOT)/lib-src/../src/config.h \ 412 $(EMACS_ROOT)/lib-src/../src/config.h \
420 $(EMACS_ROOT)/nt/inc/sys/file.h \ 413 $(EMACS_ROOT)/nt/inc/sys/file.h \
421 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 414 $(EMACS_ROOT)/nt/inc/sys/stat.h \
@@ -439,7 +432,6 @@ $(BLD)/pop.$(O) : \
439$(BLD)/profile.$(O) : \ 432$(BLD)/profile.$(O) : \
440 $(SRC)/profile.c \ 433 $(SRC)/profile.c \
441 $(EMACS_ROOT)/src/s/ms-w32.h \ 434 $(EMACS_ROOT)/src/s/ms-w32.h \
442 $(EMACS_ROOT)/src/m/intel386.h \
443 $(EMACS_ROOT)/lib-src/../src/config.h \ 435 $(EMACS_ROOT)/lib-src/../src/config.h \
444 $(EMACS_ROOT)/lib-src/../src/systime.h 436 $(EMACS_ROOT)/lib-src/../src/systime.h
445 437
@@ -455,7 +447,6 @@ $(BLD)/test-distrib.$(O) : \
455$(BLD)/timer.$(O) : \ 447$(BLD)/timer.$(O) : \
456 $(SRC)/timer.c \ 448 $(SRC)/timer.c \
457 $(EMACS_ROOT)/src/s/ms-w32.h \ 449 $(EMACS_ROOT)/src/s/ms-w32.h \
458 $(EMACS_ROOT)/src/m/intel386.h \
459 $(EMACS_ROOT)/lib-src/../src/config.h 450 $(EMACS_ROOT)/lib-src/../src/config.h
460 451
461# The following dependencies are for supporting parallel builds, where 452# The following dependencies are for supporting parallel builds, where
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index a2870345ad6..8c27f139e76 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -67,7 +67,6 @@ $(BLD)/dtoastr.$(O) : \
67 $(SRC)/intprops.h \ 67 $(SRC)/intprops.h \
68 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 68 $(EMACS_ROOT)/nt/inc/sys/stat.h \
69 $(EMACS_ROOT)/src/s/ms-w32.h \ 69 $(EMACS_ROOT)/src/s/ms-w32.h \
70 $(EMACS_ROOT)/src/m/intel386.h \
71 $(EMACS_ROOT)/src/config.h 70 $(EMACS_ROOT)/src/config.h
72 71
73$(BLD)/getopt.$(O) : \ 72$(BLD)/getopt.$(O) : \
@@ -78,7 +77,6 @@ $(BLD)/getopt.$(O) : \
78 $(EMACS_ROOT)/nt/inc/unistd.h \ 77 $(EMACS_ROOT)/nt/inc/unistd.h \
79 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 78 $(EMACS_ROOT)/nt/inc/sys/stat.h \
80 $(EMACS_ROOT)/src/s/ms-w32.h \ 79 $(EMACS_ROOT)/src/s/ms-w32.h \
81 $(EMACS_ROOT)/src/m/intel386.h \
82 $(EMACS_ROOT)/src/config.h 80 $(EMACS_ROOT)/src/config.h
83 81
84$(BLD)/getopt1.$(O) : \ 82$(BLD)/getopt1.$(O) : \
@@ -87,7 +85,6 @@ $(BLD)/getopt1.$(O) : \
87 $(SRC)/getopt_int.h \ 85 $(SRC)/getopt_int.h \
88 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 86 $(EMACS_ROOT)/nt/inc/sys/stat.h \
89 $(EMACS_ROOT)/src/s/ms-w32.h \ 87 $(EMACS_ROOT)/src/s/ms-w32.h \
90 $(EMACS_ROOT)/src/m/intel386.h \
91 $(EMACS_ROOT)/src/config.h 88 $(EMACS_ROOT)/src/config.h
92 89
93$(BLD)/strftime.$(O) : \ 90$(BLD)/strftime.$(O) : \
@@ -96,14 +93,12 @@ $(BLD)/strftime.$(O) : \
96 $(EMACS_ROOT)/nt/inc/stdbool.h \ 93 $(EMACS_ROOT)/nt/inc/stdbool.h \
97 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 94 $(EMACS_ROOT)/nt/inc/sys/stat.h \
98 $(EMACS_ROOT)/src/s/ms-w32.h \ 95 $(EMACS_ROOT)/src/s/ms-w32.h \
99 $(EMACS_ROOT)/src/m/intel386.h \
100 $(EMACS_ROOT)/src/config.h 96 $(EMACS_ROOT)/src/config.h
101 97
102$(BLD)/time_r.$(O) : \ 98$(BLD)/time_r.$(O) : \
103 $(SRC)/time_r.c \ 99 $(SRC)/time_r.c \
104 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 100 $(EMACS_ROOT)/nt/inc/sys/stat.h \
105 $(EMACS_ROOT)/src/s/ms-w32.h \ 101 $(EMACS_ROOT)/src/s/ms-w32.h \
106 $(EMACS_ROOT)/src/m/intel386.h \
107 $(EMACS_ROOT)/src/config.h 102 $(EMACS_ROOT)/src/config.h
108 103
109$(BLD)/md5.$(O) : \ 104$(BLD)/md5.$(O) : \
@@ -112,7 +107,6 @@ $(BLD)/md5.$(O) : \
112 $(EMACS_ROOT)/nt/inc/stdint.h \ 107 $(EMACS_ROOT)/nt/inc/stdint.h \
113 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 108 $(EMACS_ROOT)/nt/inc/sys/stat.h \
114 $(EMACS_ROOT)/src/s/ms-w32.h \ 109 $(EMACS_ROOT)/src/s/ms-w32.h \
115 $(EMACS_ROOT)/src/m/intel386.h \
116 $(EMACS_ROOT)/src/config.h 110 $(EMACS_ROOT)/src/config.h
117 111
118$(BLD)/sha1.$(O) : \ 112$(BLD)/sha1.$(O) : \
@@ -121,7 +115,6 @@ $(BLD)/sha1.$(O) : \
121 $(EMACS_ROOT)/nt/inc/stdint.h \ 115 $(EMACS_ROOT)/nt/inc/stdint.h \
122 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 116 $(EMACS_ROOT)/nt/inc/sys/stat.h \
123 $(EMACS_ROOT)/src/s/ms-w32.h \ 117 $(EMACS_ROOT)/src/s/ms-w32.h \
124 $(EMACS_ROOT)/src/m/intel386.h \
125 $(EMACS_ROOT)/src/config.h 118 $(EMACS_ROOT)/src/config.h
126 119
127$(BLD)/sha256.$(O) : \ 120$(BLD)/sha256.$(O) : \
@@ -130,7 +123,6 @@ $(BLD)/sha256.$(O) : \
130 $(EMACS_ROOT)/nt/inc/stdint.h \ 123 $(EMACS_ROOT)/nt/inc/stdint.h \
131 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 124 $(EMACS_ROOT)/nt/inc/sys/stat.h \
132 $(EMACS_ROOT)/src/s/ms-w32.h \ 125 $(EMACS_ROOT)/src/s/ms-w32.h \
133 $(EMACS_ROOT)/src/m/intel386.h \
134 $(EMACS_ROOT)/src/config.h 126 $(EMACS_ROOT)/src/config.h
135 127
136$(BLD)/sha512.$(O) : \ 128$(BLD)/sha512.$(O) : \
@@ -139,7 +131,6 @@ $(BLD)/sha512.$(O) : \
139 $(EMACS_ROOT)/nt/inc/stdint.h \ 131 $(EMACS_ROOT)/nt/inc/stdint.h \
140 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 132 $(EMACS_ROOT)/nt/inc/sys/stat.h \
141 $(EMACS_ROOT)/src/s/ms-w32.h \ 133 $(EMACS_ROOT)/src/s/ms-w32.h \
142 $(EMACS_ROOT)/src/m/intel386.h \
143 $(EMACS_ROOT)/src/config.h 134 $(EMACS_ROOT)/src/config.h
144 135
145$(BLD)/filemode.$(O) : \ 136$(BLD)/filemode.$(O) : \
@@ -147,7 +138,6 @@ $(BLD)/filemode.$(O) : \
147 $(SRC)/filemode.h \ 138 $(SRC)/filemode.h \
148 $(EMACS_ROOT)/nt/inc/sys/stat.h \ 139 $(EMACS_ROOT)/nt/inc/sys/stat.h \
149 $(EMACS_ROOT)/src/s/ms-w32.h \ 140 $(EMACS_ROOT)/src/s/ms-w32.h \
150 $(EMACS_ROOT)/src/m/intel386.h \
151 $(EMACS_ROOT)/src/config.h 141 $(EMACS_ROOT)/src/config.h
152 142
153# The following dependencies are for supporting parallel builds, where 143# The following dependencies are for supporting parallel builds, where
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd57969f73f..8e9b88a6016 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,28 @@
12012-05-24 Glenn Morris <rgm@gnu.org>
2
3 * paths.el (term-file-prefix): Move to faces.el (the only user).
4 * faces.el (term-file-prefix): Move here, make it a defcustom.
5
6 * paths.el (news-directory, news-path, news-inews-program):
7 Move to gnus/nnspool.el.
8
9 * paths.el (gnus-default-nntp-server): Remove (gnus.el defines it).
10
11 * paths.el (rmail-file-name, rmail-spool-directory): Move from here...
12 * mail/rmail.el (rmail-file-name, rmail-spool-directory): ... to here.
13 Make the latter a defcustom, with a delayed initialization.
14
15 * paths.el (gnus-nntp-service, gnus-local-organization): Remove.
16 These were deleted from Gnus itself late 2010.
17
182012-05-22 Juanma Barranquero <lekktu@gmail.com>
19
20 * progmodes/which-func.el (which-func-ff-hook):
21 Check against user-error, not error.
22
23 * emacs-lisp/edebug.el (top): Do not load or set up loading of
24 cl-specs.el, which no longer exists.
25
12012-05-22 Glenn Morris <rgm@gnu.org> 262012-05-22 Glenn Morris <rgm@gnu.org>
2 27
3 * info.el (info-emacs-bug): New command. 28 * info.el (info-emacs-bug): New command.
@@ -58,7 +83,7 @@
58 83
59 * calc/calc-lang.el (math-C-parse-bess, math-C-parse-fma): 84 * calc/calc-lang.el (math-C-parse-bess, math-C-parse-fma):
60 New functions. 85 New functions.
61 (math-function-table): Add support for more C functions. 86 (math-function-table): Add support for more C functions.
62 87
632012-05-18 Agustín Martín Domingo <agustin.martin@hispalinux.es> 882012-05-18 Agustín Martín Domingo <agustin.martin@hispalinux.es>
64 89
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index f47feebe5d2..2c7e7cf6362 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1938,7 +1938,6 @@ expressions; a `progn' form will be returned enclosing these forms."
1938 1938
1939;;;; Edebug Form Specs 1939;;;; Edebug Form Specs
1940;;; ========================================================== 1940;;; ==========================================================
1941;;; See cl-specs.el for common lisp specs.
1942 1941
1943;;;;* Spec for def-edebug-spec 1942;;;;* Spec for def-edebug-spec
1944;;; Out of date. 1943;;; Out of date.
@@ -4437,13 +4436,6 @@ With prefix argument, make it a temporary breakpoint."
4437 4436
4438;;; Autoloading of Edebug accessories 4437;;; Autoloading of Edebug accessories
4439 4438
4440(if (featurep 'cl)
4441 (add-hook 'edebug-setup-hook
4442 (function (lambda () (require 'cl-specs))))
4443 ;; The following causes cl-specs to be loaded if you load cl.el.
4444 (add-hook 'cl-load-hook
4445 (function (lambda () (require 'cl-specs)))))
4446
4447;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu 4439;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu
4448(if (featurep 'cl-read) 4440(if (featurep 'cl-read)
4449 (add-hook 'edebug-setup-hook 4441 (add-hook 'edebug-setup-hook
diff --git a/lisp/faces.el b/lisp/faces.el
index b3b0fa9b7d2..d96f3af0ac0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -28,6 +28,16 @@
28(eval-when-compile 28(eval-when-compile
29 (require 'cl)) 29 (require 'cl))
30 30
31(defcustom term-file-prefix (purecopy "term/")
32 "If non-nil, Emacs startup performs terminal-specific initialization.
33It does this by: (load (concat term-file-prefix (getenv \"TERM\")))
34
35You may set this variable to nil in your init file if you do not wish
36the terminal-initialization file to be loaded."
37 :type '(choice (const :tag "No terminal-specific initialization" nil)
38 (string :tag "Name of directory with term files"))
39 :group 'terminals)
40
31(declare-function xw-defined-colors "term/common-win" (&optional frame)) 41(declare-function xw-defined-colors "term/common-win" (&optional frame))
32 42
33(defvar help-xref-stack-item) 43(defvar help-xref-stack-item)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9000ccb9fef..e096b9b2b26 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
12012-05-24 Glenn Morris <rgm@gnu.org>
2
3 * nnspool.el (news-directory, news-path, news-inews-program):
4 Move here from paths.el. Don't see a need for these to be autoloaded.
5
6 * gnus.el (gnus-default-nntp-server): Make it a defcustom.
7 Merge in doc from paths.el version. Don't see any need for this to be
8 autoloaded, or for the warning about users not setting it.
9
12012-05-04 Paul Eggert <eggert@cs.ucla.edu> 102012-05-04 Paul Eggert <eggert@cs.ucla.edu>
2 11
3 Fix minor Y10k bug. 12 Fix minor Y10k bug.
@@ -22655,7 +22664,7 @@
22655 22664
22656See ChangeLog.2 for earlier changes. 22665See ChangeLog.2 for earlier changes.
22657 22666
22658 Copyright (C) 2004-2012 Free Software Foundation, Inc. 22667 Copyright (C) 2004-2012 Free Software Foundation, Inc.
22659 22668
22660 This file is part of GNU Emacs. 22669 This file is part of GNU Emacs.
22661 22670
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 635bb6fc96f..bba56e31d9b 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1271,15 +1271,18 @@ Set this variable in `.emacs' instead."
1271 :type '(choice (const :tag "current" nil) 1271 :type '(choice (const :tag "current" nil)
1272 directory)) 1272 directory))
1273 1273
1274;; Site dependent variables. These variables should be defined in 1274;; Site dependent variables.
1275;; paths.el.
1276 1275
1277(defvar gnus-default-nntp-server nil 1276;; Should this be obsolete?
1278 "Specify a default NNTP server. 1277(defcustom gnus-default-nntp-server nil
1279This variable should be defined in paths.el, and should never be set 1278 "The hostname of the default NNTP server.
1280by the user. 1279The empty string, or nil, means to use the local host.
1281If you want to change servers, you should use `gnus-select-method'. 1280You may wish to set this on a site-wide basis.
1282See the documentation to that variable.") 1281
1282If you want to change servers, you should use `gnus-select-method'."
1283 :group 'gnus-server
1284 :type '(choice (const :tag "local host" nil)
1285 (string :tag "host name")))
1283 1286
1284(defcustom gnus-nntpserver-file "/etc/nntpserver" 1287(defcustom gnus-nntpserver-file "/etc/nntpserver"
1285 "A file with only the name of the nntp server in it." 1288 "A file with only the name of the nntp server in it."
@@ -1326,6 +1329,8 @@ If you use this variable, you must set `gnus-nntp-server' to nil.
1326 1329
1327There is a lot more to know about select methods and virtual servers - 1330There is a lot more to know about select methods and virtual servers -
1328see the manual for details." 1331see the manual for details."
1332 ;; Emacs has set-after since 22.1.
1333 ;set-after '(gnus-default-nntp-server)
1329 :group 'gnus-server 1334 :group 'gnus-server
1330 :group 'gnus-start 1335 :group 'gnus-start
1331 :initialize 'custom-initialize-default 1336 :initialize 'custom-initialize-default
diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el
index 2b024e20740..fd079d909eb 100644
--- a/lisp/gnus/nnspool.el
+++ b/lisp/gnus/nnspool.el
@@ -31,6 +31,25 @@
31(require 'nnoo) 31(require 'nnoo)
32(eval-when-compile (require 'cl)) 32(eval-when-compile (require 'cl))
33 33
34;; Probably this entire thing should be obsolete.
35;; It's only used to init nnspool-spool-directory, so why not just
36;; set that variable's default directly?
37(defvar news-directory (if (file-exists-p "/usr/spool/news/")
38 "/usr/spool/news/"
39 "/var/spool/news/")
40 "The root directory below which all news files are stored.")
41(defvaralias 'news-path 'news-directory)
42
43;; Ditto re obsolescence.
44(defvar news-inews-program
45 (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
46 ((file-exists-p "/usr/local/inews") "/usr/local/inews")
47 ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")
48 ((file-exists-p "/usr/contrib/lib/news/inews") "/usr/contrib/lib/news/inews")
49 ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
50 (t "inews"))
51 "Program to post news.")
52
34(nnoo-declare nnspool) 53(nnoo-declare nnspool)
35 54
36(defvoo nnspool-inews-program news-inews-program 55(defvoo nnspool-inews-program news-inews-program
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 14bf9d90a16..cd2a961638e 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -100,8 +100,6 @@ its character representation and its display representation.")
100 "The current header display style choice, one of 100 "The current header display style choice, one of
101'normal (selected headers) or 'full (all headers).") 101'normal (selected headers) or 'full (all headers).")
102 102
103;; rmail-spool-directory and rmail-file-name are defined in paths.el.
104
105(defgroup rmail nil 103(defgroup rmail nil
106 "Mail reader for Emacs." 104 "Mail reader for Emacs."
107 :group 'mail) 105 :group 'mail)
@@ -143,6 +141,40 @@ its character representation and its display representation.")
143 :prefix "rmail-edit-" 141 :prefix "rmail-edit-"
144 :group 'rmail) 142 :group 'rmail)
145 143
144;;;###autoload
145(defcustom rmail-file-name (purecopy "~/RMAIL")
146 "Name of user's primary mail file."
147 :type 'string
148 :group 'rmail
149 :version "21.1")
150
151;;;###autoload
152(put 'rmail-spool-directory 'standard-value
153 '((cond ((file-exists-p "/var/mail") "/var/mail/")
154 ((file-exists-p "/var/spool/mail") "/var/spool/mail/")
155 ((memq system-type '(hpux usg-unix-v irix)) "/usr/mail/")
156 (t "/usr/spool/mail/"))))
157
158;;;###autoload
159(defcustom rmail-spool-directory
160 (purecopy
161 (cond ((file-exists-p "/var/mail")
162 ;; SVR4 and recent BSD are said to use this.
163 ;; Rather than trying to know precisely which systems use it,
164 ;; let's assume this dir is never used for anything else.
165 "/var/mail/")
166 ;; Many GNU/Linux systems use this name.
167 ((file-exists-p "/var/spool/mail") "/var/spool/mail/")
168 ((memq system-type '(hpux usg-unix-v irix)) "/usr/mail/")
169 (t "/usr/spool/mail/")))
170 "Name of directory used by system mailer for delivering new mail.
171Its name should end with a slash."
172 :initialize 'custom-initialize-delay
173 :type 'directory
174 :group 'rmail)
175
176;;;###autoload(custom-initialize-delay 'rmail-spool-directory nil)
177
146(defcustom rmail-movemail-program nil 178(defcustom rmail-movemail-program nil
147 "If non-nil, the file name of the `movemail' program." 179 "If non-nil, the file name of the `movemail' program."
148 :group 'rmail-retrieve 180 :group 'rmail-retrieve
diff --git a/lisp/paths.el b/lisp/paths.el
index 70b5ca5dbfb..f44a0e660fc 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,6 +1,6 @@
1;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*- 1;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
2 2
3;; Copyright (C) 1986, 1988, 1994, 1999-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1986, 1988, 1994, 1999-2012 Free Software Foundation, Inc.
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6;; Keywords: internal 6;; Keywords: internal
@@ -101,59 +101,6 @@ This variable `Info-default-directory-list' is used as the default
101for initializing `Info-directory-list' when Info is started, unless 101for initializing `Info-directory-list' when Info is started, unless
102the environment variable INFOPATH is set.") 102the environment variable INFOPATH is set.")
103 103
104(defvar news-directory
105 (purecopy (if (file-exists-p "/usr/spool/news/")
106 "/usr/spool/news/"
107 "/var/spool/news/"))
108 "The root directory below which all news files are stored.")
109(defvaralias 'news-path 'news-directory)
110
111(defvar news-inews-program
112 (purecopy
113 (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
114 ((file-exists-p "/usr/local/inews") "/usr/local/inews")
115 ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")
116 ((file-exists-p "/usr/contrib/lib/news/inews") "/usr/contrib/lib/news/inews")
117 ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
118 (t "inews")))
119 "Program to post news.")
120
121;; set this to your local server
122(defvar gnus-default-nntp-server (purecopy "") "\
123The name of the host running an NNTP server.
124The null string means use the local host as the server site.")
125
126(defvar gnus-nntp-service (purecopy "nntp") "\
127NNTP service name, usually \"nntp\" or 119.
128Go to a local news spool if its value is nil, in which case `gnus-nntp-server'
129should be set to `(system-name)'.")
130
131(defvar gnus-local-organization nil "\
132*The name of your organization, as a string.
133The `ORGANIZATION' environment variable is used instead if defined.")
134
135(defcustom rmail-file-name (purecopy "~/RMAIL") "\
136Name of user's primary mail file."
137 :type 'string
138 :group 'rmail
139 :version "21.1")
140
141(defvar rmail-spool-directory
142 (purecopy
143 (cond ((file-exists-p "/var/mail")
144 ;; SVR4 and recent BSD are said to use this.
145 ;; Rather than trying to know precisely which systems use it,
146 ;; let's assume this dir is never used for anything else.
147 "/var/mail/")
148 ;; Many GNU/Linux systems use this name.
149 ((file-exists-p "/var/spool/mail")
150 "/var/spool/mail/")
151 ((memq system-type '(hpux usg-unix-v irix))
152 "/usr/mail/")
153 (t "/usr/spool/mail/")))
154 "Name of directory used by system mailer for delivering new mail.
155Its name should end with a slash.")
156
157(defcustom remote-shell-program 104(defcustom remote-shell-program
158 (purecopy 105 (purecopy
159 (cond 106 (cond
@@ -180,9 +127,4 @@ Its name should end with a slash.")
180 :group 'environment 127 :group 'environment
181 :type 'file) 128 :type 'file)
182 129
183(defvar term-file-prefix (purecopy "term/") "\
184If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\")))
185You may set this variable to nil in your `.emacs' file if you do not wish
186the terminal-initialization file to be loaded.")
187
188;;; paths.el ends here 130;;; paths.el ends here
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index d57a3128a16..07cb43b64a2 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -209,7 +209,8 @@ It creates the Imenu index for the buffer, if necessary."
209 (setq imenu--index-alist 209 (setq imenu--index-alist
210 (save-excursion (funcall imenu-create-index-function)))) 210 (save-excursion (funcall imenu-create-index-function))))
211 (error 211 (error
212 (unless (equal err '(error "This buffer cannot use `imenu-default-create-index-function'")) 212 (unless (equal err
213 '(user-error "This buffer cannot use `imenu-default-create-index-function'"))
213 (message "which-func-ff-hook error: %S" err)) 214 (message "which-func-ff-hook error: %S" err))
214 (setq which-func-mode nil)))) 215 (setq which-func-mode nil))))
215 216
diff --git a/lisp/version.el b/lisp/version.el
index d7fb05ea465..804727a07c2 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,4 +1,4 @@
1;;; version.el --- record version number of Emacs 1;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
2 2
3;; Copyright (C) 1985, 1992, 1994-1995, 1999-2012 3;; Copyright (C) 1985, 1992, 1994-1995, 1999-2012
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
@@ -121,9 +121,4 @@ Optional argument DIR is a directory to use instead of `source-directory'."
121(purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version)) 121(purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
122 " $\n")) 122 " $\n"))
123 123
124;; Local Variables:
125;; version-control: never
126;; no-byte-compile: t
127;; End:
128
129;;; version.el ends here 124;;; version.el ends here
diff --git a/make-dist b/make-dist
index 0a12a630526..ead1fa544ec 100755
--- a/make-dist
+++ b/make-dist
@@ -293,7 +293,7 @@ for subdir in site-lisp \
293 leim leim/CXTERM-DIC leim/MISC-DIC \ 293 leim leim/CXTERM-DIC leim/MISC-DIC \
294 leim/SKK-DIC leim/ja-dic leim/quail \ 294 leim/SKK-DIC leim/ja-dic leim/quail \
295 build-aux build-aux/snippet \ 295 build-aux build-aux/snippet \
296 src src/m src/s src/bitmaps lib lib-src oldXMenu lwlib \ 296 src src/s src/bitmaps lib lib-src oldXMenu lwlib \
297 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ 297 nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
298 `find etc lisp admin -type d` \ 298 `find etc lisp admin -type d` \
299 doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ 299 doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
@@ -370,10 +370,6 @@ echo "Making links to \`src/bitmaps'"
370(cd src/bitmaps 370(cd src/bitmaps
371 ln README *.xbm ../../${tempdir}/src/bitmaps) 371 ln README *.xbm ../../${tempdir}/src/bitmaps)
372 372
373echo "Making links to \`src/m'"
374(cd src/m
375 ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/m)
376
377echo "Making links to \`src/s'" 373echo "Making links to \`src/s'"
378(cd src/s 374(cd src/s
379 ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s) 375 ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s)
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 46472373e51..2b56315c1a3 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
12012-05-22 Paul Eggert <eggert@cs.ucla.edu>
2
3 Remove src/m/*.
4 * mainmake.v2 (TAGS tags): Don't look at $(CURDIR)/src/m/intel386.h.
5
12012-05-19 Paul Eggert <eggert@cs.ucla.edu> 62012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * sed2v2.inp (HAVE_MBLEN): Remove. 8 * sed2v2.inp (HAVE_MBLEN): Remove.
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 2113dc4a127..b4837b99fb9 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -162,7 +162,7 @@ TAGS tags: lib-src FRC
162 ../bin/etags --include=../lisp/TAGS \ 162 ../bin/etags --include=../lisp/TAGS \
163 --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ 163 --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \
164 $(CURDIR)/src/*.c $(CURDIR)/src/*.h \ 164 $(CURDIR)/src/*.c $(CURDIR)/src/*.h \
165 $(CURDIR)/src/s/msdos.h $(CURDIR)/src/m/intel386.h 165 $(CURDIR)/src/s/msdos.h
166 cd .. 166 cd ..
167 ./bin/etags --include=src/TAGS 167 ./bin/etags --include=src/TAGS
168 168
@@ -299,4 +299,3 @@ bootstrap-clean: FRC
299bootstrap: bootstrap-clean FRC 299bootstrap: bootstrap-clean FRC
300 command.com /e:2048 /c config msdos 300 command.com /e:2048 /c config msdos
301 $(MAKE) $(MFLAGS) info all 301 $(MAKE) $(MFLAGS) info all
302
diff --git a/nt/ChangeLog b/nt/ChangeLog
index faf6f80c4c5..198729776b5 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
12012-05-22 Paul Eggert <eggert@cs.ucla.edu>
2
3 Remove src/m/*.
4 * config.nt: Do not include "m/intel386.h"; file was removed.
5 (BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
6 Move to src/lisp.h.
7 (EMACS_INT_MAX): New macro.
8
12012-05-19 Paul Eggert <eggert@cs.ucla.edu> 92012-05-19 Paul Eggert <eggert@cs.ucla.edu>
2 10
3 * config.nt (HAVE_GETDOMAINNAME, HAVE_XSETWMPROTOCOLS) 11 * config.nt (HAVE_GETDOMAINNAME, HAVE_XSETWMPROTOCOLS)
diff --git a/nt/config.nt b/nt/config.nt
index 9d933c2d0a0..16122b5e10e 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -421,17 +421,6 @@ typedef unsigned short mode_t;
421#undef config_opsysfile 421#undef config_opsysfile
422#include "s/ms-w32.h" 422#include "s/ms-w32.h"
423 423
424/* The configuration script defines machfile to be the name of the
425 m/MACHINE.h file that describes the machine you are using. The file is
426 chosen based on the configuration name you give.
427
428 See the file ../etc/MACHINES for a list of machines and the
429 configuration names to use for them.
430
431 See m/template.h for documentation on writing m/MACHINE.h files. */
432#undef config_machfile
433#include "m/intel386.h"
434
435/* Define `subprocesses' should be defined if you want to 424/* Define `subprocesses' should be defined if you want to
436 have code for asynchronous subprocesses 425 have code for asynchronous subprocesses
437 (as used in M-x compile and M-x shell). 426 (as used in M-x compile and M-x shell).
@@ -465,28 +454,6 @@ extern char *getenv ();
465 454
466#endif /* EMACS_CONFIG_H */ 455#endif /* EMACS_CONFIG_H */
467 456
468/* These default definitions are good for almost all machines.
469 The exceptions override them in m/MACHINE.h. */
470
471#ifndef BITS_PER_CHAR
472#define BITS_PER_CHAR 8
473#endif
474
475#ifndef BITS_PER_SHORT
476#define BITS_PER_SHORT 16
477#endif
478
479/* Note that lisp.h uses this in a preprocessor conditional, so it
480 would not work to use sizeof. That being so, we do all of them
481 without sizeof, for uniformity's sake. */
482#ifndef BITS_PER_INT
483#define BITS_PER_INT 32
484#endif
485
486#ifndef BITS_PER_LONG
487#define BITS_PER_LONG 32
488#endif
489
490#if defined (__MINGW32__) || _MSC_VER >= 1400 457#if defined (__MINGW32__) || _MSC_VER >= 1400
491 458
492/* Define to 1 if the system has the type `long long int'. */ 459/* Define to 1 if the system has the type `long long int'. */
@@ -505,7 +472,7 @@ extern char *getenv ();
505 472
506/* Use pre-C99-style 64-bit integers. */ 473/* Use pre-C99-style 64-bit integers. */
507# define EMACS_INT __int64 474# define EMACS_INT __int64
508# define BITS_PER_EMACS_INT 64 475# define EMACS_INT_MAX _I64_MAX
509# define pI "I64" 476# define pI "I64"
510 477
511# endif 478# endif
diff --git a/src/ChangeLog b/src/ChangeLog
index 3054f4a284f..8697e70d51d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,44 @@
12012-05-24 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * window.h (clip_changed): Remove useless declaration.
4
52012-05-22 Juanma Barranquero <lekktu@gmail.com>
6
7 * makefile.w32-in: Follow-up to 2012-05-22T16:20:27Z!eggert@cs.ucla.edu.
8 (TAGS, TAGS-gmake, CONFIG_H): Remove further references to m/intel386.h.
9
102012-05-22 Paul Eggert <eggert@cs.ucla.edu>
11
12 Remove src/m/*.
13 This directory predates autoconf and is no longer needed nowadays.
14 Move its few remaining bits of functionality to where they're needed.
15 * m/README, m/alpha.h, m/amdx86-64.h, m/ia64.h, m/ibmrs6000.h:
16 * m/ibms390x.h, m/intel386.h, m/m68k.h, m/macppc.h, m/sparc.h:
17 * m/template.h: Remove.
18 * Makefile.in (M_FILE): Remove. All uses removed.
19 * alloc.c (POINTERS_MIGHT_HIDE_IN_OBJECTS):
20 * lisp.h (USE_LSB_TAG):
21 * mem-limits.h (EXCEEDS_LISP_PTR):
22 Use VAL_MAX, not VALBITS, in #if.
23 * lisp.h (EMACS_INT_MAX): New macro, useful in #if.
24 (EMACS_UINT): Define unconditionally now.
25 (BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
26 (BITS_PER_EMACS_INT): New constants, replacing
27 what used to be in config.h, but not useful in #if.
28 (GCTYPEBITS, VALBITS): Define unconditionally, since m/* files don't
29 define them any more.
30 (VAL_MAX): New macro.
31 (VALMASK): Use it.
32 * puresize.h (PURESIZE_RATIO): Use EMACS_INT_MAX, not
33 BITS_PER_EMACS_INT, in #if.
34 * s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
35 (BROKEN_SIGPOLL): Move here from m/ibmrs6000.h, which was removed.
36 * s/gnu-linux.h (ULIMIT_BREAK_VALUE) [__i386__]:
37 * s/ms-w32.h (DATA_START):
38 Move here from removed file m/intel386.h.
39 * s/gnu.h (NLIST_STRUCT): Remove undef; 'configure' does this.
40 * s/irix6-5.h (_LP64): Remove; lisp.h no longer needs this.
41
12012-05-21 Paul Eggert <eggert@cs.ucla.edu> 422012-05-21 Paul Eggert <eggert@cs.ucla.edu>
2 43
3 Assume C89 or later. 44 Assume C89 or later.
@@ -21,7 +62,7 @@
212012-05-20 Ken Brown <kbrown@cornell.edu> 622012-05-20 Ken Brown <kbrown@cornell.edu>
22 63
23 * gmalloc.c (_free_internal_nolock, _realloc_internal_nolock) 64 * gmalloc.c (_free_internal_nolock, _realloc_internal_nolock)
24 [CYGWIN]: Cast ptr to (char *) before comparing to _heapbase. 65 [CYGWIN]: Cast ptr to (char *) before comparing to _heapbase.
25 66
262012-05-19 Ken Brown <kbrown@cornell.edu> 672012-05-19 Ken Brown <kbrown@cornell.edu>
27 68
@@ -398,7 +439,7 @@
3982012-04-22 Paul Eggert <eggert@cs.ucla.edu> 4392012-04-22 Paul Eggert <eggert@cs.ucla.edu>
399 440
400 Modernize and clean up gmalloc.c to assume C89 (Bug#9119). 441 Modernize and clean up gmalloc.c to assume C89 (Bug#9119).
401 * gmalloc.c: (_MALLOC_INTERNAL, _MALLOC_H, _PP, __ptr_t) 442 * gmalloc.c (_MALLOC_INTERNAL, _MALLOC_H, _PP, __ptr_t)
402 (__malloc_size_t, __malloc_ptrdiff_t): 443 (__malloc_size_t, __malloc_ptrdiff_t):
403 Remove. All uses removed, replaced by the definiens if needed, 444 Remove. All uses removed, replaced by the definiens if needed,
404 since we can assume C89 or better now. 445 since we can assume C89 or better now.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8d4c5306782..1dd966ec0a7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,9 +56,8 @@ lwlibdir = ../lwlib
56lispdir = ../lisp 56lispdir = ../lisp
57 57
58# Configuration files for .o files to depend on. 58# Configuration files for .o files to depend on.
59M_FILE = @M_FILE@
60S_FILE = @S_FILE@ 59S_FILE = @S_FILE@
61config_h = config.h $(M_FILE) $(S_FILE) 60config_h = config.h $(S_FILE)
62 61
63bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) 62bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT)
64 63
@@ -544,10 +543,10 @@ extraclean: distclean
544ctagsfiles1 = [xyzXYZ]*.[hcm] 543ctagsfiles1 = [xyzXYZ]*.[hcm]
545ctagsfiles2 = [a-wA-W]*.[hcm] 544ctagsfiles2 = [a-wA-W]*.[hcm]
546 545
547TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(M_FILE) $(S_FILE) 546TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(S_FILE)
548 ../lib-src/etags --include=TAGS-LISP --include=$(lwlibdir)/TAGS \ 547 ../lib-src/etags --include=TAGS-LISP --include=$(lwlibdir)/TAGS \
549 --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ 548 --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \
550 $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(M_FILE) $(S_FILE) 549 $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(S_FILE)
551frc: 550frc:
552TAGS-LISP: frc 551TAGS-LISP: frc
553 $(MAKE) -f $(lispdir)/Makefile TAGS-LISP ETAGS=../lib-src/etags 552 $(MAKE) -f $(lispdir)/Makefile TAGS-LISP ETAGS=../lib-src/etags
diff --git a/src/alloc.c b/src/alloc.c
index 3601c256c41..1f422a6d3b0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4297,8 +4297,8 @@ mark_maybe_pointer (void *p)
4297 wider than a pointer might allocate a Lisp_Object in non-adjacent halves. 4297 wider than a pointer might allocate a Lisp_Object in non-adjacent halves.
4298 If USE_LSB_TAG, the bottom half is not a valid pointer, but it should 4298 If USE_LSB_TAG, the bottom half is not a valid pointer, but it should
4299 suffice to widen it to to a Lisp_Object and check it that way. */ 4299 suffice to widen it to to a Lisp_Object and check it that way. */
4300#if defined USE_LSB_TAG || UINTPTR_MAX >> VALBITS != 0 4300#if defined USE_LSB_TAG || VAL_MAX < UINTPTR_MAX
4301# if !defined USE_LSB_TAG && UINTPTR_MAX >> VALBITS >> GCTYPEBITS != 0 4301# if !defined USE_LSB_TAG && VAL_MAX < UINTPTR_MAX >> GCTYPEBITS
4302 /* If tag bits straddle pointer-word boundaries, neither mark_maybe_pointer 4302 /* If tag bits straddle pointer-word boundaries, neither mark_maybe_pointer
4303 nor mark_maybe_object can follow the pointers. This should not occur on 4303 nor mark_maybe_object can follow the pointers. This should not occur on
4304 any practical porting target. */ 4304 any practical porting target. */
diff --git a/src/lisp.h b/src/lisp.h
index 823e0ec5205..fd9ac6ef0e2 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -41,25 +41,36 @@ extern void check_cons_list (void);
41 Build with CFLAGS='-DWIDE_EMACS_INT' to try them out. */ 41 Build with CFLAGS='-DWIDE_EMACS_INT' to try them out. */
42/* #undef WIDE_EMACS_INT */ 42/* #undef WIDE_EMACS_INT */
43 43
44/* These are default choices for the types to use. */ 44/* EMACS_INT - signed integer wide enough to hold an Emacs value
45 EMACS_INT_MAX - maximum value of EMACS_INT; can be used in #if
46 pI - printf length modifier for EMACS_INT
47 EMACS_UINT - unsigned variant of EMACS_INT */
45#ifndef EMACS_INT 48#ifndef EMACS_INT
46# if BITS_PER_LONG < BITS_PER_LONG_LONG && defined WIDE_EMACS_INT 49# if LONG_MAX < LLONG_MAX && defined WIDE_EMACS_INT
47# define EMACS_INT long long 50# define EMACS_INT long long
48# define BITS_PER_EMACS_INT BITS_PER_LONG_LONG 51# define EMACS_INT_MAX LLONG_MAX
49# define pI "ll" 52# define pI "ll"
50# elif BITS_PER_INT < BITS_PER_LONG 53# elif INT_MAX < LONG_MAX
51# define EMACS_INT long 54# define EMACS_INT long
52# define BITS_PER_EMACS_INT BITS_PER_LONG 55# define EMACS_INT_MAX LONG_MAX
53# define pI "l" 56# define pI "l"
54# else 57# else
55# define EMACS_INT int 58# define EMACS_INT int
56# define BITS_PER_EMACS_INT BITS_PER_INT 59# define EMACS_INT_MAX INT_MAX
57# define pI "" 60# define pI ""
58# endif 61# endif
59#endif 62#endif
60#ifndef EMACS_UINT 63#define EMACS_UINT unsigned EMACS_INT
61# define EMACS_UINT unsigned EMACS_INT 64
62#endif 65/* Number of bits in some machine integer types. */
66enum
67 {
68 BITS_PER_CHAR = CHAR_BIT,
69 BITS_PER_SHORT = CHAR_BIT * sizeof (short),
70 BITS_PER_INT = CHAR_BIT * sizeof (int),
71 BITS_PER_LONG = CHAR_BIT * sizeof (long int),
72 BITS_PER_EMACS_INT = CHAR_BIT * sizeof (EMACS_INT)
73 };
63 74
64/* printmax_t and uprintmax_t are types for printing large integers. 75/* printmax_t and uprintmax_t are types for printing large integers.
65 These are the widest integers that are supported for printing. 76 These are the widest integers that are supported for printing.
@@ -164,13 +175,13 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
164 variable VAR of type TYPE with the added requirement that it be 175 variable VAR of type TYPE with the added requirement that it be
165 TYPEBITS-aligned. */ 176 TYPEBITS-aligned. */
166 177
167#ifndef GCTYPEBITS
168#define GCTYPEBITS 3 178#define GCTYPEBITS 3
169#endif
170
171#ifndef VALBITS
172#define VALBITS (BITS_PER_EMACS_INT - GCTYPEBITS) 179#define VALBITS (BITS_PER_EMACS_INT - GCTYPEBITS)
173#endif 180
181/* The maximum value that can be stored in a EMACS_INT, assuming all
182 bits other than the type bits contribute to a nonnegative signed value.
183 This can be used in #if, e.g., '#if VAL_MAX < UINTPTR_MAX' below. */
184#define VAL_MAX (EMACS_INT_MAX >> (GCTYPEBITS - 1))
174 185
175#ifndef NO_DECL_ALIGN 186#ifndef NO_DECL_ALIGN
176# ifndef DECL_ALIGN 187# ifndef DECL_ALIGN
@@ -195,12 +206,12 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
195 || defined DARWIN_OS || defined __sun) 206 || defined DARWIN_OS || defined __sun)
196/* We also need to be able to specify mult-of-8 alignment on static vars. */ 207/* We also need to be able to specify mult-of-8 alignment on static vars. */
197# if defined DECL_ALIGN 208# if defined DECL_ALIGN
198/* On hosts where VALBITS is greater than the pointer width in bits, 209/* On hosts where pointers-as-ints do not exceed VAL_MAX,
199 USE_LSB_TAG is: 210 USE_LSB_TAG is:
200 a. unnecessary, because the top bits of an EMACS_INT are unused, and 211 a. unnecessary, because the top bits of an EMACS_INT are unused, and
201 b. slower, because it typically requires extra masking. 212 b. slower, because it typically requires extra masking.
202 So, define USE_LSB_TAG only on hosts where it might be useful. */ 213 So, define USE_LSB_TAG only on hosts where it might be useful. */
203# if UINTPTR_MAX >> VALBITS != 0 214# if VAL_MAX < UINTPTR_MAX
204# define USE_LSB_TAG 215# define USE_LSB_TAG
205# endif 216# endif
206# endif 217# endif
@@ -483,7 +494,7 @@ enum pvec_type
483 494
484#else /* not USE_LSB_TAG */ 495#else /* not USE_LSB_TAG */
485 496
486#define VALMASK ((((EMACS_INT) 1) << VALBITS) - 1) 497#define VALMASK VAL_MAX
487 498
488/* One need to override this if there must be high bits set in data space 499/* One need to override this if there must be high bits set in data space
489 (doing the result of the below & ((1 << (GCTYPE + 1)) - 1) would work 500 (doing the result of the below & ((1 << (GCTYPE + 1)) - 1) would work
diff --git a/src/m/README b/src/m/README
deleted file mode 100644
index ad91167648e..00000000000
--- a/src/m/README
+++ /dev/null
@@ -1,7 +0,0 @@
1This directory contains C header files containing machine-specific
2definitions. Each file describes a particular machine. The emacs
3configuration script edits ../config.h to include the appropriate one of
4these files, and then each emacs source file includes config.h.
5
6template.h is a generic template for machine descriptions; it
7describes the parameters a machine file can specify.
diff --git a/src/m/alpha.h b/src/m/alpha.h
deleted file mode 100644
index 2a97a3d5b0c..00000000000
--- a/src/m/alpha.h
+++ /dev/null
@@ -1,53 +0,0 @@
1/* Machine description file for the alpha chip.
2
3Copyright (C) 1994, 1997, 1999, 2001-2012 Free Software Foundation, Inc.
4
5Author: Rainer Schoepf
6(according to authors.el)
7
8This file is part of GNU Emacs.
9
10GNU Emacs is free software: you can redistribute it and/or modify
11it under the terms of the GNU General Public License as published by
12the Free Software Foundation, either version 3 of the License, or
13(at your option) any later version.
14
15GNU Emacs is distributed in the hope that it will be useful,
16but WITHOUT ANY WARRANTY; without even the implied warranty of
17MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18GNU General Public License for more details.
19
20You should have received a copy of the GNU General Public License
21along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
22
23#ifndef _LP64
24#define _LP64 /* This doesn't appear to be necessary on OSF 4/5 -- fx. */
25#endif
26
27/* Now define a symbol for the cpu type, if your compiler
28 does not define it automatically. */
29/* __alpha defined automatically */
30
31
32#ifdef __ELF__
33
34#if !defined (GNU_LINUX) && !defined (__NetBSD__)
35#define DATA_START 0x140000000
36#endif
37
38#else /* not __ELF__ */
39
40/* Describe layout of the address space in an executing process. */
41#define DATA_START 0x140000000
42
43#endif /* __ELF__ */
44
45/* On the Alpha it's best to avoid including TERMIO since struct
46 termio and struct termios are mutually incompatible. */
47#define NO_TERMIO
48
49/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
50 they generate code that uses a signaling NaN instead of DBL_MIN.
51 Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
52 this avoids the assembler bug. */
53#define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
deleted file mode 100644
index f0482c733f9..00000000000
--- a/src/m/amdx86-64.h
+++ /dev/null
@@ -1,35 +0,0 @@
1/* machine description file for AMD x86-64.
2
3Copyright (C) 2002-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20#define BITS_PER_LONG 64
21#define BITS_PER_EMACS_INT 64
22
23/* Now define a symbol for the cpu type, if your compiler
24 does not define it automatically:
25 Ones defined so far include vax, m68000, ns16000, pyramid,
26 orion, tahoe, APOLLO and many others */
27/* __x86_64 defined automatically. */
28
29/* Define the type to use. */
30#define EMACS_INT long
31#define pI "l"
32#define EMACS_UINT unsigned long
33
34/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
35#undef DATA_SEG_BITS
diff --git a/src/m/ia64.h b/src/m/ia64.h
deleted file mode 100644
index 47df94cedd0..00000000000
--- a/src/m/ia64.h
+++ /dev/null
@@ -1,32 +0,0 @@
1/* machine description file for the IA-64 architecture.
2
3Copyright (C) 2000-2012 Free Software Foundation, Inc.
4
5 Contributed by David Mosberger <davidm@hpl.hp.com>
6
7This file is part of GNU Emacs.
8
9GNU Emacs is free software: you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by
11the Free Software Foundation, either version 3 of the License, or
12(at your option) any later version.
13
14GNU Emacs is distributed in the hope that it will be useful,
15but WITHOUT ANY WARRANTY; without even the implied warranty of
16MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17GNU General Public License for more details.
18
19You should have received a copy of the GNU General Public License
20along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
21
22#define BITS_PER_LONG 64
23#define BITS_PER_EMACS_INT 64
24
25/* Now define a symbol for the cpu type, if your compiler
26 does not define it automatically. */
27/* __ia64__ defined automatically */
28
29/* Define the type to use. */
30#define EMACS_INT long
31#define pI "l"
32#define EMACS_UINT unsigned long
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
deleted file mode 100644
index 9798ad2d3d7..00000000000
--- a/src/m/ibmrs6000.h
+++ /dev/null
@@ -1,46 +0,0 @@
1/* R2 AIX machine/system dependent defines
2
3Copyright (C) 1988, 2001-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20
21/* The data segment in this machine always starts at address 0x20000000.
22 An address of data cannot be stored correctly in a Lisp object;
23 we always lose the high bits. We must tell XPNTR to add them back. */
24#define DATA_START 0x20000000
25#define DATA_SEG_BITS 0x20000000
26
27#ifndef NLIST_STRUCT
28/* AIX supposedly doesn't use this interface, but on the RS/6000
29 it apparently does. */
30#define NLIST_STRUCT
31#endif
32
33#undef ADDR_CORRECT
34#define ADDR_CORRECT(x) ((int)(x))
35
36/*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
37#define BROKEN_FIONREAD
38/* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
39 But, on AIX, SIGAIO, SIGPTY, and SIGPOLL are defined as SIGIO,
40 which causes compilation error at init_signals in sysdep.c. So, we
41 define these macros so that syssignal.h detects them and undefine
42 SIGAIO, SIGPTY and SIGPOLL. */
43#define BROKEN_SIGAIO
44#define BROKEN_SIGPTY
45#define BROKEN_SIGPOLL
46
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
deleted file mode 100644
index aa652a8206a..00000000000
--- a/src/m/ibms390x.h
+++ /dev/null
@@ -1,32 +0,0 @@
1/* Machine description file for IBM S390 in 64-bit mode
2
3Copyright (C) 2002-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20#define BITS_PER_LONG 64
21#define BITS_PER_EMACS_INT 64
22
23/* Define the type to use. */
24#define EMACS_INT long
25#define pI "l"
26#define EMACS_UINT unsigned long
27
28/* On the 64 bit architecture, we can use 60 bits for addresses */
29#define VALBITS 60
30
31/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
32#define XPNTR(a) XUINT (a)
diff --git a/src/m/intel386.h b/src/m/intel386.h
deleted file mode 100644
index 78a43e92c21..00000000000
--- a/src/m/intel386.h
+++ /dev/null
@@ -1,29 +0,0 @@
1/* Machine description file for intel 386.
2
3Copyright (C) 1987, 2001-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20
21#ifdef WINDOWSNT
22#define DATA_START get_data_start ()
23#endif
24
25#ifdef GNU_LINUX
26/* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */
27/* we cannot get the maximum address for brk */
28#define ULIMIT_BREAK_VALUE (32*1024*1024)
29#endif
diff --git a/src/m/m68k.h b/src/m/m68k.h
deleted file mode 100644
index 120a2bad293..00000000000
--- a/src/m/m68k.h
+++ /dev/null
@@ -1,32 +0,0 @@
1/* Machine description file for generic Motorola 68k.
2
3Copyright (C) 1985, 1995, 2001-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20/* Now define a symbol for the cpu type, if your compiler
21 does not define it automatically. */
22#ifndef m68k
23#define m68k
24#endif
25
26#ifdef GNU_LINUX
27#ifdef __ELF__
28#define DATA_SEG_BITS 0x80000000
29#endif
30
31#endif
32
diff --git a/src/m/macppc.h b/src/m/macppc.h
deleted file mode 100644
index 0303ead25d6..00000000000
--- a/src/m/macppc.h
+++ /dev/null
@@ -1,24 +0,0 @@
1/* machine description file For the powerpc Macintosh.
2
3Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20#ifdef _ARCH_PPC64
21#ifndef _LP64
22#define _LP64
23#endif
24#endif
diff --git a/src/m/sparc.h b/src/m/sparc.h
deleted file mode 100644
index 27b6070ba87..00000000000
--- a/src/m/sparc.h
+++ /dev/null
@@ -1,30 +0,0 @@
1/* machine description file for Sun 4 SPARC.
2
3Copyright (C) 1987, 2001-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20/* __sparc__ is defined by the compiler by default. */
21
22#ifdef __arch64__ /* GCC, 64-bit ABI. */
23
24#define BITS_PER_LONG 64
25
26#ifndef _LP64
27#define _LP64 /* Done on Alpha -- not sure if it should be here. -- fx */
28#endif
29
30#endif /* __arch64__ */
diff --git a/src/m/template.h b/src/m/template.h
deleted file mode 100644
index 5f1a46c86e1..00000000000
--- a/src/m/template.h
+++ /dev/null
@@ -1,34 +0,0 @@
1/* machine description file template.
2
3Copyright (C) 1985-1986, 2001-2012 Free Software Foundation, Inc.
4
5This file is part of GNU Emacs.
6
7GNU Emacs is free software: you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by
9the Free Software Foundation, either version 3 of the License, or
10(at your option) any later version.
11
12GNU Emacs is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of
14MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details.
16
17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19
20/* Now define a symbol for the cpu type, if your compiler
21 does not define it automatically.
22 Ones defined so far include m68k and many others */
23
24/* After adding support for a new machine, modify the large case
25 statement in configure.in to recognize reasonable
26 configuration names, and add a description of the system to
27 `etc/MACHINES'.
28
29 Check for any tests of $machine in configure.in, and add an entry
30 for the new machine if needed.
31
32 If you've just fixed a problem in an existing configuration file,
33 you should also check `etc/MACHINES' to make sure its descriptions
34 of known problems in that configuration should be updated. */
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index f62c501e1fa..99b1241eab0 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -343,7 +343,7 @@ cleanall: clean
343## 343##
344## This works only with GNU Make. 344## This works only with GNU Make.
345 345
346TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/m/intel386.h $(CURDIR)/s/ms-w32.h 346TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/s/ms-w32.h
347 $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE) 347 $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
348 348
349TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2) 349TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
@@ -357,7 +357,7 @@ TAGS-gmake:
357 $(OBJ1_c) 357 $(OBJ1_c)
358 ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ 358 ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
359 $(OBJ2_c) \ 359 $(OBJ2_c) \
360 $(CURDIR)/*.h $(CURDIR)/m/intel386.h $(CURDIR)/s/ms-w32.h 360 $(CURDIR)/*.h $(CURDIR)/s/ms-w32.h
361 361
362TAGS-nmake: 362TAGS-nmake:
363 echo This target is not supported with NMake 363 echo This target is not supported with NMake
@@ -407,7 +407,6 @@ CODING_H = $(SRC)/coding.h \
407MS_W32_H = $(SRC)/s/ms-w32.h \ 407MS_W32_H = $(SRC)/s/ms-w32.h \
408 $(NT_INC)/sys/stat.h 408 $(NT_INC)/sys/stat.h
409CONFIG_H = $(SRC)/config.h \ 409CONFIG_H = $(SRC)/config.h \
410 $(SRC)/m/intel386.h \
411 $(MS_W32_H) 410 $(MS_W32_H)
412DIR_H = $(NT_INC)/sys/dir.h \ 411DIR_H = $(NT_INC)/sys/dir.h \
413 $(SRC)/ndir.h 412 $(SRC)/ndir.h
diff --git a/src/mem-limits.h b/src/mem-limits.h
index 244592a9768..1fd53b472f3 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -34,7 +34,7 @@ extern int etext;
34#endif 34#endif
35 35
36extern char *start_of_data (void); 36extern char *start_of_data (void);
37#if defined USE_LSB_TAG || UINTPTR_MAX >> VALBITS == 0 37#if defined USE_LSB_TAG || UINTPTR_MAX <= VAL_MAX
38#define EXCEEDS_LISP_PTR(ptr) 0 38#define EXCEEDS_LISP_PTR(ptr) 0
39#elif defined DATA_SEG_BITS 39#elif defined DATA_SEG_BITS
40#define EXCEEDS_LISP_PTR(ptr) \ 40#define EXCEEDS_LISP_PTR(ptr) \
diff --git a/src/puresize.h b/src/puresize.h
index e854dc585e8..185d2a76ae0 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -45,7 +45,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
45 45
46/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ 46/* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */
47#ifndef PURESIZE_RATIO 47#ifndef PURESIZE_RATIO
48#if BITS_PER_EMACS_INT > 32 48#if EMACS_INT_MAX >> 31 != 0
49#define PURESIZE_RATIO 10/6 /* Don't surround with `()'. */ 49#define PURESIZE_RATIO 10/6 /* Don't surround with `()'. */
50#else 50#else
51#define PURESIZE_RATIO 1 51#define PURESIZE_RATIO 1
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 354ffda0988..cacfdc7ed63 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -76,6 +76,17 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
76 to avoid a crash just use the Emacs implementation for that function. */ 76 to avoid a crash just use the Emacs implementation for that function. */
77#define BROKEN_GET_CURRENT_DIR_NAME 1 77#define BROKEN_GET_CURRENT_DIR_NAME 1
78 78
79/*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
80#define BROKEN_FIONREAD
81/* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
82 But, on AIX, SIGAIO, SIGPTY, and SIGPOLL are defined as SIGIO,
83 which causes compilation error at init_signals in sysdep.c. So, we
84 define these macros so that syssignal.h detects them and undefine
85 SIGAIO, SIGPTY and SIGPOLL. */
86#define BROKEN_SIGAIO
87#define BROKEN_SIGPTY
88#define BROKEN_SIGPOLL
89
79/* Conservative garbage collection has not been tested, so for now 90/* Conservative garbage collection has not been tested, so for now
80 play it safe and stick with the old-fashioned way of marking. */ 91 play it safe and stick with the old-fashioned way of marking. */
81#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE 92#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index d04ea33068a..409d0205520 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -157,3 +157,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
157#else 157#else
158#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE 158#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
159#endif 159#endif
160
161#ifdef __i386__
162/* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */
163/* we cannot get the maximum address for brk */
164# define ULIMIT_BREAK_VALUE (32*1024*1024)
165#endif
diff --git a/src/s/gnu.h b/src/s/gnu.h
index a09e0e824c9..cd72164a520 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -24,8 +24,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
24#undef SYSTEM_TYPE 24#undef SYSTEM_TYPE
25#define SYSTEM_TYPE "gnu" 25#define SYSTEM_TYPE "gnu"
26 26
27#undef NLIST_STRUCT
28
29#define SIGNALS_VIA_CHARACTERS 27#define SIGNALS_VIA_CHARACTERS
30 28
31/* libc defines data_start. */ 29/* libc defines data_start. */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index e5d90c1bd5d..e5479c3b8d3 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -85,10 +85,6 @@ char *_getpty();
85 85
86#define NARROWPROTO 1 86#define NARROWPROTO 1
87 87
88#if _MIPS_SZLONG == 64 /* -mabi=64 (gcc) or -64 (MIPSpro) */
89#define _LP64 /* lisp.h takes care of the rest */
90#endif /* _MIPS_SZLONG */
91
92#undef SA_RESTART 88#undef SA_RESTART
93 89
94#undef TIOCSIGSEND /* defined in usg5-4-common.h */ 90#undef TIOCSIGSEND /* defined in usg5-4-common.h */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 63fc2f1f62b..f88128b27aa 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -381,6 +381,8 @@ extern int getloadavg (double *, int);
381/* We need a little extra space, see ../../lisp/loadup.el. */ 381/* We need a little extra space, see ../../lisp/loadup.el. */
382#define SYSTEM_PURESIZE_EXTRA 50000 382#define SYSTEM_PURESIZE_EXTRA 50000
383 383
384#define DATA_START get_data_start ()
385
384/* For unexec to work on Alpha systems, we need to put Emacs' 386/* For unexec to work on Alpha systems, we need to put Emacs'
385 initialized data into a separate section from the CRT initialized 387 initialized data into a separate section from the CRT initialized
386 data (because the Alpha linker freely reorders data variables, even 388 data (because the Alpha linker freely reorders data variables, even
diff --git a/src/window.h b/src/window.h
index ea127ca95a8..1524805579f 100644
--- a/src/window.h
+++ b/src/window.h
@@ -852,11 +852,6 @@ extern EMACS_INT minibuf_level;
852 852
853extern int update_mode_lines; 853extern int update_mode_lines;
854 854
855/* Nonzero if BEGV - BEG or Z - ZV of current buffer has changed since
856 last redisplay that finished. */
857
858extern int clip_changed;
859
860/* Nonzero if window sizes or contents have changed since last 855/* Nonzero if window sizes or contents have changed since last
861 redisplay that finished */ 856 redisplay that finished */
862 857
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-13 23:14:14 +0000