procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk

Browse source
This commit is contained in:
Fabián Ezequiel Gallina 2012-06-14 23:05:43 -03:00
commit 315f675857
661 changed files with 26460 additions and 21048 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
BUGS
View file

@ -4,10 +4,13 @@ Bugs section of the Emacs manual for advice on
(1) how to tell when to report a bug, and
(2) how to write a useful bug report and what information it needs to have.
You can read the read the Bugs section of the manual from inside Emacs.
Start Emacs, do C-h i to enter Info, then m Emacs RET to get to the
Emacs manual, then m Bugs RET to get to the section on bugs.
Or you can use the standalone Info program in a like manner.
You can read the Bugs section of the manual from inside Emacs.
Start Emacs, and press
C-h r (to view the Emacs manual)
m Bugs RET (to go to the section on Bugs)
Or you can use the standalone Info program:
info emacs
m Bugs RET
(Standalone Info is part of the Texinfo distribution, not part of the
Emacs distribution.)
@ -16,7 +19,7 @@ Software Foundation's online store at <http://shop.fsf.org/>.
If necessary, you can read the manual without an info program:
cat info/emacs* | more "+/^File: emacs, Node: Bugs,"
cat info/emacs* | more "+/^File: emacs.*, Node: Bugs,"
Please first check the file etc/PROBLEMS (e.g. with C-h C-p in Emacs) to

328
ChangeLog
View file

@ -1,5 +1,331 @@
2012-06-13 Andreas Schwab <schwab@linux-m68k.org>
* configure.in: Rename --enable-use-lisp-union-type to
--enable-check-lisp-object-type and define CHECK_LISP_OBJECT_TYPE
instead of USE_LISP_UNION_TYPE.
2012-06-12 Glenn Morris <rgm@gnu.org>
* configure.in (HAVE_PROCFS, _STRUCTURED_PROC): New AC_DEFINEs.
(opsysfile): Set specially for sol2-10.
* configure.in (BROKEN_SA_RESTART, USG_SUBTTY_WORKS):
New AC_DEFINEs, for hpux11.
(opsysfile): Set specially for hpux11.
2012-06-12 Paul Eggert <eggert@cs.ucla.edu>
* configure.in: Coalesce some function checking.
This makes 'configure' a bit smaller.
Prefer AC_CHECK_FUNCS_ONCE for functions that we always check for.
2012-06-12 Glenn Morris <rgm@gnu.org>
* configure.in (opsysfile): Set specially for gnu-kfreebsd, openbsd.
* configure.in (NO_TERMIO, BROKEN_SIGIO): Move here from src/s.
* configure.in: Anticipate platforms with no src/s file.
2012-06-12 Chong Yidong <cyd@gnu.org>
* configure.in: Check for MagickMergeImageLayers (Bug#11678).
2012-06-11 Glenn Morris <rgm@gnu.org>
* configure.in (SYSTEM_TYPE): New AC_DEFINE.
2012-06-09 Michael Albinus <michael.albinus@gmx.de>
* configure.in (dbus_type_is_valid): Check for library function.
2012-06-06 Glenn Morris <rgm@gnu.org>
* INSTALL, make-dist: Remove vcdiff.
2012-06-03 Glenn Morris <rgm@gnu.org>
* INSTALL, make-dist: Remove rcs-checkin.
2012-06-03 Ulrich Müller <ulm@gentoo.org>
* configure.in (PAXCTL): Check for paxctl. (Bug#11398)
2012-06-01 Paul Eggert <eggert@cs.ucla.edu>
Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
It is confusingly named and rarely useful. See, for example,
<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00089.html>.
* INSTALL.BZR: Don't mention --disable-maintainer-mode.
* Makefile.in (MAINTAINER_MODE_FLAG): Remove; all uses removed.
* configure.in: Remove --disable-maintainer-mode.
(USE_MAINTAINER_MODE, MAINT): Remove.
2012-05-28 Paul Eggert <eggert@cs.ucla.edu>
Make 'configure' a bit smaller and faster.
* configure.in (INSTALL_INFO): Set it with one call to
AC_PATH_PROG, not three.
(PKG_CONFIG): Hoist this out of PKG_CHECK_MODULES, since it's
so likely that it'll be needed.
(AC_CHECK_HEADERS_ONCE): Prefer to AC_CHECK_HEADERS where either works.
(AC_PROG_MAKE_SET): Remove; Automake does this.
(sysinfo): Do not check for this function, as it's never used.
(tzset): Check for this function just once.
* m4/manywarnings.m4: Sync from gnulib, incorporating the following:
2012-05-27 manywarnings: remove duplicate -Wmultichar entry
2012-05-27 Eli Zaretskii <eliz@gnu.org>
* config.bat (lib): Create/update lib/stdalign.in-h and
lib/sys_types.in-h.
* lib/makefile.w32-in ($(BLD)/md5.$(O)):
($(BLD)/sha1.$(O)):
($(BLD)/sha256.$(O)):
($(BLD)/sha512.$(O)): Depend on $(EMACS_ROOT)/nt/inc/stdalign.h.
Suggested by Christoph Scholtes <cschol2112@googlemail.com>.
* lib/getopt_.h: Regenerate.
2012-05-27 Paul Eggert <eggert@cs.ucla.edu>
Assume gnulib does largefile.
Gnulib does the largefile configuration anyway, so when configure.in
invokes AC_SYS_LARGEFILE, that bloats 'configure' unnecessarily.
* configure.in (AC_SYS_LARGEFILE): Remove.
* lib/gnulib.mk: Autoupdate.
2012-05-26 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib. (Bug#11527)
The build procedure now creates <stdalign.h> and <sys/types.h> for
older hosts that lack a working <stdalign.h> or whose
<sys/types.h> does not define pid_t, size_t, ssize_t, mode_t. New
symbols such as WINDOWS_64_BIT_OFF_T may require attention in the
msdos and nt builds.
Here is a precis of gnulib changes that seem relevant; please see
the gnulib ChangeLog for details.
2012-05-18 crypto: fix bug in large buffer handling
2012-05-14 ignore-value.h: remove unused _GL_ATTRIBUTE_DEPRECATED
2012-05-10 _Noreturn: port config.h to gcc -Wundef
2012-05-08 warnings.m4: give a means to specify the program to compile
2012-05-07 stdint: be more consistent with glibc, SunOS libc
2012-04-21 Large File Support for native Windows platforms.
2012-04-14 stat: Bypass buggy override in mingw64.
2012-03-29 stdio: don't assume gets any more
2012-03-24 Enable common subexpression optimization in GCC.
2012-02-09 maint: replace FSF snail-mail addresses with URLs
2012-01-30 sys_stat: Fix support for mingw64 and MSVC.
2012-01-28 strtoimax: eliminate need for stdint.h, inttypes.h checks
2012-01-21 stdint: Add support for Android.
2012-01-15 Improve support for MSVC 9.
2012-01-08 mktime: Avoid compilation error on Solaris 11.
2012-01-05 Use ', not `, for quoting output.
2012-01-05 strtoimax: Don't replace systems where intmax_t is int.
2012-01-05 strtoimax: Work around AIX 5.1 bug.
2012-01-05 inttypes: Modernize.
2011-12-13 inttypes, stdint: add C++11 support
2011-11-26 Fix conflict between two instantiations of module 'unistd'.
2011-11-21 _Noreturn: Check that _MSC_VER is defined
2011-11-10 ptsname_r: Avoid compilation error on OSF/1 5.1.
2011-11-09 raise: fix mingw handling of SIGPIPE
2011-10-27 Add stdalign module and use it in other modules.
* lib/stdalign.in.h, lib/sys_types.in.h, m4/off_t.m4, m4/stdalign.m4:
* m4/sys_types_h.m4:
New files.
* build-aux/move-if-change, build-aux/snippet/_Noreturn.h:
* build-aux/snippet/arg-nonnull.h, build-aux/snippet/c++defs.h:
* build-aux/snippet/warn-on-use.h, doc/misc/texinfo.tex:
* lib/alloca.in.h, lib/allocator.h, lib/careadlinkat.c:
* lib/careadlinkat.h, lib/dosname.h, lib/dup2.c, lib/filemode.c:
* lib/filemode.h, lib/ftoastr.c, lib/ftoastr.h, lib/getloadavg.c:
* lib/getopt.c, lib/getopt.in.h, lib/getopt1.c, lib/getopt_int.h:
* lib/gettext.h, lib/gnulib.mk, lib/ignore-value.h, lib/intprops.h:
* lib/inttypes.in.h, lib/lstat.c, lib/md5.c, lib/md5.h, lib/mktime.c:
* lib/pathmax.h, lib/pthread_sigmask.c, lib/readlink.c, lib/sha1.c:
* lib/sha1.h, lib/sha256.c, lib/sha256.h, lib/sha512.c, lib/sha512.h:
* lib/signal.in.h, lib/sigprocmask.c, lib/stat.c, lib/stdarg.in.h:
* lib/stdbool.in.h, lib/stddef.in.h, lib/stdint.in.h, lib/stdio.in.h:
* lib/stdlib.in.h, lib/strftime.c, lib/strftime.h, lib/strtoimax.c:
* lib/strtol.c, lib/strtoll.c, lib/strtoul.c, lib/strtoull.c:
* lib/symlink.c, lib/sys_stat.in.h, lib/time.in.h, lib/time_r.c:
* lib/u64.h, lib/unistd.in.h, lib/verify.h, m4/00gnulib.m4:
* m4/alloca.m4, m4/c-strtod.m4, m4/dup2.m4, m4/extensions.m4:
* m4/filemode.m4, m4/getloadavg.m4, m4/getopt.m4, m4/gl-comp.m4:
* m4/gnulib-common.m4, m4/gnulib-tool.m4, m4/include_next.m4:
* m4/inttypes.m4, m4/largefile.m4, m4/longlong.m4, m4/lstat.m4:
* m4/md5.m4, m4/mktime.m4, m4/multiarch.m4, m4/nocrash.m4:
* m4/pathmax.m4, m4/pthread_sigmask.m4, m4/readlink.m4, m4/sha1.m4:
* m4/sha256.m4, m4/sha512.m4, m4/signal_h.m4, m4/signalblocking.m4:
* m4/socklen.m4, m4/ssize_t.m4, m4/st_dm_mode.m4, m4/stat.m4:
* m4/stdarg.m4, m4/stdbool.m4, m4/stddef_h.m4, m4/stdint.m4:
* m4/stdio_h.m4, m4/stdlib_h.m4, m4/strftime.m4, m4/strtoimax.m4:
* m4/strtoll.m4, m4/strtoull.m4, m4/strtoumax.m4, m4/symlink.m4:
* m4/sys_stat_h.m4, m4/time_h.m4, m4/time_r.m4, m4/tm_gmtoff.m4:
* m4/unistd_h.m4, m4/warnings.m4, m4/wchar_t.m4:
Update from gnulib.
2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
Remove src/m/*.
* configure.in: Remove all mention of src/m/*.
(machine, machfile, M_FILE, config_machfile, and_machfile): Remove.
All uses removed.
(BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
(BITS_PER_LONG_LONG): Move to src/lisp.h.
* lib/makefile.w32-in: Remove dependencies on
$(EMACS_ROOT)/src/m/intel386.h.
* make-dist: Don't make links to src/m.
2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
Without this further fix, aclocal was being invoked unnecessarily.
2012-05-22 Glenn Morris <rgm@gnu.org>
* Makefile.in (blessmail, install-arch-dep, uninstall):
Check cd lib-src works.
(install-arch-dep, uninstall): Remove unneeded subshells.
2012-05-21 Glenn Morris <rgm@gnu.org>
* update-subdirs: Move to build-aux/.
* make-dist, Makefile.in (install-arch-indep): Update for this change.
* Makefile.in (leimdir): New, set by configure.
(COPYDIR, COPYDESTS): Add leim directories.
(install-leim): Remove.
(install-arch-indep): Handle leim installation directly.
* vpath.sed: Remove unused file.
* make-dist: No more vpath.sed.
2012-05-21 Paul Eggert <eggert@cs.ucla.edu>
Use full name for m4/gnulib-comp.m4. (Bug#11529)
Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions,
even though the file's name in gnulib is m4/gnulib-comp.m4.
This had a problem when merging from gnulib, as the code temporarily
renamed it to the full name, causing problems when interrupted.
Now the file has its full name, with the idea that we will find
a solution for MS-DOS that does not affect the rest of Emacs.
* m4/gnulib-comp.m4: Rename from m4/gl-comp.m4.
Assume C89 or later.
* configure.in (AC_C_PROTOTYPES, AC_C_VOLATILE, AC_C_CONST)
(POINTER_TYPE, PROTOTYPES): Remove.
Make merging from gnulib a script, not a makefile action.
Putting it in a makefile has some problems with reflection, as
merging from gnulib updates 'configure', which can update the makefile.
Putting it in a standalone script breaks this loop.
* Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
(GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
Remove, moving the actions to the script admin/merge-gnulib.
2012-05-21 Glenn Morris <rgm@gnu.org>
* configure.in (LEIM_INSTALLDIR):
Rename to leimdir, treat like lispdir.
2012-05-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep, install-doc, install-info)
(uninstall): Scrap superfluous subshells.
2012-05-19 Ulrich Mueller <ulm@gentoo.org>
* Makefile.in (install-etc): Respect DESTDIR. (Bug#11518)
2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
* configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols,
getdomainname, mblen (twice), mbrlen (twice), mbsinit, ualarm,
getsockopt, setsockopt, mremap, mempcpy.
* configure.in (machine): Do not set to 'vax', since src/m/vax.h
is being removed.
(AC_CHECK_FUNCS): Remove ftime.
2012-05-19 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep): Remove unneeded subshell.
* Makefile.in (install-arch-indep): Remove unneeded chmod.
Set permissions of lisp/subdirs.el.
* Makefile.in (SUBDIR): Add leim. Update users.
* Makefile.in (lib, lib-src, lisp): Check cd return value.
* Makefile.in (leim): No need to set PARALLEL.
2012-05-18 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep, install-info, install-man):
Simplify some one-sided ifs.
* Makefile.in: Install only the relevant DOC file.
(install-arch-indep): Delete etc/DOC*.
(install-doc): No more need to delete etc/DOC.
* Makefile.in (install-arch-indep): Split into several rules.
(install-doc, innstall-info, install-man): New rules.
* configure.in (mandir): May as well include it in the NS app bundle.
* configure.in (INSTALL_ARCH_INDEP_EXTRA): New output variable.
* Makefile.in (INSTALL_ARCH_INDEP_EXTRA): New, set by configure.
(install-arch-indep): Don't install-etc for self-contained ns builds.
* configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
No longer unconditonally add /sw directories. (Bug#2280)
* Makefile.in (install-arch-dep): Depend on install-arch-indep.
(install-arch-indep): Depend on install-leim.
(install): Remove explicit install-leim dependence.
* Makefile.in (install-arch-indep):
Move last element of mkdir rule here.
(mkdir): Remove rule.
* Makefile.in (install-arch-indep): Remove unneeded chmods.
INSTALL_DATA does this for us.
* Makefile.in (install-arch-dep): Ensure bindir exists.
Drop mkdir dependency.
(install-arch-indep): Ensure docdir, infodir, mandir exist.
(install-leim): Drop mkdir dependency.
(mkdir): Remove most directories, now made in relevant rules.
* Makefile.in (install-arch-indep): Combine adjacent loops.
2012-05-17 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-etc, mkdir):
Make relevant directories in install-etc rather than mkdir.
* Makefile.in (write_subdir): Create the directory if needed.
(install-arch-dep, mkdir): No need to make site-lisp directories.
* Makefile.in (write_subdir): New.
(install-arch-indep, install-arch-dep): Use $write_subdir.
* configure.in (docdir, etcdir, infodir, lispdir):
For a self-contained ns build, set these to the appropriate values.
* Makefile.in (install-arch-dep): No need to move info/ any more.
* configure.in (ns_self_contained): New output variable.
* Makefile.in (ns_self_contained): New, set by configure.
(install-arch-dep): For a self-contained ns build,
don't bother installing binaries then immediately deleting them.
* Makefile.in (ns_appbindir, ns_appresdir):
Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec.
@ -124,7 +450,7 @@
* configure.in (dbus_validate_bus_name, dbus_validate_path)
(dbus_validate_interface, dbus_validate_member): Check also for
these library functions
these library functions.
2012-04-22 Paul Eggert <eggert@cs.ucla.edu>

15
INSTALL
View file

@ -474,8 +474,8 @@ installed locations, with `make install'. By default, Emacs's files
are installed in the following directories:
`/usr/local/bin' holds the executable programs users normally run -
`emacs', `etags', `ctags', `emacsclient',
`grep-changelog', and `rcs-checkin'.
`emacs', `etags', `ctags', `emacsclient', and
`grep-changelog'.
`/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library;
`VERSION' stands for the number of the Emacs version
@ -719,10 +719,10 @@ directory of the Emacs distribution.
in `./lib-src' to their final destinations, as selected in `./src/epaths.h'.
Strictly speaking, not all of the executables in `./lib-src' need be copied.
- The programs `hexl', `movemail', `profile', `rcs2log', and `vcdiff'
- The programs `hexl', `movemail', `profile', and `rcs2log'
are used by Emacs; they do need to be copied.
- The programs `etags', `ctags', `emacsclient', and `rcs-checkin'
are intended to be run by users; they are handled below.
- The programs `etags', `ctags', and `emacsclient' are intended to be
run by users; they are handled below.
- The programs `make-docfile' and `test-distrib' were
used in building Emacs, and are not needed any more.
@ -741,9 +741,8 @@ of installing different versions.
You can delete `./src/temacs'.
4) Copy the programs `emacsclient', `ctags', `etags', and `rcs-checkin'
from `./lib-src' to `/usr/local/bin'. These programs are intended for
users to run.
4) Copy the programs `emacsclient', `ctags', and `etags' from `./lib-src'
to `/usr/local/bin'. These programs are intended for users to run.
5) Copy the man pages in `./doc/man' into the appropriate man directory.

2
INSTALL.BZR
View file

@ -30,7 +30,7 @@ options you can set):
If you want later builds to go faster, at the expense of sometimes
doing the wrong thing if you update the build procedure, you can
invoke "./configure -C --disable-maintainer-mode" instead.
invoke "./configure -C" instead.
Some of the files that are included in the Emacs tarball, such as
byte-compiled Lisp files, are not stored in Bazaar. Therefore, to

454
Makefile.in
View file

@ -66,10 +66,8 @@ CDPATH=
# ==================== Things `configure' Might Edit ====================
MAINTAINER_MODE_FLAG = --disable-maintainer-mode
@MAINT@MAINTAINER_MODE_FLAG = --enable-maintainer-mode
cache_file = @cache_file@
CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG)
CONFIGURE_FLAGS = --cache-file=$(cache_file)
CC=@CC@
CFLAGS=@CFLAGS@
@ -94,6 +92,8 @@ configuration=@configuration@
# Later values may use these.
ns_appbindir=@ns_appbindir@
ns_appresdir=@ns_appresdir@
# Either yes or no depending on whether this is a relocatable Emacs.app.
ns_self_contained=@ns_self_contained@
# The default location for installation. Everything is placed in
# subdirectories of this directory. The default values for many of
@ -179,11 +179,12 @@ iconsrcdir=$(srcdir)/etc/images/icons
# These variables hold the values Emacs will actually use. They are
# based on the values of the standard Make variables above.
# Where to install the lisp files distributed with
# Where to install the lisp, leim files distributed with
# Emacs. This includes the Emacs version, so that the
# lisp files for different versions of Emacs will install
# themselves in separate directories.
lispdir=@lispdir@
leimdir=@leimdir@
# Directories Emacs should search for lisp files specific
# to this site (i.e. customizations), before consulting
@ -256,14 +257,8 @@ TRANSFORM = @program_transform_name@
EMACS = `echo emacs${EXEEXT} | sed '$(TRANSFORM)'`
EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
# Subdirectories to make recursively. `lisp' is not included
# because the compiled lisp files are part of the distribution.
# leim is not included because it needs special handling.
#
# Actually, we now include `lisp' as well, since the compiled files
# are not included any more in case of bootstrap or in case Emacs was
# checked out from a VCS.
SUBDIR = lib lib-src src lisp
# Subdirectories to make recursively.
SUBDIR = lib lib-src src lisp leim
# The subdir makefiles created by config.status.
SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
@ -271,14 +266,13 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
# Subdirectories to install, and where they'll go.
# lib-src's makefile knows how to install it, so we don't do that here.
# leim's makefile also knows how to install it, so we don't do that here.
# When installing the info files, we need to do special things to
# avoid nuking an existing dir file, so we don't do that here;
# instead, we have written out explicit code in the `install' targets.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir}
# Directories that cannot simply be copied, eg info,
# are treated separately.
# quail appears twice because in out-of-tree builds, it exists twice.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail
COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail
all: ${SUBDIR} leim
all: ${SUBDIR}
removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
@ -303,62 +297,19 @@ epaths-force: FRC
-e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \
${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
# For parallel make, src should be built before leim.
# "export PARALLEL=0" is for SGI's Make, to prevent it from
# running more than 1 process in the leim directory, especially for
# the $TIT files there.
leim: src Makefile FRC
cd leim && PARALLEL=0 $(MAKE) all $(MFLAGS)
lib-src src: lib
src: lib-src FRC
.RECURSIVE: ${SUBDIR} leim
.RECURSIVE: ${SUBDIR}
# We need to build `emacs' in `src' to compile the *.elc files in `lisp'.
lisp: src
# Maintainers can put a copy of gnulib into $(gnulib_srcdir).
gnulib_srcdir = ../gnulib
$(gnulib_srcdir):
git clone git://git.savannah.gnu.org/gnulib.git $@
# A shorter name that satisfies MS-DOS 8+3 constraints.
DOS_gnulib_comp.m4 = gl-comp.m4
# Update modules from gnulib, for maintainers, who should have it in
# $(gnulib_srcdir) (relative to $(srcdir) and should have build tools
# as per $(gnulib_srcdir)/DEPENDENCIES.
GNULIB_MODULES = \
alloca-opt \
careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr \
dup2 \
filemode getloadavg getopt-gnu ignore-value intprops lstat \
manywarnings mktime pthread_sigmask readlink \
socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat \
warnings
GNULIB_TOOL_FLAGS = \
--avoid=msvc-inval --avoid=msvc-nothrow \
--avoid=raise --avoid=threadlib \
--conditional-dependencies --import --no-changelog --no-vc-files \
--makefile-name=gnulib.mk
sync-from-gnulib: $(gnulib_srcdir)
-cd $(srcdir)/m4 && cp $(DOS_gnulib_comp.m4) gnulib-comp.m4
cd $(srcdir) && \
$(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES)
cd $(srcdir)/m4 && rm gnulib-cache.m4 warn-on-use.m4
cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS_gnulib_comp.m4)
cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc
cp \
$(gnulib_srcdir)/build-aux/move-if-change \
$(srcdir)/build-aux
cd $(srcdir) && autoreconf -i -I m4
.PHONY: sync-from-gnulib
# We need to build `emacs' in `src' to compile the *.elc files in `lisp'
# and `leim'.
lisp leim: src
# These targets should be "${SUBDIR} without `src'".
lib lib-src lisp: Makefile FRC
cd $@; $(MAKE) all $(MFLAGS) \
lib lib-src lisp leim: Makefile FRC
cd $@ && $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
@ -387,7 +338,7 @@ src: Makefile FRC
VCSWITNESS="$$vcswitness"
blessmail: Makefile src FRC
cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \
cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \
MAKE='${MAKE}' archlibdir='$(archlibdir)'
# We used to have one rule per */Makefile.in, but that leads to race
@ -407,16 +358,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
./configure $(CONFIGURE_FLAGS); \
fi
AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
AUTOCONF_INPUTS = $(srcdir)/configure.in $(srcdir)/aclocal.m4
$(srcdir)/configure: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoconf
ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS_gnulib_comp.m4)
ACLOCAL_INPUTS = $(srcdir)/m4/gnulib-comp.m4
$(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
cd $(srcdir) && aclocal -I m4
AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am $(srcdir)/lib/gnulib.mk
AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \
$(srcdir)/lib/gnulib.mk
$(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
cd $(srcdir) && automake --gnu -a -c lib/Makefile
am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in
@ -439,51 +391,55 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
## don't have to duplicate the list of utilities to install in
## this Makefile as well.
## On AIX, use tar xBf.
## On Xenix, use tar xpf.
.PHONY: install
.PHONY: install mkdir
## We delete each directory in ${COPYDESTS} before we copy into it;
## that way, we can reinstall over directories that have been put in
## place with their files read-only (perhaps because they are checked
## into RCS). In order to make this safe, we make sure that the
## source exists and is distinct from the destination.
### We do install-arch-indep first because
### the executable needs the Lisp files and DOC file to work properly.
install: all install-arch-indep install-arch-dep install-leim blessmail
install: all install-arch-indep install-doc install-arch-dep blessmail
@true
## Ensure that $subdir contains a subdirs.el file.
## Here and elsewhere, we set the umask so that any created files are
## world-readable.
## TODO it might be good to warn about non-standard permissions of
## pre-existing directories, but that does not seem easy.
write_subdir=if [ -f $${subdir}/subdirs.el ]; \
then true; \
else \
umask 022; \
${MKDIR_P} $${subdir}; \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
> $${subdir}/subdirs.el; \
fi
### Install the executables that were compiled specifically for this machine.
### It would be nice to do something for a parallel make
### to ensure that install-arch-indep finishes before this starts.
### (TODO Why would it be nice? Why not just make this depend on
### install-arch-indep then?)
install-arch-dep: mkdir
(cd lib-src; \
### We do install-arch-indep first because the executable needs the
### Lisp files and DOC file to work properly.
install-arch-dep: install-arch-indep install-doc
umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
cd lib-src && \
$(MAKE) install $(MFLAGS) prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL)
-chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL)
rm -f $(DESTDIR)${bindir}/$(EMACS)
-ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
if test "${ns_appresdir}" != ""; then \
( cd ${ns_appresdir} ; \
if test -d share/emacs ; then \
for dir in share/emacs/${version}/*; do \
rm -fr `basename "$$dir"`; mv "$$dir" . ; \
done ; \
fi ; \
if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \
rm -fr share ) ; \
rm -f ${ns_appbindir}/bin/emacs ${ns_appbindir}/bin/$(EMACSFULL); \
else true ; fi
INSTALL_STRIP=${INSTALL_STRIP}
if test "${ns_self_contained}" = "no"; then \
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \
rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || true ; \
else \
subdir=${ns_appresdir}/site-lisp; \
${write_subdir} || exit 1; \
rm -rf ${ns_appresdir}/share; \
fi
## FIXME NS self-contained: rather than installing emacs and
## EMACSFULL, then deleting them, obviously it would be better to not
## install them in the first place.
## In the share directory, we are deleting:
## applications (with emacs.desktop, also found in etc/)
## emacs (basically empty except for unneeded site-lisp directories)
## icons (duplicates etc/images/icons/hicolor)
## This is install-etc for everything except self-contained-ns builds.
## For them, it is empty.
INSTALL_ARCH_INDEP_EXTRA = @INSTALL_ARCH_INDEP_EXTRA@
## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
## Needs to be the user running install, so configure can't set it.
@ -493,87 +449,109 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
done
### Install the files that are machine-independent.
### Most of them come straight from the distribution;
### the exception is the DOC-* files, which are copied
### from the build directory.
### Most of them come straight from the distribution; the exception is
### the DOC file, which is copied from the build directory.
## Note that we copy DOC* and then delete DOC
## as a workaround for a bug in tar on Ultrix 4.2.
## Ultrix is no longer supported since 23.1, but the relevant line
## has another effect. We copy the entire etc/ directory from the
## source tree first. For an in-tree build, this will include
## any DOC* files there may be. So rm DOC does have an effect.
## FIXME When we copy etc we should exclude DOC*, then copy only
## the relevant one. We cannot delete DOC* from the destination directory,
## because that may include pre-existing files from another emacs.
## We delete each directory in ${COPYDESTS} before we copy into it;
## that way, we can reinstall over directories that have been put in
## place with their files read-only (perhaps because they are checked
## into RCS). In order to make this safe, we make sure that the
## source exists and is distinct from the destination.
## We delete etc/DOC* because there may be irrelevant DOC files from
## other builds in the source directory. This is ok because we just
## deleted the entire installed etc/ directory and recreated it.
## install-doc installs the relevant DOC.
## Note that the Makefiles in the etc directory are potentially useful
## in an installed Emacs, so should not be excluded.
## I'm not sure creating locallisppath here serves any useful purpose.
## If it has the default value, then the later write_subdir commands
## will ensure all these components exist.
## This will only do something if locallisppath has a non-standard value.
## Is it really Emacs's job to create those directories?
## Should we also be ensuring they contain subdirs.el files?
## It would be easy to do, just use write_subdir.
## Note that we use tar instead of plain old cp -R/-r because the latter
## is apparently not portable (even in 2012!).
## http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00278.html
## I have no idea which platforms Emacs supports where cp -R does not
## work correctly, and therefore no idea when tar can be replaced.
## See also these comments from 2004 about cp -r working fine:
## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
umask 022 ; \
$(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
-set ${COPYDESTS} ; \
unset CDPATH; \
$(set_installuser); \
for dir in ${COPYDIR} ; do \
[ -d $${dir} ] || exit 1 ; \
dest=$$1 ; shift ; \
[ -d $${dest} ] && \
[ `cd $${dest} && /bin/pwd` = `cd $${dir} && /bin/pwd` ] && \
continue ; \
if [ "$${dir}" = "leim/quail" ]; then \
[ `cd $${dir} && /bin/pwd` = `cd ${srcdir}/leim/quail && /bin/pwd` ] && \
continue ; \
else \
rm -rf $${dest} ; \
umask 022; ${MKDIR_P} $${dest} ; \
fi ; \
echo "Copying $${dir} to $${dest}..." ; \
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
tar -xvf - && cat > /dev/null) || exit 1; \
[ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
for subdir in `find $${dest} -type d -print` ; do \
rm -f $${subdir}/.gitignore ; \
rm -f $${subdir}/.arch-inventory ; \
rm -f $${subdir}/.DS_Store ; \
rm -f $${subdir}/\#* ; \
rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*~ ; \
rm -f $${subdir}/*.orig ; \
rm -f $${subdir}/ChangeLog* ; \
[ "$${dir}" != "${srcdir}/etc" ] && \
rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
done ; \
find $${dest} -exec chown $${installuser} {} ';' ;\
done
-rm -f $(DESTDIR)${leimdir}/leim-list.el
${INSTALL_DATA} leim/leim-list.el $(DESTDIR)${leimdir}/leim-list.el
-rm -f $(DESTDIR)${lispdir}/subdirs.el
umask 022; $(srcdir)/build-aux/update-subdirs $(DESTDIR)${lispdir}
subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \
${write_subdir}
subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \
${write_subdir} || true
[ -z "${GZIP_PROG}" ] || \
( echo "Compressing *.el ..." ; \
unset CDPATH; \
thisdir=`/bin/pwd`; \
for dir in $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}; do \
cd $${thisdir} ; \
cd $${dir} || exit 1 ; \
for f in `find . -name "*.elc" -print`; do \
${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \
done ; \
done )
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
# The last chmod isn't needed at present.
## We install only the relevant DOC file if possible
## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.
## (Note "otherwise" is inaccurate since 2009-08-23.)
## If people complain about the h flag in tar command, take that out.
## That flag is also used in leim/Makefile.in
## Note that the Makefiles in the etc directory are potentially useful
## in an installed Emacs, so should not be excluded.
install-arch-indep: mkdir info install-etc
-set ${COPYDESTS} ; \
unset CDPATH; \
for dir in ${COPYDIR} ; do \
if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
rm -rf $$1 ; \
fi ; \
shift ; \
done
-set ${COPYDESTS} ; \
mkdir ${COPYDESTS} ; \
chmod ugo+rx ${COPYDESTS} ; \
unset CDPATH; \
$(set_installuser); \
for dir in ${COPYDIR} ; do \
dest=$$1 ; shift ; \
[ -d $${dir} ] \
&& [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
&& (echo "Copying $${dir} to $${dest}..." ; \
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
tar -xvf - && cat > /dev/null) || exit 1; \
find $${dest} -exec chown $${installuser} {} ';' ;\
for subdir in `find $${dest} -type d -print` ; do \
chmod a+rx $${subdir} ; \
rm -f $${subdir}/.gitignore ; \
rm -f $${subdir}/.arch-inventory ; \
rm -f $${subdir}/.DS_Store ; \
rm -f $${subdir}/\#* ; \
rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*~ ; \
rm -f $${subdir}/*.orig ; \
[ "$${dir}" != "${srcdir}/etc" ] && \
rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
rm -f $${subdir}/ChangeLog* ; \
done) ; \
done
-rm -f $(DESTDIR)${lispdir}/subdirs.el
$(srcdir)/update-subdirs $(DESTDIR)${lispdir}
if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
> $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
fi
chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
> $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \
fi
-chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
## Note that install-arch-indep deletes and recreates the entire
## installed etc/ directory, so we need it to run before this does.
install-doc: install-arch-indep
-unset CDPATH; \
if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \
then \
fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \
if [ -f "./etc/DOC-$${fullversion}" ]; \
@ -584,30 +562,19 @@ install-arch-indep: mkdir info install-etc
fi; \
echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \
(cd $(DESTDIR)$(docdir); \
$(set_installuser); \
chown $${installuser} DOC*; \
if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \
else true; fi
-unset CDPATH; \
if [ -n "${GZIP_PROG}" ]; \
then \
echo "Compressing *.el ..." ; \
(cd $(DESTDIR)${lispdir}; for f in `find . -name "*.elc" -print`; do \
${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \
done) \
$(set_installuser); \
chown $${installuser} $(DESTDIR)${docdir}/$${docfile} || true ; \
else true; fi
install-info: info
umask 022; ${MKDIR_P} $(DESTDIR)${infodir}
-unset CDPATH; \
thisdir=`/bin/pwd`; \
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
then \
[ `cd ${srcdir}/info && /bin/pwd` = `cd $(DESTDIR)${infodir} && /bin/pwd` ] || \
(cd $(DESTDIR)${infodir}; \
if [ -f dir ]; then true; \
else \
[ -f dir ] || \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
chmod a+r $(DESTDIR)${infodir}/dir); \
fi; \
${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
info_misc=`cd $${thisdir}/doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \
cd ${srcdir}/info ; \
for elt in ${INFO_NONMISC} $${info_misc}; do \
@ -615,87 +582,62 @@ install-arch-indep: mkdir info install-etc
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \
chmod a+r $(DESTDIR)${infodir}/$$f; \
if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
rm -f $(DESTDIR)${infodir}/$$f.gz; \
${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
else true; fi; \
( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
rm -f $(DESTDIR)${infodir}/$$f.gz; \
${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
done; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done); \
else true; fi
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
done)
install-man:
umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \
for page in *.1; do \
(cd $${thisdir}; \
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}; \
chmod a+r $(DESTDIR)${man1dir}/$${page}; \
if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
rm -f $(DESTDIR)${man1dir}/$${page}.gz; \
${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \
else true; fi ); \
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}); \
( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
rm -f $(DESTDIR)${man1dir}/$${page}.gz; \
${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \
done
## Install those items from etc/ that need to end up elsewhere.
install-etc: mkdir
install-etc:
umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
$(DESTDIR)${desktopdir}/emacs.desktop
for icon in $(iconsrcdir)/*/*/apps/*.* \
$(iconsrcdir)/*/*/mimetypes/*.*; do \
if [ -r $${icon} ]; then \
iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \
${INSTALL_DATA} $${icon} $${iicon} ; \
fi ; \
thisdir=`/bin/pwd`; \
cd ${iconsrcdir} || exit 1; umask 022 ; \
for dir in */*/apps */*/mimetypes; do \
[ -d $${dir} ] || continue ; \
( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
for icon in $${dir}/*.*; do \
[ -r $${icon} ] || continue ; \
( cd $${thisdir}; \
${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \
|| exit 1; \
done ; \
done
### Install LEIM files. Although they are machine-independent, we
### have separate target here instead of including it in
### `install-arch-indep'. People who extracted LEIM files after they
### installed Emacs itself can install only LEIM files by this target.
install-leim: leim/Makefile mkdir
cd leim && $(MAKE) $(MFLAGS) install
### Build Emacs and install it, stripping binaries while installing them.
install-strip:
$(MAKE) $(MFLAGS) INSTALL_STRIP=-s install
### Build all the directories we're going to install Emacs in.
### We set the umask so that any created directories are world-readable.
### FIXME it would be good to warn about non-standard permissions of
### pre-existing directories, but that does not seem easy.
mkdir: FRC
icondirs= ; \
for dir in $(iconsrcdir)/*/*/apps $(iconsrcdir)/*/*/mimetypes; do \
if [ -d $${dir} ]; then \
icondirs="$${icondirs} $${dir}" ; \
fi ; \
done ; \
icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
umask 022 ; \
$(MKDIR_P) $(DESTDIR)${datadir} ${COPYDESTS} \
$(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
$(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
$(DESTDIR)${datadir}/emacs/site-lisp \
$(DESTDIR)${datadir}/emacs/${version}/site-lisp \
$(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \
$(DESTDIR)${desktopdir} $${icondirs}
### Delete all the installed files that the `install' target would
### create (but not the noninstalled files such as `make all' would create).
###
### Don't delete the lisp and etc directories if they're in the source tree.
uninstall:
(cd lib-src; \
cd lib-src && \
$(MAKE) $(MFLAGS) uninstall \
prefix=${prefix} exec_prefix=${exec_prefix} \
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir})
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
-unset CDPATH; \
for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \
if [ -d $${dir} ]; then \
case `(cd $${dir} ; /bin/pwd)` in \
`(cd ${srcdir} ; /bin/pwd)`* ) ;; \
case `cd $${dir} ; /bin/pwd` in \
`cd ${srcdir} ; /bin/pwd`* ) ;; \
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
@ -842,7 +784,7 @@ maintainer-clean: bootstrap-clean FRC
### the coding standards seem to come from. It's like distclean, but
### it deletes backup and autosave files too.
extraclean:
for i in ${SUBDIR} leim; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done
for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done
${top_maintainer_clean}
-rm -f config-tmp-*
-rm -f *~ \#*

17
admin/CPP-DEFINES
View file

@ -46,7 +46,7 @@ HAVE_PROCFS The /proc filesystem is supported.
REL_ALLOC Compile in the relocatable memory allocator ralloc.c.
SYSTEM_MALLOC Use the system library's malloc.
subprocesses System can use subprocesses (for M-x shell for example). Defined by default, only MSDOS undefines it.
USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type instead of the default int.
DEBUG_LISP_OBJECT_TYPE Define it in lisp.h enable compile time checks on Lisp_Object use.
** System specific macros, described in detail in src/s/template.h
CLASH_DETECTION
@ -63,16 +63,11 @@ USER_FULL_NAME If defined, overrides the default pw->pw_gecos for getting at t
** Replace, the definition is trivial: SWITCH_ENUM_CAST
** 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.
** 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.
AIX
AMPERSAND_FULL_NAME
BITS_PER_EMACS_INT
BITS_PER_LONG
BITS_PER_CHAR
BITS_PER_SHORT
BITS_PER_INT
BROKEN_DATAGRAM_SOCKETS
BROKEN_FIONREAD
BROKEN_GET_CURRENT_DIR_NAME
@ -84,7 +79,6 @@ BROKEN_SIGIO
BROKEN_SIGPOLL
BROKEN_SIGPTY
BSD4_2
BSD4_3
BSD_SYSTEM
CLASH_DETECTION
DATA_SEG_BITS
@ -120,9 +114,7 @@ HAVE_FMOD
HAVE_FPATHCONF
HAVE_FREXP
HAVE_FSYNC
HAVE_FTIME
HAVE_GETCWD
HAVE_GETDOMAINNAME
HAVE_GETHOSTNAME
HAVE_GETLOADAVG
HAVE_GETPAGESIZE
@ -163,8 +155,6 @@ HAVE_STRERROR
HAVE_STRFTIME
HAVE_STRING_H
HAVE_STRUCT_UTIMBUF
HAVE_SYSINFO
HAVE_SYSV_SIGPAUSE
HAVE_SYS_SELECT_H
HAVE_SYS_SYSTEMINFO_H
HAVE_SYS_TIMEB_H
@ -203,7 +193,6 @@ NO_MATHERR
NO_TERMIO
NSIG
NSIG_MINIMUM
NULL
NULL_DEVICE
ORDINARY_LINK
O_APPEND
@ -248,7 +237,6 @@ USE_CRT_DLL
USE_TOOLKIT_SCROLL_BARS
USG
USG5
USG5_4
USG_SUBTTY_WORKS
VALBITS
WRETCODE
@ -274,7 +262,6 @@ chdir
chmod
chown
close
const
creat
ctime
dup

51
admin/ChangeLog
View file

@ -1,3 +1,54 @@
2012-06-13 Andreas Schwab <schwab@linux-m68k.org>
* make-emacs: Rename --union-type to --check-lisp-type. Define
CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
* CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Renamed from
USE_LISP_UNION_TYPE.
2012-06-03 Glenn Morris <rgm@gnu.org>
* quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin.
2012-06-01 Paul Eggert <eggert@cs.ucla.edu>
Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
* make-tarball.txt: Don't worry about maintainer mode.
2012-05-28 Paul Eggert <eggert@cs.ucla.edu>
* CPP-DEFINES: Remove HAVE_SYSINFO.
2012-05-27 Paul Eggert <eggert@cs.ucla.edu>
Assume gnulib does largefile.
* merge-gnulib (GNULIB_MODULES): Add largefile.
2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
Remove src/m/*.
* CPP-DEFINES: Do not mention src/m/*.h.
(BITS_PER_EMACS_INT, BITS_PER_LONG, BITS_PER_CHAR)
(BITS_PER_SHORT, BITS_PER_INT): Remove.
* MAINTAINERS: Remove src/m/.
2012-05-21 Paul Eggert <eggert@cs.ucla.edu>
Use full name for m4/gnulib-comp.m4. (Bug#11529)
* merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
Assume C89 or later.
* CPP-DEFINES: Remove NULL, const.
Make merging from gnulib a script, not a makefile action.
* merge-gnulib: New script, with actions moved here from
../Makefile.in.
2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
* CPP-DEFINES (HAVE_GETDOMAINNAME): Remove.
* CPP-DEFINES (HAVE_FTIME): Remove.
2012-05-02 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".

2
admin/MAINTAINERS
View file

@ -171,7 +171,6 @@ src/insdel.c
src/image.c
src/lastfile.c
src/lread.c
src/m/
src/macros.c
src/makefile.w32-in
src/marker.c
@ -220,4 +219,3 @@ src/xmenu.c
src/xrdb.c
src/xselect.c
src/xterm.c

52
admin/admin.el
View file

@ -240,7 +240,7 @@ Root must be the root of an Emacs source tree."
(manual-txt texi (expand-file-name "emacs.txt" txt-dir))
(manual-pdf texi (expand-file-name "emacs.pdf" dest))
(manual-dvi texi (expand-file-name "emacs.dvi" dvi-dir)
(expand-file-name "emacs.ps" ps-dir)))
(expand-file-name "emacs.ps" ps-dir)))
;; Lisp manual
(let ((texi (expand-file-name "doc/lispref/elisp.texi" root)))
(manual-html-node texi (expand-file-name "elisp" html-node-dir))
@ -248,7 +248,20 @@ Root must be the root of an Emacs source tree."
(manual-txt texi (expand-file-name "elisp.txt" txt-dir))
(manual-pdf texi (expand-file-name "elisp.pdf" dest))
(manual-dvi texi (expand-file-name "elisp.dvi" dvi-dir)
(expand-file-name "elisp.ps" ps-dir)))
(expand-file-name "elisp.ps" ps-dir)))
;; Misc manuals
(let ((manuals '("ada-mode" "auth" "autotype" "calc" "cc-mode"
"cl" "dbus" "dired-x" "ebrowse" "ede" "ediff"
"edt" "eieio" "emacs-mime" "epa" "erc" "ert"
"eshell" "eudc" "faq" "flymake" "forms"
"gnus" "emacs-gnutls" "idlwave" "info"
"mairix-el" "message" "mh-e" "newsticker"
"nxml-mode" "org" "pcl-cvs" "pgg" "rcirc"
"remember" "reftex" "sasl" "sc" "semantic"
"ses" "sieve" "smtpmail" "speedbar" "tramp"
"url" "vip" "viper" "widget" "woman")))
(dolist (manual manuals)
(manual-misc-html manual root html-node-dir html-mono-dir)))
(message "Manuals created in %s" dest)))
(defconst manual-doctype-string
@ -265,6 +278,12 @@ Root must be the root of an Emacs source tree."
(defconst manual-style-string "<style type=\"text/css\">
@import url('/style.css');\n</style>\n")
(defun manual-misc-html (name root html-node-dir html-mono-dir)
(let ((texi (expand-file-name (format "doc/misc/%s.texi" name) root)))
(manual-html-node texi (expand-file-name name html-node-dir))
(manual-html-mono texi (expand-file-name (concat name ".html")
html-mono-dir))))
(defun manual-html-mono (texi-file dest)
"Run Makeinfo on TEXI-FILE, emitting mono HTML output to DEST.
This function also edits the HTML files so that they validate as
@ -307,13 +326,15 @@ the @import directive."
(let (copyright-text)
(manual-html-fix-index-1)
;; Move copyright notice to the end.
(re-search-forward "[ \t]*<p>Copyright &copy;")
(setq opoint (match-beginning 0))
(re-search-forward "</blockquote>")
(setq copyright-text (buffer-substring opoint (point)))
(delete-region opoint (point))
(when (re-search-forward "[ \t]*<p>Copyright &copy;" nil t)
(setq opoint (match-beginning 0))
(re-search-forward "</blockquote>")
(setq copyright-text (buffer-substring opoint (point)))
(delete-region opoint (point)))
(manual-html-fix-index-2)
(insert copyright-text "\n</div>\n"))
(if copyright-text
(insert copyright-text))
(insert "\n</div>\n"))
;; For normal nodes, give the header div a blue bg.
(manual-html-fix-node-div))
(save-buffer))))))
@ -369,9 +390,9 @@ Also generate PostScript output in PS-DEST."
(defun manual-html-fix-index-1 ()
(let (opoint)
(re-search-forward "<body>\n\\(<h1 class=\"settitle\\)")
(setq opoint (match-beginning 1))
(search-forward "<h2 class=\"unnumbered")
(re-search-forward "<body>\n")
(setq opoint (match-end 0))
(search-forward "<h2 class=\"")
(goto-char (match-beginning 0))
(delete-region opoint (point))
(insert "<div id=\"content\" class=\"inner\">\n\n")))
@ -380,7 +401,8 @@ Also generate PostScript output in PS-DEST."
"Replace the index list in the current buffer with a HTML table."
(let (done open-td tag desc)
;; Convert the list that Makeinfo made into a table.
(search-forward "<ul class=\"menu\">")
(or (search-forward "<ul class=\"menu\">" nil t)
(search-forward "<ul>"))
(replace-match "<table style=\"float:left\" width=\"100%\">")
(forward-line 1)
(while (not done)
@ -413,7 +435,7 @@ Also generate PostScript output in PS-DEST."
(replace-match " </td></tr></table>\n
<h3>Detailed Node Listing</h3>\n\n" t t)
(search-forward "<p>")
(search-forward "<p>")
(search-forward "<p>" nil t)
(goto-char (match-beginning 0))
(skip-chars-backward "\n ")
(setq open-td nil)
@ -427,8 +449,8 @@ Also generate PostScript output in PS-DEST."
(setq open-td nil))
(insert " <tr>
<th colspan=\"2\" align=\"left\" style=\"text-align:left\">")
(re-search-forward "</p>[ \t\n]*<ul class=\"menu\">")
(replace-match " </th></tr>"))
(if (re-search-forward "</p>[ \t\n]*<ul class=\"menu\">" nil t)
(replace-match " </th></tr>")))
((looking-at "[ \t]*</ul>[ \t]*$")
(replace-match
(if open-td

6
admin/make-emacs
View file

@ -42,7 +42,7 @@
"check-marked" => \$check_marked,
"all" => \$all,
"no-optim" => \$no_optim,
"union-type" => \$union_type,
"check-lisp-type" => \$check_lisp_type,
"gprof" => \$profile,
"malloc-check" => \$malloc_check,
"no-mcheck" => \$no_mcheck,
@ -70,7 +70,7 @@
--check-marked GC_CHECK_MARKED_OBJECTS=1
--optim no debug defines
--gprof make Emacs for profiling
--union-type define USE_LISP_UNION_TYPE (bad for GDB)
--check-lisp-type define CHECK_LISP_OBJECT_TYPE
--malloc-check define GC_MALLOC_CHECK
--no-mcheck don't define GC_MCHECK
--wall compile with -Wall
@ -140,7 +140,7 @@
}
}
$defs = "$defs -DUSE_LISP_UNION_TYPE" if $union_type;
$defs = "$defs -DCHECK_LISP_OBJECT_TYPE" if $check_lisp_type;
$defs = "$defs -DGC_MALLOC_CHECK=1 -DGC_PROTECT_MALLOC_STATE=1" if $malloc_check;
$defs = "$defs -DGC_MCHECK=1" unless $no_mcheck;

8
admin/make-tarball.txt
View file

@ -28,13 +28,7 @@ For each step, check for possible errors.
refer to a newer release of Emacs. (This is probably needed only
when preparing a major Emacs release, or branching for it.)
5. Edit configure.in so that maintainer-mode is off by default.
(FIXME - need to find a better way of dealing with this.
Or maybe it's fine and indeed correct to leave it on?
See http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00859.html
and subsequent.)
autoreconf -i -I m4 --force
5. autoreconf -i -I m4 --force
make bootstrap
6. Commit etc/AUTHORS, all the files changed by M-x set-version, and

86
admin/merge-gnulib Executable file
View file

@ -0,0 +1,86 @@
#! /bin/sh
# Merge gnulib sources into Emacs sources.
# Typical usage:
#
# admin/merge-gnulib
# Copyright 2012 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# GNU Emacs is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
# written by Paul Eggert
GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
GNULIB_MODULES='
alloca-opt
careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
dtoastr dup2
filemode getloadavg getopt-gnu ignore-value intprops largefile lstat
manywarnings mktime pthread_sigmask readlink
socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
warnings
'
GNULIB_TOOL_FLAGS='
--avoid=msvc-inval --avoid=msvc-nothrow
--avoid=raise --avoid=threadlib
--conditional-dependencies --import --no-changelog --no-vc-files
--makefile-name=gnulib.mk
'
# The source directory, with a trailing '/'.
# If empty, the source directory is the working directory.
src=$2
case $src in
*/ | '') ;;
*) src=$src/ ;;
esac
# Gnulib's source directory.
gnulib_srcdir=${1-$src../gnulib}
case $gnulib_srcdir in
-*) src=- ;;
esac
case $src in
-*)
echo >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
SRCDIR is the Emacs source directory (default: working directory).
GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
exit 1 ;;
esac
test -x "$src"autogen.sh || {
echo >&2 "$0: '${src:-.}' is not an Emacs source directory."
exit 1
}
test -d "$gnulib_srcdir" ||
git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
exit
test -x "$gnulib_srcdir"/gnulib-tool || {
echo >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
exit 1
}
"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
rm -- "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 &&
cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
autoreconf -i -I m4 -- ${src:+"$src"}

4
admin/quick-install-emacs
View file

@ -1,7 +1,7 @@
#!/bin/sh
### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
## Copyright (C) 2001-2012 Free Software Foundation, Inc.
## Copyright (C) 2001-2012 Free Software Foundation, Inc.
## Author: Miles Bader <miles@gnu.org>
@ -28,7 +28,7 @@
PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse'
PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'
PUBLIC_LIBSRC_SCRIPTS='grep-changelog'
AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"

129
autogen/Makefile.in
View file

@ -15,7 +15,7 @@
@SET_MAKE@
# Copyright (C) 2002-2011 Free Software Foundation, Inc.
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -36,7 +36,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat manywarnings mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat warnings
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops largefile lstat manywarnings mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat warnings
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@ -66,27 +66,28 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/c-strtod.m4 \
$(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/extensions.m4 \
$(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/getloadavg.m4 \
$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gl-comp.m4 \
$(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 \
$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/longlong.m4 \
$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/manywarnings.m4 \
$(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/mktime.m4 \
$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nocrash.m4 \
$(top_srcdir)/m4/pathmax.m4 \
$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/pathmax.m4 \
$(top_srcdir)/m4/pthread_sigmask.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/sha1.m4 \
$(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \
$(top_srcdir)/m4/signal_h.m4 \
$(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/socklen.m4 \
$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/st_dm_mode.m4 \
$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \
$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strftime.m4 \
$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtoll.m4 \
$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
$(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_stat_h.m4 \
$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \
$(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \
$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/strtoimax.m4 \
$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \
$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \
$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_types_h.m4 \
$(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \
$(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_t.m4 \
@ -230,13 +231,14 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
GNULIB_GETS = @GNULIB_GETS@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
GNULIB_GRANTPT = @GNULIB_GRANTPT@
GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
GNULIB_IMAXABS = @GNULIB_IMAXABS@
GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
GNULIB_ISATTY = @GNULIB_ISATTY@
GNULIB_LCHMOD = @GNULIB_LCHMOD@
GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
@ -264,17 +266,20 @@ GNULIB_PERROR = @GNULIB_PERROR@
GNULIB_PIPE = @GNULIB_PIPE@
GNULIB_PIPE2 = @GNULIB_PIPE2@
GNULIB_POPEN = @GNULIB_POPEN@
GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@
GNULIB_PREAD = @GNULIB_PREAD@
GNULIB_PRINTF = @GNULIB_PRINTF@
GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@
GNULIB_PTSNAME = @GNULIB_PTSNAME@
GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@
GNULIB_PUTC = @GNULIB_PUTC@
GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
GNULIB_PUTENV = @GNULIB_PUTENV@
GNULIB_PUTS = @GNULIB_PUTS@
GNULIB_PWRITE = @GNULIB_PWRITE@
GNULIB_RAISE = @GNULIB_RAISE@
GNULIB_RANDOM = @GNULIB_RANDOM@
GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
GNULIB_READ = @GNULIB_READ@
GNULIB_READLINK = @GNULIB_READLINK@
@ -288,6 +293,7 @@ GNULIB_RMDIR = @GNULIB_RMDIR@
GNULIB_RPMATCH = @GNULIB_RPMATCH@
GNULIB_SCANF = @GNULIB_SCANF@
GNULIB_SETENV = @GNULIB_SETENV@
GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
GNULIB_SIGACTION = @GNULIB_SIGACTION@
GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
@ -310,7 +316,6 @@ GNULIB_TIMEGM = @GNULIB_TIMEGM@
GNULIB_TIME_R = @GNULIB_TIME_R@
GNULIB_TMPFILE = @GNULIB_TMPFILE@
GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
GNULIB_UNLINK = @GNULIB_UNLINK@
@ -364,6 +369,7 @@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
@ -418,12 +424,15 @@ HAVE_PCLOSE = @HAVE_PCLOSE@
HAVE_PIPE = @HAVE_PIPE@
HAVE_PIPE2 = @HAVE_PIPE2@
HAVE_POPEN = @HAVE_POPEN@
HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
HAVE_PREAD = @HAVE_PREAD@
HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
HAVE_PTSNAME = @HAVE_PTSNAME@
HAVE_PTSNAME_R = @HAVE_PTSNAME_R@
HAVE_PWRITE = @HAVE_PWRITE@
HAVE_RAISE = @HAVE_RAISE@
HAVE_RANDOM = @HAVE_RANDOM@
HAVE_RANDOM_H = @HAVE_RANDOM_H@
HAVE_RANDOM_R = @HAVE_RANDOM_R@
HAVE_READLINK = @HAVE_READLINK@
@ -432,6 +441,7 @@ HAVE_REALPATH = @HAVE_REALPATH@
HAVE_RENAMEAT = @HAVE_RENAMEAT@
HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
HAVE_SIGACTION = @HAVE_SIGACTION@
HAVE_SIGHANDLER_T = @HAVE_SIGHANDLER_T@
HAVE_SIGINFO_T = @HAVE_SIGINFO_T@
@ -476,6 +486,7 @@ INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INFO_EXT = @INFO_EXT@
INFO_OPTS = @INFO_OPTS@
INSTALL = @INSTALL@
INSTALL_ARCH_INDEP_EXTRA = @INSTALL_ARCH_INDEP_EXTRA@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_INFO = @INSTALL_INFO@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -491,7 +502,6 @@ LD_SWITCH_SYSTEM = @LD_SWITCH_SYSTEM@
LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@
LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@
LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@
LEIM_INSTALLDIR = @LEIM_INSTALLDIR@
LIBGIF = @LIBGIF@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
@ -531,11 +541,9 @@ LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@
M17N_FLT_LIBS = @M17N_FLT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDEPDIR = @MKDEPDIR@
MKDIR_P = @MKDIR_P@
M_FILE = @M_FILE@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
@ -545,6 +553,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@
NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@
NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
@ -556,6 +565,7 @@ NEXT_STDINT_H = @NEXT_STDINT_H@
NEXT_STDIO_H = @NEXT_STDIO_H@
NEXT_STDLIB_H = @NEXT_STDLIB_H@
NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@
NEXT_TIME_H = @NEXT_TIME_H@
NEXT_UNISTD_H = @NEXT_UNISTD_H@
NS_OBJ = @NS_OBJ@
@ -573,6 +583,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PAXCTL = @PAXCTL@
PKG_CONFIG = @PKG_CONFIG@
POST_ALLOC_OBJ = @POST_ALLOC_OBJ@
PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
@ -606,6 +617,7 @@ REPLACE_FSTAT = @REPLACE_FSTAT@
REPLACE_FSTATAT = @REPLACE_FSTATAT@
REPLACE_FTELL = @REPLACE_FTELL@
REPLACE_FTELLO = @REPLACE_FTELLO@
REPLACE_FTRUNCATE = @REPLACE_FTRUNCATE@
REPLACE_FUTIMENS = @REPLACE_FUTIMENS@
REPLACE_GETCWD = @REPLACE_GETCWD@
REPLACE_GETDELIM = @REPLACE_GETDELIM@
@ -614,6 +626,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_LCHOWN = @REPLACE_LCHOWN@
REPLACE_LINK = @REPLACE_LINK@
REPLACE_LINKAT = @REPLACE_LINKAT@
@ -635,9 +648,11 @@ REPLACE_POPEN = @REPLACE_POPEN@
REPLACE_PREAD = @REPLACE_PREAD@
REPLACE_PRINTF = @REPLACE_PRINTF@
REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_RAISE = @REPLACE_RAISE@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
REPLACE_REALLOC = @REPLACE_REALLOC@
@ -654,6 +669,7 @@ REPLACE_STAT = @REPLACE_STAT@
REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_TIMEGM = @REPLACE_TIMEGM@
REPLACE_TMPFILE = @REPLACE_TMPFILE@
@ -680,6 +696,7 @@ SHELL = @SHELL@
SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
START_FILES = @START_FILES@
STDALIGN_H = @STDALIGN_H@
STDARG_H = @STDARG_H@
STDBOOL_H = @STDBOOL_H@
STDDEF_H = @STDDEF_H@
@ -703,6 +720,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
WERROR_CFLAGS = @WERROR_CFLAGS@
WIDGET_OBJ = @WIDGET_OBJ@
WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
WINT_T_SUFFIX = @WINT_T_SUFFIX@
XFT_CFLAGS = @XFT_CFLAGS@
XFT_LIBS = @XFT_LIBS@
@ -754,6 +773,7 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
leimdir = @leimdir@
libdir = @libdir@
libexecdir = @libexecdir@
liblockfile = @liblockfile@
@ -768,6 +788,7 @@ ns_appbindir = @ns_appbindir@
ns_appdir = @ns_appdir@
ns_appresdir = @ns_appresdir@
ns_appsrc = @ns_appsrc@
ns_self_contained = @ns_self_contained@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@ -794,9 +815,9 @@ x_default_search_path = @x_default_search_path@
# present in all Makefile.am that need it. This is ensured by the applicability
# 'all' defined above.
BUILT_SOURCES = $(ALLOCA_H) $(GETOPT_H) inttypes.h signal.h \
arg-nonnull.h c++defs.h warn-on-use.h $(STDARG_H) $(STDBOOL_H) \
$(STDDEF_H) $(STDINT_H) stdio.h stdlib.h sys/stat.h time.h \
unistd.h
arg-nonnull.h c++defs.h warn-on-use.h $(STDALIGN_H) \
$(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \
stdlib.h sys/stat.h sys/types.h time.h unistd.h
EXTRA_DIST = alloca.in.h allocator.h careadlinkat.h md5.h sha1.h \
sha256.h sha512.h dosname.h ftoastr.c ftoastr.h dup2.c \
filemode.h getloadavg.c getopt.c getopt.in.h getopt1.c \
@ -807,18 +828,20 @@ EXTRA_DIST = alloca.in.h allocator.h careadlinkat.h md5.h sha1.h \
$(top_srcdir)/build-aux/snippet/arg-nonnull.h \
$(top_srcdir)/build-aux/snippet/c++defs.h \
$(top_srcdir)/build-aux/snippet/warn-on-use.h stat.c \
stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h stdio.in.h \
stdlib.in.h strftime.h strtoimax.c strtol.c strtoll.c strtol.c \
strtoul.c strtoull.c strtoimax.c strtoumax.c symlink.c \
sys_stat.in.h time.in.h time_r.c u64.h unistd.in.h verify.h
stdalign.in.h stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h \
stdio.in.h stdlib.in.h strftime.h strtoimax.c strtol.c \
strtoll.c strtol.c strtoul.c strtoull.c strtoimax.c \
strtoumax.c symlink.c sys_stat.in.h sys_types.in.h time.in.h \
time_r.c u64.h unistd.in.h verify.h
MOSTLYCLEANDIRS = sys
MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t getopt.h \
getopt.h-t inttypes.h inttypes.h-t signal.h signal.h-t \
arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \
warn-on-use.h warn-on-use.h-t stdarg.h stdarg.h-t stdbool.h \
stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \
stdio.h-t stdlib.h stdlib.h-t sys/stat.h sys/stat.h-t time.h \
time.h-t unistd.h unistd.h-t
warn-on-use.h warn-on-use.h-t stdalign.h stdalign.h-t stdarg.h \
stdarg.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h \
stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t sys/stat.h \
sys/stat.h-t sys/types.h sys/types.h-t time.h time.h-t \
unistd.h unistd.h-t
noinst_LIBRARIES = libgnu.a
AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src
@ -1161,7 +1184,7 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
# We need the following in order to create <inttypes.h> when the system
# doesn't have one that works with the given compiler.
inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
@ -1182,10 +1205,12 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_N
-e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
-e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
-e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
-e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
-e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
-e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
-e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
-e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
< $(srcdir)/inttypes.in.h; \
@ -1251,6 +1276,17 @@ warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
> $@-t && \
mv $@-t $@
# We need the following in order to create <stdalign.h> when the system
# doesn't have one that works.
@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status
@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \
@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \
@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@
@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status
@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@
# We need the following in order to create <stdarg.h> when the system
# doesn't have one that works with the given compiler.
@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status
@ -1368,7 +1404,6 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
-e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
-e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
-e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
-e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \
-e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
-e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
-e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
@ -1479,8 +1514,11 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \
-e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \
-e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \
-e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \
-e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \
-e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \
-e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \
-e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \
-e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \
-e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
@ -1505,7 +1543,10 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
-e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
-e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
-e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \
-e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
-e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
-e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
-e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
-e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
-e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
@ -1523,7 +1564,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
-e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
-e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
-e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
-e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
-e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
@ -1548,6 +1591,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
-e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \
-e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
-e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
-e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
@ -1588,6 +1632,22 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
} > $@-t && \
mv $@-t $@
# We need the following in order to create <sys/types.h> when the system
# doesn't have one that works with the given compiler.
sys/types.h: sys_types.in.h $(top_builddir)/config.status
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
< $(srcdir)/sys_types.in.h; \
} > $@-t && \
mv $@-t $@
# We need the following in order to create <time.h> when the system
# doesn't have one that works with the given compiler.
time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
@ -1632,6 +1692,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
-e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
-e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
@ -1656,6 +1717,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
-e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
-e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
-e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
-e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
-e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
-e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
@ -1668,11 +1730,12 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
-e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
-e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
-e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
-e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
-e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
-e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
-e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \
-e 's/@''GNULIB_UNISTD_H_GETOPT''@/$(GNULIB_UNISTD_H_GETOPT)/g' \
-e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \
-e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \
-e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \
-e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \
@ -1705,6 +1768,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
-e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
-e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
-e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
-e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
-e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
-e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
@ -1717,6 +1781,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
-e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
-e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
-e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
-e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
-e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
-e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
@ -1726,11 +1791,13 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
-e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
-e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
-e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
-e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
-e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
-e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
-e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
-e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
-e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
-e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
-e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
-e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \

5
autogen/aclocal.m4 vendored
View file

@ -992,8 +992,8 @@ m4_include([m4/extensions.m4])
m4_include([m4/filemode.m4])
m4_include([m4/getloadavg.m4])
m4_include([m4/getopt.m4])
m4_include([m4/gl-comp.m4])
m4_include([m4/gnulib-common.m4])
m4_include([m4/gnulib-comp.m4])
m4_include([m4/include_next.m4])
m4_include([m4/inttypes.m4])
m4_include([m4/largefile.m4])
@ -1004,6 +1004,7 @@ m4_include([m4/md5.m4])
m4_include([m4/mktime.m4])
m4_include([m4/multiarch.m4])
m4_include([m4/nocrash.m4])
m4_include([m4/off_t.m4])
m4_include([m4/pathmax.m4])
m4_include([m4/pthread_sigmask.m4])
m4_include([m4/readlink.m4])
@ -1016,6 +1017,7 @@ m4_include([m4/socklen.m4])
m4_include([m4/ssize_t.m4])
m4_include([m4/st_dm_mode.m4])
m4_include([m4/stat.m4])
m4_include([m4/stdalign.m4])
m4_include([m4/stdarg.m4])
m4_include([m4/stdbool.m4])
m4_include([m4/stddef_h.m4])
@ -1029,6 +1031,7 @@ m4_include([m4/strtoull.m4])
m4_include([m4/strtoumax.m4])
m4_include([m4/symlink.m4])
m4_include([m4/sys_stat_h.m4])
m4_include([m4/sys_types_h.m4])
m4_include([m4/time_h.m4])
m4_include([m4/time_r.m4])
m4_include([m4/tm_gmtoff.m4])

173
autogen/config.in
View file

@ -46,15 +46,24 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to the number of bits in type 'wint_t'. */
#undef BITSIZEOF_WINT_T
/* Define if SA_RESTART should not be used. */
#undef BROKEN_SA_RESTART
/* Define if SIGIO should not be used. */
#undef BROKEN_SIGIO
/* Define if Emacs cannot be dumped on your system. */
#undef CANNOT_DUMP
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
/* Define this to enable compile time checks for the Lisp_Object data type. */
#undef CHECK_LISP_OBJECT_TYPE
/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
systems. This function is required for 'alloca.c' support on those systems.
*/
#undef CRAY_STACKSEG_END
/* Define to 1 if using `alloca.c'. */
/* Define to 1 if using 'alloca.c'. */
#undef C_ALLOCA
/* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
@ -92,9 +101,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if gettimeofday accepts only one argument. */
#undef GETTIMEOFDAY_ONE_ARGUMENT
/* Define to make the limit macros in <stdint.h> visible. */
#undef GL_TRIGGER_STDC_LIMIT_MACROS
/* enable some gnulib portability checks */
#undef GNULIB_PORTCHECK
@ -148,6 +154,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using D-Bus. */
#undef HAVE_DBUS
/* Define to 1 if you have the `dbus_type_is_valid' function. */
#undef HAVE_DBUS_TYPE_IS_VALID
/* Define to 1 if you have the `dbus_validate_bus_name' function. */
#undef HAVE_DBUS_VALIDATE_BUS_NAME
@ -254,9 +263,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `fsync' function. */
#undef HAVE_FSYNC
/* Define to 1 if you have the `ftime' function. */
#undef HAVE_FTIME
/* Define to 1 if you have the `gai_strerror' function. */
#undef HAVE_GAI_STRERROR
@ -272,9 +278,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `getdelim' function. */
#undef HAVE_GETDELIM
/* Define to 1 if you have the `getdomainname' function. */
#undef HAVE_GETDOMAINNAME
/* Define to 1 if you have the `getgrent' function. */
#undef HAVE_GETGRENT
@ -314,9 +317,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `getsockname' function. */
#undef HAVE_GETSOCKNAME
/* Define to 1 if you have the `getsockopt' function. */
#undef HAVE_GETSOCKOPT
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
@ -504,9 +504,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <linux/version.h> header file. */
#undef HAVE_LINUX_VERSION_H
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
@ -516,7 +513,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you support file names longer than 14 characters. */
#undef HAVE_LONG_FILE_NAMES
/* Define to 1 if the system has the type `long long int'. */
/* Define to 1 if the system has the type 'long long int'. */
#undef HAVE_LONG_LONG_INT
/* Define to 1 if you have the `lrand48' function. */
@ -537,30 +534,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `MagickExportImagePixels' function. */
#undef HAVE_MAGICKEXPORTIMAGEPIXELS
/* Define to 1 if you have the `MagickMergeImageLayers' function. */
#undef HAVE_MAGICKMERGEIMAGELAYERS
/* Define to 1 if you have the <maillock.h> header file. */
#undef HAVE_MAILLOCK_H
/* Define to 1 if you have the <malloc/malloc.h> header file. */
#undef HAVE_MALLOC_MALLOC_H
/* Define to 1 if you have the `mblen' function. */
#undef HAVE_MBLEN
/* Define to 1 if you have the `mbrlen' function. */
#undef HAVE_MBRLEN
/* Define to 1 if you have the `mbsinit' function. */
#undef HAVE_MBSINIT
/* Define to 1 if <wchar.h> declares mbstate_t. */
#undef HAVE_MBSTATE_T
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `mempcpy' function. */
#undef HAVE_MEMPCPY
/* Define to 1 if you have mouse menus. (This is automatic if you use X, but
the option to specify it remains.) It is also defined with other window
systems that support xmenu.c. */
@ -578,9 +566,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if you have mouse support. */
#undef HAVE_MOUSE
/* Define to 1 if you have the `mremap' function. */
#undef HAVE_MREMAP
/* Define to 1 if you have the <net/if_dl.h> header file. */
#undef HAVE_NET_IF_DL_H
@ -609,6 +594,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `posix_memalign' function. */
#undef HAVE_POSIX_MEMALIGN
/* Define if you have the /proc filesystem. */
#undef HAVE_PROCFS
/* Define to 1 if you have the `pstat_getdynamic' function. */
#undef HAVE_PSTAT_GETDYNAMIC
@ -675,9 +663,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `setsid' function. */
#undef HAVE_SETSID
/* Define to 1 if you have the `setsockopt' function. */
#undef HAVE_SETSOCKOPT
/* Define to 1 if you have the `shutdown' function. */
#undef HAVE_SHUTDOWN
@ -774,9 +759,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `sync' function. */
#undef HAVE_SYNC
/* Define to 1 if you have the `sysinfo' function. */
#undef HAVE_SYSINFO
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
@ -786,9 +768,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <sys/loadavg.h> header file. */
#undef HAVE_SYS_LOADAVG_H
/* Define to 1 if you have the <sys/mman.h> header file. */
#undef HAVE_SYS_MMAN_H
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
@ -828,9 +807,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H
/* Define to 1 if you have the <sys/_mbstate_t.h> header file. */
#undef HAVE_SYS__MBSTATE_T_H
/* Define to 1 if you have the <term.h> header file. */
#undef HAVE_TERM_H
@ -857,13 +833,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `tzset' function. */
#undef HAVE_TZSET
/* Define to 1 if you have the `ualarm' function. */
#undef HAVE_UALARM
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if the system has the type `unsigned long long int'. */
/* Define to 1 if the system has the type 'unsigned long long int'. */
#undef HAVE_UNSIGNED_LONG_LONG_INT
/* Define to 1 if you have the <util.h> header file. */
@ -939,9 +912,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `XScreenResourceString' function. */
#undef HAVE_XSCREENRESOURCESTRING
/* Define to 1 if you have the `XSetWMProtocols' function. */
#undef HAVE_XSETWMPROTOCOLS
/* Define if you have usable i18n support. */
#undef HAVE_X_I18N
@ -975,7 +945,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if localtime caches TZ. */
#undef LOCALTIME_CACHE
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing
slash. */
#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
@ -1003,6 +973,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
/* Define if termio.h should not be included. */
#undef NO_TERMIO
/* Define to 1 if `NSInteger' is defined. */
#undef NS_HAVE_NSINTEGER
@ -1039,13 +1012,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define as `void' if your compiler accepts `void *'; otherwise define as
`char'. */
#undef POINTER_TYPE
/* Define to 1 if the C compiler supports function prototypes. */
#undef PROTOTYPES
/* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno.
*/
#undef PTHREAD_SIGMASK_FAILS_WITH_ERRNO
@ -1106,6 +1072,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to use system malloc. */
#undef SYSTEM_MALLOC
/* The type of system you are compiling for; sets `system-type'. */
#undef SYSTEM_TYPE
/* Define to 1 if you use terminfo instead of termcap. */
#undef TERMINFO
@ -1125,9 +1094,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using GTK. */
#undef USE_GTK
/* Define this to use a lisp union for the Lisp_Object data type. */
#undef USE_LISP_UNION_TYPE
/* Define to 1 if using the Lucid X toolkit. */
#undef USE_LUCID
@ -1146,6 +1112,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using an X toolkit. */
#undef USE_X_TOOLKIT
/* Define for USG systems where it works to open a pty's tty in the parent
process, then close and reopen it in the child. */
#undef USG_SUBTTY_WORKS
/* Version number of package */
#undef VERSION
@ -1190,6 +1160,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* enable compile-time and run-time bounds-checking, and some warnings */
#undef _FORTIFY_SOURCE
/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct
stat.st_size becomes 64-bit. */
#undef _GL_WINDOWS_64_BIT_ST_SIZE
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE
@ -1202,12 +1176,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if GNUstep uses ObjC exceptions. */
#undef _NATIVE_OBJC_EXCEPTIONS
/* The _Noreturn keyword of draft C1X. */
#ifndef _Noreturn
/* The _Noreturn keyword of C11. */
#if ! (defined _Noreturn \
|| (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
|| 0x5110 <= __SUNPRO_C)
# define _Noreturn __attribute__ ((__noreturn__))
# elif 1200 <= _MSC_VER
# elif defined _MSC_VER && 1200 <= _MSC_VER
# define _Noreturn __declspec (noreturn)
# else
# define _Noreturn
@ -1219,9 +1194,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
this defined. */
#undef _POSIX_1_SOURCE
/* Define to 1 if you need to in order for `stat' and other things to work. */
/* Define to 1 if you need to in order for 'stat' and other things to work. */
#undef _POSIX_SOURCE
/* Needed for system_process_attributes on Solaris. */
#undef _STRUCTURED_PROC
/* Define to 500 only on HP-UX. */
#undef _XOPEN_SOURCE
@ -1255,29 +1233,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
used. */
#undef __GETOPT_PREFIX
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
/* Ensure that <stdint.h> defines the limit macros, since gnulib's
<inttypes.h> relies on them. */
#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS
# define __STDC_LIMIT_MACROS 1
#endif
/* Define to compiler's equivalent of C99 restrict keyword in array
declarations. Define as empty for no equivalent. */
#undef __restrict_arr
/* Define to the used machine dependent file. */
#undef config_machfile
/* Define to the used os dependent file. */
#undef config_opsysfile
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* A replacement for va_copy, if needed. */
#define gl_va_copy(a,b) ((a) = (b))
@ -1371,10 +1333,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define as `fork' if `vfork' does not work. */
#undef vfork
/* Define to empty if the keyword `volatile' does not work. Warning: valid
code using `volatile' can become incorrect without. Disable with care. */
#undef volatile
/* On AIX 3 this must be included before any other include file. */
#include <alloca.h>
@ -1395,10 +1353,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define subprocesses
/* Include the os and machine dependent files. */
#include config_opsysfile
#ifdef config_machfile
# include config_machfile
/* Include the os dependent file. */
#ifdef config_opsysfile
# include config_opsysfile
#endif
/* GNUstep needs a bit more pure memory. Of the existing knobs,
@ -1423,38 +1380,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#endif
/* These default definitions are good for almost all machines.
Any exceptions should override them in m/MACHINE.h.
They must be usable in preprocessor conditionals. */
#ifndef BITS_PER_CHAR
#define BITS_PER_CHAR 8
#endif
#ifndef BITS_PER_SHORT
#define BITS_PER_SHORT 16
#endif
#ifndef BITS_PER_INT
#define BITS_PER_INT 32
#endif
#ifndef BITS_PER_LONG
#ifdef _LP64
#define BITS_PER_LONG 64
#else
#define BITS_PER_LONG 32
#endif
#endif
#if !defined BITS_PER_LONG_LONG && HAVE_LONG_LONG_INT
#define BITS_PER_LONG_LONG 64
#endif
/* Define if the compiler supports function prototypes. It may do so but
not define __STDC__ (e.g. DEC C by default) or may define it as zero. */
#undef PROTOTYPES
#include <string.h>
#include <stdlib.h>

2892
autogen/configure vendored
View file

File diff suppressed because it is too large Load diff

6
build-aux/move-if-change
View file

@ -2,13 +2,13 @@
# Like mv $1 $2, but if the files are the same, just delete $1.
# Status is zero if successful, nonzero otherwise.
VERSION='2011-01-28 20:09'; # UTC
VERSION='2012-01-06 07:23'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
# Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc.
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -32,7 +32,7 @@ If SOURCE is different than DEST, then move it to DEST; else remove SOURCE.
--help display this help and exit
--version output version information and exit
The variable CMPPROG can be used to specify an alternative to \`cmp'.
The variable CMPPROG can be used to specify an alternative to 'cmp'.
Report bugs to <bug-gnulib@gnu.org>."

2
build-aux/snippet/_Noreturn.h
View file

@ -1,4 +1,4 @@
#ifndef _Noreturn
#if !defined _Noreturn && __STDC_VERSION__ < 201112
# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
|| 0x5110 <= __SUNPRO_C)
# define _Noreturn __attribute__ ((__noreturn__))

2
build-aux/snippet/arg-nonnull.h
View file

@ -1,5 +1,5 @@
/* A C macro for declaring that specific arguments must not be NULL.
Copyright (C) 2009-2011 Free Software Foundation, Inc.
Copyright (C) 2009-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published

2
build-aux/snippet/c++defs.h
View file

@ -1,5 +1,5 @@
/* C++ compatible function declaration macros.
Copyright (C) 2010-2011 Free Software Foundation, Inc.
Copyright (C) 2010-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published

2
build-aux/snippet/warn-on-use.h
View file

@ -1,5 +1,5 @@
/* A C macro for emitting warnings if a function is used.
Copyright (C) 2010-2011 Free Software Foundation, Inc.
Copyright (C) 2010-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published

0
update-subdirs → build-aux/update-subdirs
View file

2
config.bat
View file

@ -283,11 +283,13 @@ If Exist alloca.in.h update alloca.in.h alloca.in-h
If Exist getopt.in.h update getopt.in.h getopt.in-h
If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
If Exist signal.in.h update signal.in.h signal.in-h
If Exist stdalign.in.h update stdalign.in.h stdalign.in-h
If Exist stddef.in.h update stddef.in.h stddef.in-h
If Exist stdint.in.h update stdint.in.h stdint.in-h
If Exist stdio.in.h update stdio.in.h stdio.in-h
If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h
If Exist sys_types.in.h update sys_types.in.h sys_types.in-h
If Exist time.in.h update time.in.h time.in-h
If Exist unistd.in.h update unistd.in.h unistd.in-h
If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp

389
configure.in
View file

@ -37,6 +37,7 @@ dnl hence the single quotes. This is per the GNU coding standards, see
dnl (autoconf) Installation Directory Variables
dnl See also epaths.h below.
lispdir='${datadir}/emacs/${version}/lisp'
leimdir='${datadir}/emacs/${version}/leim'
locallisppath='${datadir}/emacs/${version}/site-lisp:'\
'${datadir}/emacs/site-lisp'
lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
@ -234,19 +235,6 @@ AC_ARG_ENABLE(asserts,
USE_XASSERTS=$enableval,
USE_XASSERTS=no)
AC_ARG_ENABLE(maintainer-mode,
[AS_HELP_STRING([--disable-maintainer-mode],
[disable make rules and dependencies not useful (and sometimes
confusing) to the casual installer])],
USE_MAINTAINER_MODE=$enableval,
USE_MAINTAINER_MODE=yes)
if test $USE_MAINTAINER_MODE = yes; then
MAINT=
else
MAINT=#
fi
AC_SUBST(MAINT)
AC_ARG_ENABLE(locallisppath,
[AS_HELP_STRING([--enable-locallisppath=PATH],
[directories Emacs should search for lisp files specific
@ -321,13 +309,13 @@ if test x$ac_gc_check_cons_list != x ; then
[Define this to check for errors in cons list.])
fi
AC_ARG_ENABLE(use-lisp-union-type,
[AS_HELP_STRING([--enable-use-lisp-union-type],
[use a union for the Lisp_Object data type.
This is only useful for development for catching certain types of bugs.])],
AC_ARG_ENABLE(check-lisp-object-type,
[AS_HELP_STRING([--enable-check-lisp-object-type],
[enable compile time checks for the Lisp_Object data type.
This is useful for development for catching certain types of bugs.])],
if test "${enableval}" != "no"; then
AC_DEFINE(USE_LISP_UNION_TYPE, 1,
[Define this to use a lisp union for the Lisp_Object data type.])
AC_DEFINE(CHECK_LISP_OBJECT_TYPE, 1,
[Define this to enable compile time checks for the Lisp_Object data type.])
fi)
@ -374,8 +362,8 @@ case "${srcdir}" in
* ) srcdir="`(cd ${srcdir}; pwd)`" ;;
esac
#### Given the configuration name, set machfile and opsysfile to the
#### names of the m/*.h and s/*.h files we should use.
#### Given the configuration name, set opsysfile to the
#### name of s/*.h file we should use.
### Canonicalize the configuration name.
@ -395,13 +383,11 @@ dnl quotation begins
### If you add support for a new configuration, add code to this
### switch statement to recognize your configuration name and select
### the appropriate operating system and machine description files.
### the appropriate operating system file.
### You would hope that you could choose an m/*.h file pretty much
### based on the machine portion of the configuration name, and an s/*.h
### You would hope that you could choose an s/*.h
### file based on the operating system portion. However, it turns out
### that each m/*.h file is pretty manufacturer-specific - for
### example mips.h is MIPS
### that each s/*.h file is pretty manufacturer-specific.
### So we basically have to have a special case for each
### configuration name.
###
@ -411,93 +397,49 @@ dnl quotation begins
### prepared to handle anything reasonably. If version numbers
### matter, be sure /etc/MACHINES says something about it.
machine='' opsys='' unported=no
opsys='' unported=no
case "${canonical}" in
## GNU/Linux and similar ports
*-*-linux* )
opsys=gnu-linux
case ${canonical} in
alpha*) machine=alpha ;;
s390x-*) machine=ibms390x ;;
powerpc*) machine=macppc ;;
sparc*) machine=sparc ;;
ia64*) machine=ia64 ;;
m68k*) machine=m68k ;;
x86_64*) machine=amdx86-64 ;;
esac
;;
## FreeBSD ports
*-*-freebsd* )
opsys=freebsd
case "${canonical}" in
alpha*) machine=alpha ;;
amd64-*|x86_64-*) machine=amdx86-64 ;;
ia64-*) machine=ia64 ;;
i[3456]86-*) machine=intel386 ;;
powerpc-*) machine=macppc ;;
sparc-*) machine=sparc ;;
sparc64-*) machine=sparc ;;
esac
;;
## FreeBSD kernel + glibc based userland
*-*-kfreebsd*gnu* )
opsys=gnu-kfreebsd
case "${canonical}" in
alpha*) machine=alpha ;;
amd64-*|x86_64-*) machine=amdx86-64 ;;
ia64-*) machine=ia64 ;;
i[3456]86-*) machine=intel386 ;;
powerpc-*) machine=macppc ;;
sparc-*) machine=sparc ;;
sparc64-*) machine=sparc ;;
esac
;;
## NetBSD ports
*-*-netbsd* )
opsys=netbsd
case "${canonical}" in
alpha*) machine=alpha ;;
x86_64-*) machine=amdx86-64 ;;
i[3456]86-*) machine=intel386 ;;
m68k-*) machine=m68k ;;
powerpc-*) machine=macppc ;;
sparc*-) machine=sparc ;;
vax-*) machine=vax ;;
esac
;;
## OpenBSD ports
*-*-openbsd* )
opsys=openbsd
case "${canonical}" in
alpha*) machine=alpha ;;
x86_64-*) machine=amdx86-64 ;;
i386-*) machine=intel386 ;;
powerpc-*) machine=macppc ;;
sparc*) machine=sparc ;;
vax-*) machine=vax ;;
esac
;;
## Apple Darwin / Mac OS X
*-apple-darwin* )
case "${canonical}" in
i[3456]86-* ) machine=intel386 ;;
powerpc-* ) machine=macppc ;;
x86_64-* ) machine=amdx86-64 ;;
i[3456]86-* ) ;;
powerpc-* ) ;;
x86_64-* ) ;;
* ) unported=yes ;;
esac
opsys=darwin
# Use fink packages if available.
# FIXME? Is it really our business to decide this for the user?
if test -d /sw/include && test -d /sw/lib; then
GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
fi
## Use fink packages if available.
## FIXME find a better way to do this: http://debbugs.gnu.org/11507
## if test -d /sw/include && test -d /sw/lib; then
## GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
## NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
## fi
;;
## HP 9000 series 700 and 800, running HP/UX
@ -511,16 +453,16 @@ case "${canonical}" in
## IBM machines
rs6000-ibm-aix4.[23]* )
machine=ibmrs6000 opsys=aix4-2
opsys=aix4-2
;;
powerpc-ibm-aix4.[23]* )
machine=ibmrs6000 opsys=aix4-2
opsys=aix4-2
;;
rs6000-ibm-aix[56]* )
machine=ibmrs6000 opsys=aix4-2
opsys=aix4-2
;;
powerpc-ibm-aix[56]* )
machine=ibmrs6000 opsys=aix4-2
opsys=aix4-2
;;
## Silicon Graphics machines
@ -538,9 +480,9 @@ case "${canonical}" in
| i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
| x86_64-*-solaris2* | x86_64-*-sunos5*)
case "${canonical}" in
i[3456]86-*-* ) machine=intel386 ;;
amd64-*-*|x86_64-*-*) machine=amdx86-64 ;;
sparc* ) machine=sparc ;;
i[3456]86-*-* ) ;;
amd64-*-*|x86_64-*-*) ;;
sparc* ) ;;
* ) unported=yes ;;
esac
case "${canonical}" in
@ -572,7 +514,6 @@ case "${canonical}" in
## Intel 386 machines where we don't care about the manufacturer.
i[3456]86-*-* )
machine=intel386
case "${canonical}" in
*-cygwin ) opsys=cygwin ;;
*-darwin* ) opsys=darwin ;;
@ -611,11 +552,6 @@ if test $unported = yes; then
Check `etc/MACHINES' for recognized configuration names.])
fi
if test -n "$machine"; then
machfile="m/${machine}.h"
else
machfile=
fi
opsysfile="s/${opsys}.h"
@ -759,24 +695,12 @@ dnl if test "x$RANLIB" = x; then
dnl AC_PROG_RANLIB
dnl fi
## Although we're running on an amd64 kernel, we're actually compiling for
## the x86 architecture. The user should probably have provided an
## explicit --build to `configure', but if everything else than the kernel
## is running in i386 mode, we can help them out.
if test "$machine" = "amdx86-64"; then
AC_CHECK_DECL([i386])
if test "$ac_cv_have_decl_i386" = "yes"; then
canonical=`echo "$canonical" | sed -e 's/^amd64/i386/' -e 's/^x86_64/i386/'`
machine=intel386
machfile="m/${machine}.h"
fi
fi
AC_PATH_PROG(INSTALL_INFO, install-info)
AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin)
AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)
AC_PATH_PROG(INSTALL_INFO, install-info, :,
$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
dnl Don't use GZIP, which is used by gzip for additional parameters.
AC_PATH_PROG(GZIP_PROG, gzip)
AC_PATH_PROG(PAXCTL, paxctl,,
[$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
## Need makeinfo >= 4.7 (?) to build the manuals.
@ -942,7 +866,8 @@ esac
C_SWITCH_MACHINE=
if test "$machine" = "alpha"; then
case $canonical in
alpha*)
AC_CHECK_DECL([__ELF__])
if test "$ac_cv_have_decl___ELF__" = "yes"; then
## With ELF, make sure that all common symbols get allocated to in the
@ -958,7 +883,8 @@ if test "$machine" = "alpha"; then
else
UNEXEC_OBJ=unexalpha.o
fi
fi
;;
esac
AC_SUBST(C_SWITCH_MACHINE)
AC_SUBST(UNEXEC_OBJ)
@ -1004,13 +930,15 @@ AC_DEFUN([AC_TYPE_SIZE_T])
# Likewise for obsolescent test for uid_t, gid_t; Emacs assumes them.
AC_DEFUN([AC_TYPE_UID_T])
dnl Do this early because it can frob feature test macros for Unix-98 &c.
AC_SYS_LARGEFILE
LIB_MATH=-lm
LIB_STANDARD=
START_FILES=
dnl Current possibilities handled by sed (aix4-2 -> aix,
dnl gnu-linux -> gnu/linux, etc.):
dnl gnu, gnu/linux, gnu/kfreebsd, aix, cygwin, darwin, hpux, irix.
dnl And special cases: berkeley-unix, usg-unix-v, ms-dos, windows-nt.
SYSTEM_TYPE=`echo $opsys | sed -e 's/[[0-9]].*//' -e 's|-|/|'`
dnl NB do not use CRT_DIR unquoted here, since it might not be set yet.
case $opsys in
@ -1026,6 +954,7 @@ case $opsys in
freebsd )
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
SYSTEM_TYPE=berkeley-unix
;;
gnu-linux | gnu-kfreebsd )
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
@ -1039,11 +968,19 @@ case $opsys in
netbsd | openbsd )
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o'
SYSTEM_TYPE=berkeley-unix
;;
sol2* | unixware )
SYSTEM_TYPE=usg-unix-v
;;
esac
AC_SUBST(LIB_MATH)
AC_SUBST(START_FILES)
AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE",
[The type of system you are compiling for; sets `system-type'.])
dnl Not all platforms use crtn.o files. Check if the current one does.
crt_files=
@ -1132,6 +1069,8 @@ case $opsys in
esac
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
dnl This function definition taken from Gnome 2.0
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
@ -1139,8 +1078,6 @@ dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN([PKG_CHECK_MODULES], [
succeeded=no
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test "$PKG_CONFIG" = "no" ; then
ifelse([$4], , [AC_MSG_ERROR([
*** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config.])], [$4])
@ -1241,10 +1178,11 @@ if test "${with_sound}" != "no"; then
fi
dnl checks for header files
AC_CHECK_HEADERS(sys/select.h sys/time.h unistd.h utime.h \
linux/version.h sys/systeminfo.h \
stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
AC_CHECK_HEADERS_ONCE(
sys/select.h sys/time.h utime.h
linux/version.h sys/systeminfo.h
stdio_ext.h fcntl.h coff.h pty.h
sys/vlimit.h sys/resource.h
sys/utsname.h pwd.h utmp.h dirent.h util.h)
AC_MSG_CHECKING(if personality LINUX32 can be set)
@ -1328,7 +1266,7 @@ if test $emacs_cv_struct_exception != yes; then
AC_DEFINE(NO_MATHERR, 1, [Define to 1 if you don't have struct exception in math.h.])
fi
AC_CHECK_HEADERS(sys/socket.h)
AC_CHECK_HEADERS_ONCE(sys/socket.h)
AC_CHECK_HEADERS(net/if.h, , , [AC_INCLUDES_DEFAULT
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
@ -1341,7 +1279,6 @@ AC_CHECK_HEADERS(net/if_dl.h, , , [AC_INCLUDES_DEFAULT
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif])
AC_CHECK_FUNCS(getifaddrs freeifaddrs)
dnl checks for structure members
AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr,
@ -1356,29 +1293,8 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr,
#include <net/if.h>
#endif])
dnl checks for compiler characteristics
dnl Testing __STDC__ to determine prototype support isn't good enough.
dnl DEC C, for instance, doesn't define it with default options, and
dnl is used on 64-bit systems (OSF Alphas). Similarly for volatile
dnl and void *.
AC_C_PROTOTYPES
AC_C_VOLATILE
AC_C_CONST
AC_CACHE_CHECK([for void * support], emacs_cv_void_star,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[void * foo;]])],
emacs_cv_void_star=yes, emacs_cv_void_star=no)])
if test $emacs_cv_void_star = yes; then
AC_DEFINE(POINTER_TYPE, void)
else
AC_DEFINE(POINTER_TYPE, char)
fi
AH_TEMPLATE(POINTER_TYPE,
[Define as `void' if your compiler accepts `void *'; otherwise
define as `char'.])dnl
dnl Check for endianness.
AC_C_BIGENDIAN
dnl AC_C_BIGENDIAN is done by gnulib.
AC_CACHE_CHECK([for __attribute__ ((__aligned__ (expr)))],
[emacs_cv_attribute_aligned],
@ -1394,7 +1310,7 @@ if test $emacs_cv_attribute_aligned = yes; then
fi
dnl check for Make feature
AC_PROG_MAKE_SET
dnl AC_PROG_MAKE_SET is done by Automake.
DEPFLAGS=
MKDEPDIR=":"
@ -1573,7 +1489,8 @@ fail;
fi
AC_SUBST(TEMACS_LDFLAGS2)
LEIM_INSTALLDIR="\${install_prefix}/leim"
INSTALL_ARCH_INDEP_EXTRA=install-etc
ns_self_contained=no
ns_frag=/dev/null
NS_OBJ=
NS_OBJC_OBJ=
@ -1586,12 +1503,21 @@ if test "${HAVE_NS}" = yes; then
with_xft=no
# set up packaging dirs
if test "${EN_NS_SELF_CONTAINED}" = yes; then
ns_self_contained=yes
prefix=${ns_appresdir}
exec_prefix=${ns_appbindir}
dnl This one isn't really used, only archlibdir is.
libexecdir="\${ns_appbindir}/libexec"
archlibdir="\${ns_appbindir}/libexec"
LEIM_INSTALLDIR="\${ns_appresdir}/leim"
docdir="\${ns_appresdir}/etc"
etcdir="\${ns_appresdir}/etc"
dnl FIXME maybe set datarootdir instead.
dnl That would also get applications, icons, man.
infodir="\${ns_appresdir}/info"
mandir="\${ns_appresdir}/man"
lispdir="\${ns_appresdir}/lisp"
leimdir="\${ns_appresdir}/leim"
INSTALL_ARCH_INDEP_EXTRA=
fi
ns_frag=$srcdir/src/ns.mk
NS_OBJ="fontset.o fringe.o image.o"
@ -1599,7 +1525,8 @@ if test "${HAVE_NS}" = yes; then
fi
CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS"
AC_SUBST(LEIM_INSTALLDIR)
AC_SUBST(INSTALL_ARCH_INDEP_EXTRA)
AC_SUBST(ns_self_contained)
AC_SUBST(NS_OBJ)
AC_SUBST(NS_OBJC_OBJ)
AC_SUBST(LIB_STANDARD)
@ -1653,7 +1580,7 @@ case ${HAVE_X11} in
yes ) HAVE_MENUS=yes ;;
esac
# Do the opsystem or machine files prohibit the use of the GNU malloc?
# Does the opsystem file prohibit the use of the GNU malloc?
# Assume not, until told otherwise.
GNU_MALLOC=yes
@ -1739,7 +1666,7 @@ AC_CHECK_LIB(Xbsd, main, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
dnl Check if pthreads is available.
LIB_PTHREAD=
AC_CHECK_HEADERS(pthread.h)
AC_CHECK_HEADERS_ONCE(pthread.h)
if test "$ac_cv_header_pthread_h"; then
dnl gmalloc.c uses pthread_atfork, which is not available on older-style
dnl hosts such as MirBSD 10, so test for pthread_atfork instead of merely
@ -1862,7 +1789,7 @@ if test "${HAVE_X11}" = "yes"; then
fi
AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
XScreenNumberOfScreen XSetWMProtocols)
XScreenNumberOfScreen)
fi
if test "${window_system}" = "x11"; then
@ -1926,7 +1853,7 @@ if test "${HAVE_X11}" = "yes"; then
AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.])
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
LIBS="$IMAGEMAGICK_LIBS $LIBS"
AC_CHECK_FUNCS(MagickExportImagePixels)
AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers)
fi
fi
fi
@ -2036,8 +1963,10 @@ if test "${with_dbus}" = "yes"; then
LIBS="$LIBS $DBUS_LIBS"
AC_DEFINE(HAVE_DBUS, 1, [Define to 1 if using D-Bus.])
dnl dbus_watch_get_unix_fd has been introduced in D-Bus 1.1.1.
dnl dbus_validate_* have been introduced in D-Bus 1.5.12.
dnl dbus_type_is_valid and dbus_validate_* have been introduced in
dnl D-Bus 1.5.12.
AC_CHECK_FUNCS(dbus_watch_get_unix_fd \
dbus_type_is_valid \
dbus_validate_bus_name \
dbus_validate_path \
dbus_validate_interface \
@ -2612,7 +2541,7 @@ fi
AC_SUBST(LIBGPM)
dnl Check for malloc/malloc.h on darwin
AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])])
AC_CHECK_HEADERS_ONCE(malloc/malloc.h)
GNUSTEP_CFLAGS=
### Use NeXTstep API to implement GUI.
@ -2716,8 +2645,7 @@ This probably means that movemail could lose mail.
There may be a `development' package to install containing liblockfile.])
fi
fi
AC_CHECK_FUNCS(touchlock)
AC_CHECK_HEADERS(maillock.h)
AC_CHECK_HEADERS_ONCE(maillock.h)
AC_SUBST(LIBS_MAIL)
## Define MAIL_USE_FLOCK (or LOCKF) if the mailer uses flock (or lockf) to
@ -2762,16 +2690,17 @@ esac
AC_SUBST(BLESSMAIL_TARGET)
AC_CHECK_FUNCS(gethostname getdomainname \
rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \
random lrand48 logb frexp fmod rint cbrt ftime setsid \
strerror fpathconf select euidaccess getpagesize tzset setlocale \
AC_CHECK_FUNCS_ONCE(gethostname \
rename closedir mkdir rmdir getrusage get_current_dir_name \
random lrand48 logb frexp fmod rint cbrt setsid \
strerror fpathconf select euidaccess getpagesize setlocale \
utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \
__fpending mblen mbrlen mbsinit strsignal setitimer ualarm \
sendto recvfrom getsockopt setsockopt getsockname getpeername \
gai_strerror mkstemp getline getdelim mremap fsync sync \
difftime mempcpy mblen mbrlen posix_memalign \
__fpending strsignal setitimer \
sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
gai_strerror mkstemp getline getdelim fsync sync \
difftime posix_memalign \
getpwent endpwent getgrent endgrent \
touchlock \
cfmakeraw cfsetspeed copysign __executable_start)
dnl Cannot use AC_CHECK_FUNCS
@ -2785,17 +2714,17 @@ if test $emacs_cv_func___builtin_unwind_init = yes; then
[Define to 1 if you have the `__builtin_unwind_init' function.])
fi
AC_CHECK_HEADERS(sys/un.h)
AC_CHECK_HEADERS_ONCE(sys/un.h)
AC_FUNC_FSEEKO
AC_FUNC_GETPGRP
# UNIX98 PTYs.
AC_CHECK_FUNCS(grantpt)
AC_CHECK_FUNCS_ONCE(grantpt)
# PTY-related GNU extensions.
AC_CHECK_FUNCS(getpt)
AC_CHECK_FUNCS_ONCE(getpt)
# Check this now, so that we will NOT find the above functions in ncurses.
# That is because we have not set up to link ncurses in lib-src.
@ -3052,6 +2981,7 @@ AC_SUBST(KRB5LIB)
AC_SUBST(DESLIB)
AC_SUBST(KRB4LIB)
AC_CHECK_FUNCS_ONCE(tzset)
AC_MSG_CHECKING(whether localtime caches TZ)
AC_CACHE_VAL(emacs_cv_localtime_cache,
[if test x$ac_cv_func_tzset = xyes; then
@ -3145,7 +3075,7 @@ fi
AC_FUNC_FORK
AC_CHECK_FUNCS(snprintf)
AC_CHECK_FUNCS_ONCE(snprintf)
dnl Adapted from Haible's version.
AC_CACHE_CHECK([for nl_langinfo and CODESET], emacs_cv_langinfo_codeset,
@ -3181,6 +3111,52 @@ dnl and macros for terminal control.])
dnl AC_DEFINE(HAVE_TCATTR, 1, [Define to 1 if you have tcgetattr and tcsetattr.])
dnl fi
case $opsys in
darwin | gnu | hpux* | *bsd )
AC_DEFINE(NO_TERMIO, 1, [Define if termio.h should not be included.])
;;
esac
dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
case $opsys in
hpux* | irix6-5 | openbsd | sol2* | unixware )
AC_DEFINE(BROKEN_SIGIO, 1, [Define if SIGIO should not be used.])
;;
esac
case $opsys in
gnu-* | sol2-10 )
dnl FIXME Can't we test if this exists (eg /proc/$$)?
AC_DEFINE(HAVE_PROCFS, 1, [Define if you have the /proc filesystem.])
;;
esac
case $opsys in
gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
hpux11)
dnl SA_RESTART resets the timeout of `select', so don't use it.
AC_DEFINE(BROKEN_SA_RESTART, 1, [Define if SA_RESTART should not
be used.])
dnl It works to open the pty's tty in the parent (Emacs), then
dnl close and reopen it in the child.
AC_DEFINE(USG_SUBTTY_WORKS, 1, [Define for USG systems where it
works to open a pty's tty in the parent process, then close and
reopen it in the child.])
opsysfile="s/hpux10-20.h"
;;
openbsd) opsysfile="s/netbsd.h" ;;
sol2-10)
AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
on Solaris.])
opsysfile="s/sol2-6.h"
;;
esac
# Set up the CFLAGS for real compilation, so we can substitute it.
CFLAGS="$REAL_CFLAGS"
CPPFLAGS="$REAL_CPPFLAGS"
@ -3211,6 +3187,7 @@ AC_SUBST(libexecdir)
AC_SUBST(mandir)
AC_SUBST(infodir)
AC_SUBST(lispdir)
AC_SUBST(leimdir)
AC_SUBST(locallisppath)
AC_SUBST(lisppath)
AC_SUBST(x_default_search_path)
@ -3229,13 +3206,11 @@ AC_SUBST(GNUSTEP_CFLAGS)
AC_SUBST(CFLAGS)
## Used in lwlib/Makefile.in.
AC_SUBST(X_TOOLKIT_TYPE)
if test -n "${machfile}"; then
M_FILE="\$(srcdir)/${machfile}"
if test -n "${opsysfile}"; then
S_FILE="\$(srcdir)/${opsysfile}"
else
M_FILE=
S_FILE=
fi
S_FILE="\$(srcdir)/${opsysfile}"
AC_SUBST(M_FILE)
AC_SUBST(S_FILE)
AC_SUBST(ns_appdir)
AC_SUBST(ns_appbindir)
@ -3248,12 +3223,10 @@ AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
[Define to the canonical Emacs configuration name.])
AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
[Define to the options passed to configure.])
if test -n "$machfile"; then
AC_DEFINE_UNQUOTED(config_machfile, "${machfile}",
[Define to the used machine dependent file.])
if test -n "$opsysfile"; then
AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}",
[Define to the used os dependent file.])
fi
AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}",
[Define to the used os dependent file.])
XMENU_OBJ=
XOBJ=
@ -3430,8 +3403,7 @@ case "$opsys" in
## #ifndef LD_SWITCH_SYSTEM
## #if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
## Since all the *bsds define LD_SWITCH_SYSTEM, this simplifies to:
## not using gcc, darwin system not on an alpha (ie darwin, since
## darwin + alpha does not occur).
## not using gcc, darwin.
## Because this was done in src/Makefile.in, the resulting part of
## LD_SWITCH_SYSTEM was not used in configure (ie, in ac_link).
## It therefore seems cleaner to put this in LD_SWITCH_SYSTEM_TEMACS,
@ -3471,12 +3443,12 @@ case "$opsys" in
## will also work on earlier NetBSD releases.
netbsd|openbsd) LD_FIRSTFLAG="-nostartfiles" ;;
## macpcc: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says
## powerpc*: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says
## MkLinux/LinuxPPC needs this.
## ibms390x only supports opsys = gnu-linux so it can be added here.
## s390x-* only supports opsys = gnu-linux so it can be added here.
gnu-*)
case "$machine" in
macppc|ibms390x) LD_FIRSTFLAG="-nostdlib" ;;
case "$canonical" in
powerpc*|s390x-*) LD_FIRSTFLAG="-nostdlib" ;;
esac
;;
esac
@ -3488,7 +3460,7 @@ if test "x$ORDINARY_LINK" = "xyes"; then
AC_DEFINE(ORDINARY_LINK, 1, [Define if the C compiler is the linker.])
## The system files defining neither ORDINARY_LINK nor LD_FIRSTFLAG are:
## freebsd, gnu-* not on macppc|ibms390x.
## freebsd, gnu-* not on powerpc*|s390x*.
elif test "x$GCC" = "xyes" && test "x$LD_FIRSTFLAG" = "x"; then
## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
@ -3596,10 +3568,9 @@ AH_BOTTOM([
#define subprocesses
/* Include the os and machine dependent files. */
#include config_opsysfile
#ifdef config_machfile
# include config_machfile
/* Include the os dependent file. */
#ifdef config_opsysfile
# include config_opsysfile
#endif
/* GNUstep needs a bit more pure memory. Of the existing knobs,
@ -3624,38 +3595,6 @@ AH_BOTTOM([
#endif
#endif
/* These default definitions are good for almost all machines.
Any exceptions should override them in m/MACHINE.h.
They must be usable in preprocessor conditionals. */
#ifndef BITS_PER_CHAR
#define BITS_PER_CHAR 8
#endif
#ifndef BITS_PER_SHORT
#define BITS_PER_SHORT 16
#endif
#ifndef BITS_PER_INT
#define BITS_PER_INT 32
#endif
#ifndef BITS_PER_LONG
#ifdef _LP64
#define BITS_PER_LONG 64
#else
#define BITS_PER_LONG 32
#endif
#endif
#if !defined BITS_PER_LONG_LONG && HAVE_LONG_LONG_INT
#define BITS_PER_LONG_LONG 64
#endif
/* Define if the compiler supports function prototypes. It may do so but
not define __STDC__ (e.g. DEC C by default) or may define it as zero. */
#undef PROTOTYPES
#include <string.h>
#include <stdlib.h>
@ -3723,17 +3662,11 @@ if test "${HAVE_GTK}" = "yes"; then
USE_X_TOOLKIT=GTK
fi
and_machfile=
if test -n "$machfile"; then
and_machfile=" and \`${machfile}'"
fi
echo "
Configured for \`${canonical}'.
Where should the build process find the source code? ${srcdir}
What operating system and machine description files should Emacs use?
\`${opsysfile}'${and_machfile}
What operating system file should Emacs use? ${opsysfile-none}
What compiler should emacs be built with? ${CC} ${CFLAGS}
Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason}
Should Emacs use a relocating allocator for buffers? ${REL_ALLOC}

28
doc/emacs/ChangeLog
View file

@ -1,3 +1,29 @@
2012-06-06 Michael Albinus <michael.albinus@gmx.de>
* custom.texi (Directory Variables): Mention enable-remote-dir-locals.
2012-05-28 Glenn Morris <rgm@gnu.org>
* ack.texi, building.texi, calendar.texi, custom.texi:
* maintaining.texi, text.texi: Use @LaTeX rather than La@TeX.
2012-05-27 Glenn Morris <rgm@gnu.org>
* emacs.texi: Simplify following removal of node pointers.
* ack.texi, anti.texi, basic.texi, buffers.texi, building.texi:
* cmdargs.texi, commands.texi, display.texi, emacs.texi:
* entering.texi, files.texi, fixit.texi, frames.texi, glossary.texi:
* gnu.texi, help.texi, indent.texi, killing.texi, kmacro.texi:
* m-x.texi, macos.texi, maintaining.texi, mark.texi, mini.texi:
* misc.texi, modes.texi, msdog.texi, mule.texi, programs.texi:
* regs.texi, screen.texi, search.texi, text.texi, trouble.texi:
* windows.texi, xresources.texi: Nuke hand-written node pointers.
2012-05-22 Glenn Morris <rgm@gnu.org>
* emacs.texi (Acknowledgments): Add another contributor.
2012-05-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (MKDIR_P): New, set by configure.
@ -163,7 +189,7 @@
(Input Methods): Copyedits. Use "^" for the postfix example,
because it is less confusing inside Info's `quotes'.
* custom.texi (Specifying File Variables): Fix "unibyte" description.
* custom.texi (Specifying File Variables): Fix "unibyte" description.
Update for "Disabling Multibyte" node name change.
* emacs.texi: Update for "Disabling Multibyte" node name change.

8
doc/emacs/ack.texi
View file

@ -3,7 +3,7 @@
@c Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@node Acknowledgments, Screen, Concept Index, Top
@node Acknowledgments
@unnumbered Acknowledgments
Many people have contributed code included in the Free Software
@ -264,7 +264,7 @@ He also wrote @file{dynamic-setting.el}.
@item
Carsten Dominik wrote Ref@TeX{}, a package for setting up labels and
cross-references in La@TeX{} documents; and co-wrote IDLWAVE mode
cross-references in @LaTeX{} documents; and co-wrote IDLWAVE mode
(q.v.@:). He was the original author of Org mode, for maintaining notes,
todo lists, and project planning. Bastien Guerry subsequently took
over maintainership. Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böcker, Lennart
@ -549,7 +549,7 @@ for the Transport Layer Security protocol.
@item
Arne Jørgensen wrote @file{latexenc.el}, a package to
automatically guess the correct coding system in La@TeX{} files.
automatically guess the correct coding system in @LaTeX{} files.
@item
Alexandre Julliard wrote @file{vc-git.el}, support for the Git version
@ -567,7 +567,7 @@ control system.
Henry Kautz wrote @file{bib-mode.el}, a mode for maintaining
bibliography databases compatible with @code{refer} (the @code{troff}
version) and @code{lookbib}, and @file{refbib.el}, a package to convert
those databases to the format used by the La@TeX{} text formatting package.
those databases to the format used by the @LaTeX{} text formatting package.
@item
Taichi Kawabata added support for Devanagari script and the Indian

2
doc/emacs/anti.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 2005-2012 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Antinews, Mac OS / GNUstep, X Resources, Top
@node Antinews
@appendix Emacs 23 Antinews
@c Update the emacs.texi Antinews menu entry with the above version number.

2
doc/emacs/basic.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Basic, Minibuffer, Exiting, Top
@node Basic
@chapter Basic Editing Commands
@kindex C-h t

2
doc/emacs/buffers.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Buffers, Windows, Files, Top
@node Buffers
@chapter Using Multiple Buffers
@cindex buffers

4
doc/emacs/building.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Building, Maintaining, Programs, Top
@node Building
@chapter Compiling and Testing Programs
@cindex building programs
@cindex program building
@ -416,7 +416,7 @@ by various version control systems.
Flymake mode is a minor mode that performs on-the-fly syntax
checking for many programming and markup languages, including C, C++,
Perl, HTML, and @TeX{}/La@TeX{}. It is somewhat analogous to Flyspell
Perl, HTML, and @TeX{}/@LaTeX{}. It is somewhat analogous to Flyspell
mode, which performs spell checking for ordinary human languages in a
similar fashion (@pxref{Spelling}). As you edit a file, Flymake mode
runs an appropriate syntax checking tool in the background, using a

8
doc/emacs/calendar.texi
View file

@ -345,7 +345,7 @@ calendar deletes or iconifies that frame depending on the value of
@node Writing Calendar Files
@section Writing Calendar Files
You can write calendars and diary entries to HTML and La@TeX{} files.
You can write calendars and diary entries to HTML and @LaTeX{} files.
@cindex calendar and HTML
The Calendar HTML commands produce files of HTML code that contain
@ -380,8 +380,8 @@ non-@code{nil}, then the monthly calendars show the day-of-the-year
number. The variable @code{cal-html-year-index-cols} specifies the
number of columns in the yearly index page.
@cindex calendar and La@TeX{}
The Calendar La@TeX{} commands produce a buffer of La@TeX{} code that
@cindex calendar and @LaTeX{}
The Calendar @LaTeX{} commands produce a buffer of @LaTeX{} code that
prints as a calendar. Depending on the command you use, the printed
calendar covers the day, week, month or year that point is in.
@ -441,7 +441,7 @@ the individual cal-tex functions to see which calendars support which
features.
You can use the variable @code{cal-tex-preamble-extra} to insert extra
La@TeX{} commands in the preamble of the generated document if you need
@LaTeX{} commands in the preamble of the generated document if you need
to.
@node Holidays

2
doc/emacs/cmdargs.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Emacs Invocation, X Resources, GNU Free Documentation License, Top
@node Emacs Invocation
@appendix Command Line Arguments for Emacs Invocation
@cindex command line arguments
@cindex arguments (command line)

6
doc/emacs/commands.texi
View file

@ -15,7 +15,7 @@ input.
@raisesections
@end ifnottex
@node User Input, Keys, Screen, Top
@node User Input
@section Kinds of User Input
@cindex input with the keyboard
@cindex keyboard input
@ -80,7 +80,7 @@ as @dfn{input events}. For details about how Emacs internally handles
input events, see @ref{Input Events,,, elisp, The Emacs Lisp Reference
Manual}.
@node Keys, Commands, User Input, Top
@node Keys
@section Keys
Some Emacs commands are invoked by just one input event; for
@ -133,7 +133,7 @@ exception to this rule is @key{ESC}: @kbd{@key{ESC} C-h} is equivalent
to @kbd{C-M-h}, which does something else entirely. You can, however,
use @key{F1} to display a list of commands starting with @key{ESC}.
@node Commands, Entering Emacs, Keys, Top
@node Commands
@section Keys and Commands
@cindex binding

8
doc/emacs/custom.texi
View file

@ -866,7 +866,7 @@ other modes based on Text mode:
@noindent
This works by calling @code{auto-fill-mode}, which enables the minor
mode when no argument is supplied (@pxref{Minor Modes}). Next,
suppose you don't want Auto Fill mode turned on in La@TeX{} mode,
suppose you don't want Auto Fill mode turned on in @LaTeX{} mode,
which is one of the modes based on Text mode. You can do this with
the following additional line:
@ -878,7 +878,7 @@ the following additional line:
Here we have used the special macro @code{lambda} to construct an
anonymous function (@pxref{Lambda Expressions,,, elisp, The Emacs Lisp
Reference Manual}), which calls @code{auto-fill-mode} with an argument
of @code{-1} to disable the minor mode. Because La@TeX{} mode runs
of @code{-1} to disable the minor mode. Because @LaTeX{} mode runs
@code{latex-mode-hook} after running @code{text-mode-hook}, the result
leaves Auto Fill mode disabled.
@ -1283,7 +1283,9 @@ specified in @file{.dir-locals.el}, as though they had been defined as
file-local variables for that file (@pxref{File Variables}). Emacs
searches for @file{.dir-locals.el} starting in the directory of the
visited file, and moving up the directory tree. To avoid slowdown,
this search is skipped for remote files.
this search is skipped for remote files. If needed, the search can be
extended for remote files by setting the variable
@code{enable-remote-dir-locals} to @code{t}.
The @file{.dir-locals.el} file should hold a specially-constructed
list, which maps major mode names (symbols) to alists

2
doc/emacs/display.texi
View file

@ -3,7 +3,7 @@
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Display, Search, Registers, Top
@node Display
@chapter Controlling the Display
Since only part of a large buffer fits in the window, Emacs has to

41
doc/emacs/emacs.texi
View file

@ -109,7 +109,7 @@ Cover art by Etienne Suvasa.
@ifnottex
@node Top, Distrib, (dir), (dir)
@node Top
@top The Emacs Editor
Emacs is the extensible, customizable, self-documenting real-time
@ -1286,7 +1286,7 @@ Windows. @xref{Mac OS / GNUstep}, for information about using Emacs
on Macintosh (and GNUstep).
@end iftex
@node Distrib, Intro, Top, Top
@node Distrib
@unnumbered Distribution
GNU Emacs is @dfn{free software}; this means that everyone is free to
@ -1343,12 +1343,12 @@ USA
@end display
@iftex
@node Acknowledgments, Intro, Distrib, Top
@node Acknowledgments
@unnumberedsec Acknowledgments
Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas
Abrahamsson, Jay K.@: Adams, Alon Albert, Michael Albinus, Nagy
Andras, Benjamin Andresen, Ralf Angeli, Joe Arceneaux, Emil Åström,
Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil Åström,
Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas
Baumann, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff,
Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl
@ -1450,7 +1450,7 @@ Shenghuo Zhu, Piotr Zielinski, Ian T.@: Zimmermann, Reto Zimmermann,
Neal Ziring, Teodor Zlatanov, and Detlev Zundel.
@end iftex
@node Intro, Glossary, Distrib, Top
@node Intro
@unnumbered Introduction
You are reading about GNU Emacs, the GNU incarnation of the
@ -1531,11 +1531,11 @@ Lisp programming.
@include custom.texi
@include trouble.texi
@node Copying, GNU Free Documentation License, Service, Top
@node Copying
@appendix GNU GENERAL PUBLIC LICENSE
@include gpl.texi
@node GNU Free Documentation License, Emacs Invocation, Copying, Top
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@ -1555,43 +1555,26 @@ Lisp programming.
@c The Option Index is produced only in the on-line version,
@c because the index entries related to command-line options
@c tend to point to the same pages and all begin with a dash.
@c This, and the need to keep the node links consistent, are
@c the reasons for the funky @iftex/@ifnottex dance below.
@c The Option Index is _not_ before Key Index, because that
@c would require changes in the glossary.texi's @node line.
@c It is not after Concept Index for similar reasons.
@iftex
@node Key Index, Command Index, Glossary, Top
@node Key Index
@unnumbered Key (Character) Index
@printindex ky
@end iftex
@ifnottex
@node Key Index, Option Index, Glossary, Top
@unnumbered Key (Character) Index
@printindex ky
@node Option Index, Command Index, Key Index, Top
@node Option Index
@unnumbered Command-Line Options Index
@printindex op
@node Command Index, Variable Index, Option Index, Top
@unnumbered Command and Function Index
@printindex fn
@end ifnottex
@iftex
@node Command Index, Variable Index, Key Index, Top
@node Command Index
@unnumbered Command and Function Index
@printindex fn
@end iftex
@node Variable Index, Concept Index, Command Index, Top
@node Variable Index
@unnumbered Variable Index
@printindex vr
@node Concept Index, Acknowledgments, Variable Index, Top
@node Concept Index
@unnumbered Concept Index
@printindex cp

4
doc/emacs/entering.texi
View file

@ -12,7 +12,7 @@
@raisesections
@end ifnottex
@node Entering Emacs, Exiting, Commands, Top
@node Entering Emacs
@section Entering Emacs
@cindex entering Emacs
@cindex starting Emacs
@ -85,7 +85,7 @@ the desired file or directory.
or @code{t}, which means to display the @file{*scratch*} buffer.
@end ignore
@node Exiting, Basic, Entering Emacs, Top
@node Exiting
@section Exiting Emacs
@cindex exiting
@cindex killing Emacs

2
doc/emacs/files.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Files, Buffers, Keyboard Macros, Top
@node Files
@chapter File Handling
@cindex files

2
doc/emacs/fixit.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Fixit, Keyboard Macros, Search, Top
@node Fixit
@chapter Commands for Fixing Typos
@cindex typos, fixing
@cindex mistakes, correcting

2
doc/emacs/frames.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Frames, International, Windows, Top
@node Frames
@chapter Frames and Graphical Displays
@cindex frames

2
doc/emacs/glossary.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Glossary, Key Index, Intro, Top
@node Glossary
@unnumbered Glossary
@table @asis

2
doc/emacs/gnu.texi
View file

@ -10,7 +10,7 @@
@c Modified versions may not be made.
@ifclear justgnu
@node Manifesto,, Microsoft Windows, Top
@node Manifesto
@unnumbered The GNU Manifesto
@end ifclear
@ifset justgnu

2
doc/emacs/help.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Help, Mark, M-x, Top
@node Help
@chapter Help
@kindex Help
@cindex help

2
doc/emacs/indent.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Indentation, Text, Modes, Top
@node Indentation
@chapter Indentation
@cindex indentation
@cindex tabs

2
doc/emacs/killing.texi
View file

@ -3,7 +3,7 @@
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Killing, Registers, Mark, Top
@node Killing
@chapter Killing and Moving Text
In Emacs, @dfn{killing} means erasing text and copying it into the

2
doc/emacs/kmacro.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Keyboard Macros, Files, Fixit, Top
@node Keyboard Macros
@chapter Keyboard Macros
@cindex defining keyboard macros
@cindex keyboard macro

2
doc/emacs/m-x.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node M-x, Help, Minibuffer, Top
@node M-x
@chapter Running Commands by Name
Every Emacs command has a name that you can use to run it. For

10
doc/emacs/macos.texi
View file

@ -1,7 +1,7 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2000-2012 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mac OS / GNUstep, Microsoft Windows, Antinews, Top
@node Mac OS / GNUstep
@appendix Emacs and Mac OS / GNUstep
@cindex Mac OS X
@cindex Macintosh
@ -31,7 +31,7 @@ Support}), but we hope to improve it in the future.
* GNUstep Support:: Details on status of GNUstep support.
@end menu
@node Mac / GNUstep Basics, Mac / GNUstep Customization, , Mac OS / GNUstep
@node Mac / GNUstep Basics
@section Basic Emacs usage under Mac OS and GNUstep
By default, the @key{alt} and @key{option} keys are the same as
@ -84,7 +84,7 @@ For the PATH and MANPATH variables, a system-wide method
of setting PATH is recommended on Mac OS X 10.5 and later, using the
@file{/etc/paths} files and the @file{/etc/paths.d} directory.
@node Mac / GNUstep Customization, Mac / GNUstep Events, Mac / GNUstep Basics, Mac OS / GNUstep
@node Mac / GNUstep Customization
@section Mac / GNUstep Customization
Emacs can be customized in several ways in addition to the standard
@ -125,7 +125,7 @@ move the mouse pointer over it. (Requires Mac OS X 10.6 or later.)
@end table
@node Mac / GNUstep Events, GNUstep Support, Mac / GNUstep Customization, Mac OS / GNUstep
@node Mac / GNUstep Events
@section Windowing System Events under Mac OS / GNUstep
Nextstep applications receive a number of special events which have
@ -202,7 +202,7 @@ and return the result as a string. You can also use the Lisp function
services and receive the results back. Note that you may need to
restart Emacs to access newly-available services.
@node GNUstep Support, , Mac / GNUstep Events, Mac OS / GNUstep
@node GNUstep Support
@section GNUstep Support
Emacs can be built and run under GNUstep, but there are still

4
doc/emacs/maintaining.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Maintaining, Abbrevs, Building, Top
@node Maintaining
@chapter Maintaining Large Programs
This chapter describes Emacs features for maintaining large
@ -1659,7 +1659,7 @@ Tags for variables and functions in classes are named
@samp{@var{class}.@var{variable}} and @samp{@var{class}.@var{function}}.
@item
In La@TeX{} documents, the arguments for @code{\chapter},
In @LaTeX{} documents, the arguments for @code{\chapter},
@code{\section}, @code{\subsection}, @code{\subsubsection},
@code{\eqno}, @code{\label}, @code{\ref}, @code{\cite},
@code{\bibitem}, @code{\part}, @code{\appendix}, @code{\entry},

2
doc/emacs/mark.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mark, Killing, Help, Top
@node Mark
@chapter The Mark and the Region
@cindex mark
@cindex setting a mark

2
doc/emacs/mini.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Minibuffer, M-x, Basic, Top
@node Minibuffer
@chapter The Minibuffer
@cindex minibuffer

20
doc/emacs/misc.texi
View file

@ -1324,7 +1324,7 @@ bit, and 1 stopbit.
with your device and will probably only see garbage output in the
window.
@node Emacs Server, Printing, Shell, Top
@node Emacs Server
@section Using Emacs as a Server
@pindex emacsclient
@cindex Emacs as a server
@ -1642,7 +1642,7 @@ text terminal. If you supply both options, Emacs visits the specified
files(s) in an existing frame rather than a new client frame, negating
the effect of @samp{-t}.
@node Printing, Sorting, Emacs Server, Top
@node Printing
@section Printing Hard Copies
@cindex hardcopy
@cindex printing
@ -1710,7 +1710,7 @@ printer program is not compatible with @command{lpr}).
* Printing Package:: An optional advanced printing interface.
@end menu
@node PostScript, PostScript Variables,, Printing
@node PostScript
@subsection PostScript Hardcopy
These commands convert buffer contents to PostScript,
@ -1779,7 +1779,7 @@ rendition of the current buffer as a cursive handwritten document. It
can be customized in group @code{handwrite}. This function only
supports ISO 8859-1 characters.
@node PostScript Variables, Printing Package, PostScript, Printing
@node PostScript Variables
@subsection Variables for PostScript Hardcopy
@vindex ps-lpr-command
@ -1874,7 +1874,7 @@ includes a single directory @file{/usr/local/share/emacs/fonts/bdf}.
Many other customization variables for these commands are defined and
described in the Lisp files @file{ps-print.el} and @file{ps-mule.el}.
@node Printing Package,, PostScript Variables, Printing
@node Printing Package
@subsection Printing Package
@cindex Printing package
@ -2098,7 +2098,7 @@ bytes, move by @code{short}s or @code{int}s, etc.; type @kbd{C-h a
hexl-@key{RET}} for details.
@node Saving Emacs Sessions, Recursive Edit, Editing Binary Files, Top
@node Saving Emacs Sessions
@section Saving Emacs Sessions
@cindex saving sessions
@cindex restore session
@ -2164,7 +2164,7 @@ expression matching the names of buffers not to kill.
If you want to save minibuffer history from one session to
another, use the @code{savehist} library.
@node Recursive Edit, Emulation, Saving Emacs Sessions, Top
@node Recursive Edit
@section Recursive Editing Levels
@cindex recursive editing level
@cindex editing level, recursive
@ -2232,7 +2232,7 @@ new major mode which provides a command to switch back. These
approaches give you more flexibility to go back to unfinished tasks in
the order you choose.
@node Emulation, Hyperlinking, Recursive Edit, Top
@node Emulation
@section Emulation
@cindex emulating other editors
@cindex other editors
@ -2324,7 +2324,7 @@ not use it.
key bindings.
@end table
@node Hyperlinking, Amusements, Emulation, Top
@node Hyperlinking
@section Hyperlinking and Navigation Features
The following subsections describe convenience features for handling
@ -2475,7 +2475,7 @@ Display a menu of files and URLs mentioned in current buffer, then
find the one you select (@code{ffap-menu}).
@end table
@node Amusements, Packages, Hyperlinking, Top
@node Amusements
@section Other Amusements
@cindex boredom

2
doc/emacs/modes.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Modes, Indentation, International, Top
@node Modes
@chapter Major and Minor Modes
Emacs contains many @dfn{editing modes} that alter its basic

2
doc/emacs/msdog.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Microsoft Windows, Manifesto, Mac OS / GNUstep, Top
@node Microsoft Windows
@appendix Emacs and Microsoft Windows/MS-DOS
@cindex Microsoft Windows
@cindex MS-Windows, Emacs peculiarities

2
doc/emacs/mule.texi
View file

@ -1,7 +1,7 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node International, Modes, Frames, Top
@node International
@chapter International Character Set Support
@c This node is referenced in the tutorial. When renaming or deleting
@c it, the tutorial needs to be adjusted. (TUTORIAL.de)

2
doc/emacs/programs.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Programs, Building, Text, Top
@node Programs
@chapter Editing Programs
@cindex Lisp editing
@cindex C editing

2
doc/emacs/regs.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Registers, Display, Killing, Top
@node Registers
@chapter Registers
@cindex registers

2
doc/emacs/screen.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Screen, User Input, Acknowledgments, Top
@node Screen
@chapter The Organization of the Screen
@cindex screen
@cindex frame

10
doc/emacs/search.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Search, Fixit, Display, Top
@node Search
@chapter Searching and Replacement
@cindex searching
@cindex finding strings within text
@ -981,7 +981,7 @@ command @code{expand-region-abbrevs} (@pxref{Expanding Abbrevs}).
* Query Replace:: How to use querying.
@end menu
@node Unconditional Replace, Regexp Replace, Replace, Replace
@node Unconditional Replace
@subsection Unconditional Replacement
@findex replace-string
@ -1011,7 +1011,7 @@ surrounded by word boundaries.
@xref{Replacement and Case}, for details about case-sensitivity in
replace commands.
@node Regexp Replace, Replacement and Case, Unconditional Replace, Replace
@node Regexp Replace
@subsection Regexp Replacement
@findex replace-regexp
@ -1098,7 +1098,7 @@ M-x replace-regexp @key{RET} ^.\@{0,72\@}$ @key{RET}
\,(format "%-72sABC%05d" \& \#) @key{RET}
@end example
@node Replacement and Case, Query Replace, Regexp Replace, Replace
@node Replacement and Case
@subsection Replace Commands and Case
If the first argument of a replace command is all lower case, the
@ -1130,7 +1130,7 @@ exactly as given, with no case conversion. Likewise, if either
@code{case-replace} or @code{case-fold-search} is set to @code{nil},
replacement is done without case conversion.
@node Query Replace,, Replacement and Case, Replace
@node Query Replace
@subsection Query Replace
@cindex query replace

50
doc/emacs/text.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Text, Programs, Indentation, Top
@node Text
@chapter Commands for Human Languages
@cindex text
@cindex manipulating text
@ -34,7 +34,7 @@ publish them in many formats.
@cindex mode, nXML
@findex nxml-mode
Emacs has other major modes for text which contains ``embedded''
commands, such as @TeX{} and La@TeX{} (@pxref{TeX Mode}); HTML and
commands, such as @TeX{} and @LaTeX{} (@pxref{TeX Mode}); HTML and
SGML (@pxref{HTML Mode}); XML
@ifinfo
(@pxref{Top,The nXML Mode Manual,,nxml-mode, nXML Mode});
@ -1372,7 +1372,7 @@ etc.
export and publication. To export the current buffer, type @kbd{C-c
C-e} (@code{org-export}) anywhere in an Org buffer. This command
prompts for an export format; currently supported formats include
HTML, La@TeX{}, OpenDocument (@file{.odt}), and PDF. Some formats,
HTML, @LaTeX{}, OpenDocument (@file{.odt}), and PDF. Some formats,
such as PDF, require certain system tools to be installed.
@vindex org-publish-project-alist
@ -1405,11 +1405,11 @@ This is an example.
@node TeX Mode
@section @TeX{} Mode
@cindex @TeX{} mode
@cindex La@TeX{} mode
@cindex @LaTeX{} mode
@cindex Sli@TeX{} mode
@cindex Doc@TeX{} mode
@cindex mode, @TeX{}
@cindex mode, La@TeX{}
@cindex mode, @LaTeX{}
@cindex mode, Sli@TeX{}
@cindex mode, Doc@TeX{}
@findex tex-mode
@ -1422,15 +1422,15 @@ This is an example.
Emacs provides special major modes for editing files written in
@TeX{} and its related formats. @TeX{} is a powerful text formatter
written by Donald Knuth; like GNU Emacs, it is free software.
La@TeX{} is a simplified input format for @TeX{}, implemented using
@LaTeX{} is a simplified input format for @TeX{}, implemented using
@TeX{} macros. Doc@TeX{} is a special file format in which the
La@TeX{} sources are written, combining sources with documentation.
Sli@TeX{} is an obsolete special form of La@TeX{}.@footnote{It has
@LaTeX{} sources are written, combining sources with documentation.
Sli@TeX{} is an obsolete special form of @LaTeX{}.@footnote{It has
been replaced by the @samp{slides} document class, which comes with
La@TeX{}.}
@LaTeX{}.}
@vindex tex-default-mode
@TeX{} mode has four variants: Plain @TeX{} mode, La@TeX{} mode,
@TeX{} mode has four variants: Plain @TeX{} mode, @LaTeX{} mode,
Doc@TeX{} mode, and Sli@TeX{} mode. These distinct major modes differ
only slightly, and are designed for editing the four different
formats. Emacs selects the appropriate mode by looking at the
@ -1450,13 +1450,13 @@ which are not documented in this manual:
@itemize @bullet
@item
Bib@TeX{} mode is a major mode for Bib@TeX{} files, which are commonly
used for keeping bibliographic references for La@TeX{} documents. For
used for keeping bibliographic references for @LaTeX{} documents. For
more information, see the documentation string for the command
@code{bibtex-mode}.
@item
The Ref@TeX{} package provides a minor mode which can be used with
La@TeX{} mode to manage bibliographic references.
@LaTeX{} mode to manage bibliographic references.
@ifinfo
@xref{Top,The Ref@TeX{} Manual,,reftex}.
@end ifinfo
@ -1561,23 +1561,23 @@ is useful for the various motion commands and automatic match display
to work with them.
@node LaTeX Editing
@subsection La@TeX{} Editing Commands
@subsection @LaTeX{} Editing Commands
La@TeX{} mode provides a few extra features not applicable to plain
@LaTeX{} mode provides a few extra features not applicable to plain
@TeX{}:
@table @kbd
@item C-c C-o
Insert @samp{\begin} and @samp{\end} for La@TeX{} block and position
Insert @samp{\begin} and @samp{\end} for @LaTeX{} block and position
point on a line between them (@code{tex-latex-block}).
@item C-c C-e
Close the innermost La@TeX{} block not yet closed
Close the innermost @LaTeX{} block not yet closed
(@code{tex-close-latex-block}).
@end table
@findex tex-latex-block
@kindex C-c C-o @r{(La@TeX{} mode)}
In La@TeX{} input, @samp{\begin} and @samp{\end} tags are used to
@kindex C-c C-o @r{(@LaTeX{} mode)}
In @LaTeX{} input, @samp{\begin} and @samp{\end} tags are used to
group blocks of text. To insert a block, type @kbd{C-c C-o}
(@code{tex-latex-block}). This prompts for a block type, and inserts
the appropriate matching @samp{\begin} and @samp{\end} tags, leaving a
@ -1586,14 +1586,14 @@ blank line between the two and moving point there.
@vindex latex-block-names
When entering the block type argument to @kbd{C-c C-o}, you can use
the usual completion commands (@pxref{Completion}). The default
completion list contains the standard La@TeX{} block types. If you
completion list contains the standard @LaTeX{} block types. If you
want additional block types for completion, customize the list
variable @code{latex-block-names}.
@findex tex-close-latex-block
@kindex C-c C-e @r{(La@TeX{} mode)}
@kindex C-c C-e @r{(@LaTeX{} mode)}
@findex latex-electric-env-pair-mode
In La@TeX{} input, @samp{\begin} and @samp{\end} tags must balance.
In @LaTeX{} input, @samp{\begin} and @samp{\end} tags must balance.
You can use @kbd{C-c C-e} (@code{tex-close-latex-block}) to insert an
@samp{\end} tag which matches the last unmatched @samp{\begin}. It
also indents the @samp{\end} to match the corresponding @samp{\begin},
@ -1670,7 +1670,7 @@ such as @code{"/tmp"}.
The buffer's @TeX{} variant determines what shell command @kbd{C-c
C-b} actually runs. In Plain @TeX{} mode, it is specified by the
variable @code{tex-run-command}, which defaults to @code{"tex"}. In
La@TeX{} mode, it is specified by @code{latex-run-command}, which
@LaTeX{} mode, it is specified by @code{latex-run-command}, which
defaults to @code{"latex"}. The shell command that @kbd{C-c C-v} runs
to view the @file{.dvi} output is determined by the variable
@code{tex-dvi-view-command}, regardless of the @TeX{} variant. The
@ -1725,9 +1725,9 @@ after. The lines containing the two strings are included in the header.
If @samp{%**start of header} does not appear within the first 100 lines of
the buffer, @kbd{C-c C-r} assumes that there is no header.
In La@TeX{} mode, the header begins with @samp{\documentclass} or
In @LaTeX{} mode, the header begins with @samp{\documentclass} or
@samp{\documentstyle} and ends with @samp{\begin@{document@}}. These
are commands that La@TeX{} requires you to use in any case, so nothing
are commands that @LaTeX{} requires you to use in any case, so nothing
special needs to be done to identify the header.
@findex tex-file
@ -1769,7 +1769,7 @@ Variables}.
@findex tex-bibtex-file
@kindex C-c TAB @r{(@TeX{} mode)}
@vindex tex-bibtex-command
For La@TeX{} files, you can use Bib@TeX{} to process the auxiliary
For @LaTeX{} files, you can use Bib@TeX{} to process the auxiliary
file for the current buffer's file. Bib@TeX{} looks up bibliographic
citations in a data base and prepares the cited references for the
bibliography section. The command @kbd{C-c @key{TAB}}

8
doc/emacs/trouble.texi
View file

@ -133,7 +133,7 @@ a command, but you can think of it as canceling a command that already
finished executing. @xref{Undo}, for more information about the undo
facility.
@node Lossage, Bugs, Quitting, Top
@node Lossage
@section Dealing with Emacs Trouble
This section describes how to recognize and deal with situations in
@ -373,7 +373,7 @@ program.
emergency escape---but there are cases where it won't work, when
system call hangs or when Emacs is stuck in a tight loop in C code.
@node Bugs, Contributing, Lossage, Top
@node Bugs
@section Reporting Bugs
@cindex bugs
@ -1064,7 +1064,7 @@ Please help us keep up with the workload by designing the patch in a
form that is clearly safe to install.
@end itemize
@node Contributing, Service, Bugs, Top
@node Contributing
@section Contributing to Emacs Development
@cindex contributing to Emacs
@ -1089,7 +1089,7 @@ See the Emacs project page
For more information on how to contribute, see the @file{etc/CONTRIBUTE}
file in the Emacs distribution.
@node Service, Copying, Contributing, Top
@node Service
@section How To Get Help with GNU Emacs
If you need help installing, using or changing GNU Emacs, there are two

2
doc/emacs/windows.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Windows, Frames, Buffers, Top
@node Windows
@chapter Multiple Windows
@cindex windows in Emacs
@cindex multiple windows in Emacs

2
doc/emacs/xresources.texi
View file

@ -2,7 +2,7 @@
@c Copyright (C) 1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node X Resources, Antinews, Emacs Invocation, Top
@node X Resources
@appendix X Options and Resources
You can customize some X-related aspects of Emacs behavior using X

5
doc/lispintro/ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-29 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi: Nuke hand-written node pointers.
(dolist, dotimes): Fix sectioning.
2012-05-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (MKDIR_P): New, set by configure.

731
doc/lispintro/emacs-lisp-intro.texi
View file

File diff suppressed because it is too large Load diff

105
doc/lispref/ChangeLog
View file

@ -1,3 +1,108 @@
2012-06-11 Chong Yidong <cyd@gnu.org>
* display.texi (ImageMagick Images): ImageMagick now supports the
:background property.
2012-06-10 Dmitry Antipov <dmantipov@yandex.ru>
* internals.texi (Garbage Collection): Typo fix.
2012-06-09 Chong Yidong <cyd@gnu.org>
* text.texi (Special Properties): Clarify the meaning of a list of
faces in the `face' property.
* display.texi (Face Remapping): Minor clarification.
2012-06-08 Chong Yidong <cyd@gnu.org>
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 Dmitry Antipov <dmantipov@yandex.ru>
* internals.text (Garbage Collection): Document new
vector management code and vectorlike_header structure.
2012-06-03 Chong Yidong <cyd@gnu.org>
* modes.texi (Mode Line Data): Use "mode line construct"
terminology for consistency.
2012-05-27 Glenn Morris <rgm@gnu.org>
* abbrevs.texi, advice.texi, anti.texi, backups.texi:
* buffers.texi, commands.texi, compile.texi, control.texi:
* customize.texi, debugging.texi, display.texi, doclicense.texi:
* edebug.texi, elisp.texi, errors.texi, eval.texi, files.texi:
* frames.texi, functions.texi, gpl.texi, hash.texi, help.texi:
* hooks.texi, index.texi, internals.texi, intro.texi, keymaps.texi:
* lists.texi, loading.texi, macros.texi, maps.texi, markers.texi:
* minibuf.texi, modes.texi, nonascii.texi, numbers.texi:
* objects.texi, os.texi, package.texi, positions.texi:
* processes.texi, searching.texi, sequences.texi, streams.texi:
* strings.texi, symbols.texi, syntax.texi, text.texi, tips.texi:
* variables.texi, windows.texi: Nuke hand-written node pointers.
2012-05-27 Chong Yidong <cyd@gnu.org>
* functions.texi (Obsolete Functions):
Fix doc for set-advertised-calling-convention.
* modes.texi (Mode Help): Fix describe-mode.
* display.texi (Face Functions): Fix define-obsolete-face-alias.
* variables.texi (Variable Aliases): Fix make-obsolete-variable.
2012-05-27 Martin Rudalics <rudalics@gmx.at>
* commands.texi (Recursive Editing): recursive-edit is a command.
* compile.texi (Docs and Compilation):
byte-compile-dynamic-docstrings is an option.
* debugging.texi (Invoking the Debugger): debug is a command.
* display.texi (Progress): progress-reporter-update and
progress-reporter-force-update have VALUE argument optional.
(Animated Images): Use non-@code{nil} instead of non-nil.
* files.texi (Format Conversion Round-Trip):
Use non-@code{nil} instead of non-nil.
* frames.texi (Creating Frames): make-frame is a command.
(Input Focus): select-frame is a command.
(Pointer Shape): void-text-area-pointer is an option.
* help.texi (Describing Characters): read-kbd-macro is a command.
(Help Functions): describe-prefix-bindings is a command.
* markers.texi (Creating Markers): Both arguments of copy-marker
are optional.
* minibuf.texi (Reading File Names): Use @kbd instead of @code.
* modes.texi (Mode Line Variables): mode-line-remote and
mode-line-client are not options.
(Imenu): imenu-add-to-menubar is a command.
(SMIE Indentation Helpers): Use non-@code{nil} instead of non-nil.
* os.texi (Sound Output): play-sound-file is a command.
* package.texi (Package Archives): Use @key{RET} instead of @kbd{RET}.
* processes.texi (Signals to Processes):
Use @key{RET} instead of @code{RET}.
(Signals to Processes): signal-process is a command.
* text.texi (Clickable Text): Use @key{RET} instead of @kbd{RET}.
(Base 64): base64-encode-string is not a command while
base64-decode-region is.
* windows.texi (Switching Buffers): pop-to-buffer is a command.
2012-05-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (MKDIR_P): New, set by configure.

19
doc/lispref/abbrevs.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1994, 1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Abbrevs, Processes, Syntax Tables, Top
@node Abbrevs
@chapter Abbrevs and Abbrev Expansion
@cindex abbrev
@c @cindex abbrev table Redundant with "abbrev".
@ -56,7 +56,7 @@ expanded in the buffer. For the user-level commands for abbrevs, see
Which properties have which effect.
@end menu
@node Abbrev Tables, Defining Abbrevs, Abbrevs, Abbrevs
@node Abbrev Tables
@section Abbrev Tables
This section describes how to create and manipulate abbrev tables.
@ -123,8 +123,7 @@ the system abbrevs. (The mode or package using @var{name} is supposed
to add these to @var{name} separately.)
@end defun
@node Defining Abbrevs, Abbrev Files, Abbrev Tables, Abbrevs
@comment node-name, next, previous, up
@node Defining Abbrevs
@section Defining Abbrevs
@code{define-abbrev} is the low-level basic function for defining an
@ -179,7 +178,7 @@ behavior of the functions in this section; it is examined by their
callers.
@end defopt
@node Abbrev Files, Abbrev Expansion, Defining Abbrevs, Abbrevs
@node Abbrev Files
@section Saving Abbrevs in Files
A file of saved abbrev definitions is actually a file of Lisp code.
@ -230,8 +229,7 @@ define the same abbrevs. If @var{filename} is @code{nil} or omitted,
@code{abbrev-file-name} is used. This function returns @code{nil}.
@end deffn
@node Abbrev Expansion, Standard Abbrev Tables, Abbrev Files, Abbrevs
@comment node-name, next, previous, up
@node Abbrev Expansion
@section Looking Up and Expanding Abbreviations
Abbrevs are usually expanded by certain interactive commands,
@ -367,8 +365,7 @@ definitions of @code{local-abbrev-table} and @code{text-mode-abbrev-table}.
nil t)))
@end smallexample
@node Standard Abbrev Tables, Abbrev Properties, Abbrev Expansion, Abbrevs
@comment node-name, next, previous, up
@node Standard Abbrev Tables
@section Standard Abbrev Tables
Here we list the variables that hold the abbrev tables for the
@ -410,7 +407,7 @@ of the local abbrev table used in Emacs Lisp mode. @xref{Abbrev Table
Properties}.
@end defvar
@node Abbrev Properties, Abbrev Table Properties, Standard Abbrev Tables, Abbrevs
@node Abbrev Properties
@section Abbrev Properties
Abbrevs have properties, some of which influence the way they work.
@ -450,7 +447,7 @@ same pattern of capitalization. It also disables the code that
modifies the capitalization of the expansion.
@end table
@node Abbrev Table Properties, , Abbrev Properties, Abbrevs
@node Abbrev Table Properties
@section Abbrev Table Properties
Like abbrevs, abbrev tables have properties, some of which influence

2
doc/lispref/advice.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Advising Functions, Debugging, Byte Compilation, Top
@node Advising Functions
@chapter Advising Emacs Lisp Functions
@cindex advising functions

2
doc/lispref/anti.texi
View file

@ -5,7 +5,7 @@
@c This node must have no pointers.
@node Antinews, GNU Free Documentation License, Packaging, Top
@node Antinews
@appendix Emacs 23 Antinews
@c Update the elisp.texi Antinews menu entry with the above version number.

2
doc/lispref/backups.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1995, 1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Backups and Auto-Saving, Buffers, Files, Top
@node Backups and Auto-Saving
@chapter Backups and Auto-Saving
@cindex backups and auto-saving

4
doc/lispref/buffers.texi
View file

@ -3,7 +3,7 @@
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Buffers, Windows, Backups and Auto-Saving, Top
@node Buffers
@chapter Buffers
@cindex buffer
@ -34,7 +34,6 @@ not be displayed in any windows.
@end menu
@node Buffer Basics
@comment node-name, next, previous, up
@section Buffer Basics
@ifnottex
@ -588,7 +587,6 @@ current buffer is used.
@end defun
@node Modification Time
@comment node-name, next, previous, up
@section Buffer Modification Time
@cindex comparing file modification time
@cindex modification time of buffer

9
doc/lispref/commands.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Command Loop, Keymaps, Minibuffers, Top
@node Command Loop
@chapter Command Loop
@cindex editor command loop
@cindex command loop
@ -286,7 +286,6 @@ used.
@end defun
@node Interactive Codes
@comment node-name, next, previous, up
@subsection Code Characters for @code{interactive}
@cindex interactive code description
@cindex description for interactive codes
@ -508,7 +507,6 @@ argument value. Completion, Existing, Prompt.
@end table
@node Interactive Examples
@comment node-name, next, previous, up
@subsection Examples of Using @code{interactive}
@cindex examples of using @code{interactive}
@cindex @code{interactive}, examples of using
@ -783,7 +781,6 @@ Here is another example that contrasts direct and indirect calls to
@end example
@node Command Loop Info
@comment node-name, next, previous, up
@section Information from the Command Loop
The editor command loop sets several Lisp variables to keep status
@ -3210,7 +3207,7 @@ a recursive edit but also provides the other features of the debugger.
Recursive editing levels are also used when you type @kbd{C-r} in
@code{query-replace} or use @kbd{C-x q} (@code{kbd-macro-query}).
@defun recursive-edit
@deffn Command recursive-edit
@cindex suspend evaluation
This function invokes the editor command loop. It is called
automatically by the initialization of Emacs, to let the user begin
@ -3237,7 +3234,7 @@ then type @kbd{C-M-c} to exit and continue executing @code{simple-rec}.
(simple-rec)
@result{} nil
@end example
@end defun
@end deffn
@deffn Command exit-recursive-edit
This function exits from the innermost recursive edit (including

7
doc/lispref/compile.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1994, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Byte Compilation, Advising Functions, Loading, Top
@node Byte Compilation
@chapter Byte Compilation
@cindex byte compilation
@cindex byte-code
@ -80,7 +80,6 @@ whereas the byte-compiled code required less than 4 seconds. These
results are representative, but actual results may vary.
@node Compilation Functions
@comment node-name, next, previous, up
@section Byte-Compilation Functions
@cindex compilation functions
@ -290,10 +289,10 @@ is by adding this string to the file's first line:
-*-byte-compile-dynamic-docstrings: nil;-*-
@end example
@defvar byte-compile-dynamic-docstrings
@defopt byte-compile-dynamic-docstrings
If this is non-@code{nil}, the byte compiler generates compiled files
that are set up for dynamic loading of documentation strings.
@end defvar
@end defopt
@node Dynamic Loading
@section Dynamic Loading of Individual Functions

2
doc/lispref/control.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Control Structures, Variables, Evaluation, Top
@node Control Structures
@chapter Control Structures
@cindex special forms for control structures
@cindex control structures

2
doc/lispref/customize.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1997-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Customization, Loading, Macros, Top
@node Customization
@chapter Customization Settings
@cindex customization item

6
doc/lispref/debugging.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1994, 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Debugging, Read and Print, Advising Functions, Top
@node Debugging
@chapter Debugging Lisp Programs
There are several ways to find and investigate problems in an Emacs
@ -447,7 +447,7 @@ erroneously show up in this list.
Here we describe in full detail the function @code{debug} that is used
to invoke the debugger.
@defun debug &rest debugger-args
@deffn Command debug &rest debugger-args
This function enters the debugger. It switches buffers to a buffer
named @file{*Backtrace*} (or @file{*Backtrace*<2>} if it is the second
recursive entry to the debugger, etc.), and fills it with information
@ -534,7 +534,7 @@ are printed on the top line of the buffer. You can use this feature to
display messages---for example, to remind yourself of the conditions
under which @code{debug} is called.
@end table
@end defun
@end deffn
@node Internals of Debugger
@subsection Internals of the Debugger

104
doc/lispref/display.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1995, 1998-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Display, System Interface, Processes, Top
@node Display
@chapter Emacs Display
This chapter describes a number of features related to the display
@ -413,7 +413,7 @@ This function calls @code{progress-reporter-update}, so the first
message is printed immediately.
@end defun
@defun progress-reporter-update reporter value
@defun progress-reporter-update reporter &optional value
This function does the main work of reporting progress of your
operation. It displays the message of @var{reporter}, followed by
progress percentage determined by @var{value}. If percentage is zero,
@ -434,7 +434,7 @@ try to reduce the number of calls to it: resulting overhead will most
likely negate your effort.
@end defun
@defun progress-reporter-force-update reporter value &optional new-message
@defun progress-reporter-force-update reporter &optional value new-message
This function is similar to @code{progress-reporter-update} except
that it prints a message in the echo area unconditionally.
@ -1927,11 +1927,16 @@ exactly what the @code{defface} says.
@cindex face specification
The @var{spec} argument is a @dfn{face specification}, which states
how the face should appear on different kinds of terminals. It should
be an alist whose elements each have the form @code{(@var{display}
@var{atts})}. @var{display} specifies a class of terminals (see
below), while @var{atts} is a property list of face attributes and
their values, specifying the appearance of the face on matching
terminals
be an alist whose elements each have the form
@example
(@var{display} . @var{plist})
@end example
@noindent
@var{display} specifies a class of terminals (see below), while
@var{plist} is a property list of face attributes and their values,
specifying how the face appears on such terminals
@iftex
(see the next section for details about face attributes).
@end iftex
@ -1947,8 +1952,8 @@ for that frame. There are three possibilities for @var{display}:
@table @asis
@item @code{default}
This element of @var{spec} doesn't match any frames; instead, it
specifies defaults that apply to all frames. This kind of element, if
used, must be the first element of @var{spec}. Each of the following
specifies defaults that apply to all frames. This element, if used,
must be the first element of @var{spec}. Each of the following
elements can override any or all of these defaults.
@item @code{t}
@ -2066,16 +2071,14 @@ attribute is ignored.
@table @code
@item :family
Font family or fontset (a string). @xref{Fonts,,, emacs, The GNU
Emacs Manual}. If you specify a font family name, the wild-card
characters @samp{*} and @samp{?} are allowed. The function
@code{font-family-list}, described below, returns a list of available
family names. @xref{Fontsets}, for information about fontsets.
Emacs Manual}, for more information about font families; the function
@code{font-family-list} (see below) returns a list of available family
names. @xref{Fontsets}, for information about fontsets.
@item :foundry
The name of the @dfn{font foundry} for the font family specified by
the @code{:family} attribute (a string). The wild-card characters
@samp{*} and @samp{?} are allowed. @xref{Fonts,,, emacs, The GNU
Emacs Manual}.
the @code{:family} attribute (a string). @xref{Fonts,,, emacs, The
GNU Emacs Manual}.
@item :width
Relative proportionate character width, also known as the character
@ -2221,16 +2224,6 @@ attributes from faces earlier in the list override those from later
faces.
@end table
For compatibility with Emacs 20, you can also specify values for two
``fake'' face attributes: @code{:bold} and @code{:italic}. Their
values must be either @code{t} or @code{nil}; a value of
@code{unspecified} is not allowed. Setting @code{:bold} to @code{t}
is equivalent to setting the @code{:weight} attribute to @code{bold},
and setting it to @code{nil} is equivalent to setting @code{:weight}
to @code{normal}. Setting @code{:italic} to @code{t} is equivalent to
setting the @code{:slant} attribute to @code{italic}, and setting it
to @code{nil} is equivalent to setting @code{:slant} to @code{normal}.
@defun font-family-list &optional frame
This function returns a list of available font family names. The
optional argument @var{frame} specifies the frame on which the text is
@ -2518,39 +2511,34 @@ Scale,,, emacs, The GNU Emacs Manual}).
The value of this variable is an alist whose elements have the form
@code{(@var{face} . @var{remapping})}. This causes Emacs to display
any text having the face @var{face} with @var{remapping}, rather than
the ordinary definition of @var{face}. @var{remapping} may be any
face specification suitable for a @code{face} text property: either a
face name, or a property list of attribute/value pairs, or a list in
which each element is either a face name or a property list
(@pxref{Special Properties}).
the ordinary definition of @var{face}.
@var{remapping} may be any face specification suitable for a
@code{face} text property: either a face (i.e.@: a face name or a
property list of attribute/value pairs), or a list of faces. For
details, see the description of the @code{face} text property in
@ref{Special Properties}. @var{remapping} serves as the complete
specification for the remapped face---it replaces the normal
definition of @var{face}, instead of modifying it.
If @code{face-remapping-alist} is buffer-local, its local value takes
effect only within that buffer.
Two points bear emphasizing:
Note: face remapping is non-recursive. If @var{remapping} references
the same face name @var{face}, either directly or via the
@code{:inherit} attribute of some other face in @var{remapping}, that
reference uses the normal definition of @var{face}. For instance, if
the @code{mode-line} face is remapped using this entry in
@code{face-remapping-alist}:
@enumerate
@item
@var{remapping} serves as the complete specification for the remapped
face---it replaces the normal definition of @var{face}, instead of
modifying it.
@item
If @var{remapping} references the same face name @var{face}, either
directly or via the @code{:inherit} attribute of some other face in
@var{remapping}, that reference uses the normal definition of
@var{face}. In other words, the remapping cannot be recursive.
For instance, if the @code{mode-line} face is remapped using this
entry in @code{face-remapping-alist}:
@example
(mode-line italic mode-line)
@end example
@noindent
then the new definition of the @code{mode-line} face inherits from the
@code{italic} face, and the @emph{normal} (non-remapped) definition of
@code{mode-line} face.
@end enumerate
@end defvar
The following functions implement a higher-level interface to
@ -2662,11 +2650,13 @@ makes @code{modeline} an alias for the @code{mode-line} face.
(put 'modeline 'face-alias 'mode-line)
@end example
@defun define-obsolete-face-alias obsolete-face current-face &optional when
This function defines a face alias and marks it as obsolete, indicating
that it may be removed in future. The optional string @var{when}
indicates when the face was made obsolete (for example, a release number).
@end defun
@defmac define-obsolete-face-alias obsolete-face current-face when
This macro defines @code{obsolete-face} as an alias for
@var{current-face}, and also marks it as obsolete, indicating that it
may be removed in future. @var{when} should be a string indicating
when @code{obsolete-face} was made obsolete (usually a version number
string).
@end defmac
@node Auto Faces
@subsection Automatic Face Assignment
@ -4613,6 +4603,12 @@ JPEG files, add @code{JPG} to this list.
image descriptor properties:
@table @code
@item :background @var{background}
@var{background}, if non-@code{nil}, should be a string specifying a
color, which is used as the image's background color if the image
supports transparency. If the value is @code{nil}, it defaults to the
frame's background color.
@item :width, :height
The @code{:width} and @code{:height} keywords are used for scaling the
image. If only one of them is specified, the other one will be
@ -4904,7 +4900,7 @@ create animation. Currently, Emacs only supports animated GIF files.
The following functions related to animated images are available.
@defun image-animated-p image
This function returns non-nil if @var{image} can be animated.
This function returns non-@code{nil} if @var{image} can be animated.
The actual return value is a cons @code{(@var{nimages} . @var{delay})},
where @var{nimages} is the number of frames and @var{delay} is the
delay in seconds between them.

2
doc/lispref/doclicense.texi
View file

@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c The GNU Free Documentation License.
@node GNU Free Documentation License, GPL, Antinews, Top
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@center Version 1.3, 3 November 2008

2
doc/lispref/edebug.texi
View file

@ -9,7 +9,7 @@
@c , Bugs and Todo List, Top, Top
@node Edebug, Syntax Errors, Debugger, Debugging
@node Edebug
@section Edebug
@cindex Edebug debugging facility

4
doc/lispref/elisp.texi
View file

@ -156,7 +156,7 @@ Cover art by Etienne Suvasa.
@ifnottex
@node Top, Introduction, (dir), (dir)
@node Top
@top Emacs Lisp
@insertcopying
@ -1597,7 +1597,7 @@ Object Internals
@end ifclear
@ignore
@node New Symbols, , Index, Top
@node New Symbols
@unnumbered New Symbols Since the Previous Edition
@printindex tp

2
doc/lispref/errors.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1993, 1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Standard Errors, Standard Keymaps, GNU Emacs Internals, Top
@node Standard Errors
@appendix Standard Errors
@cindex standard errors

2
doc/lispref/eval.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1994, 1998, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Evaluation, Control Structures, Symbols, Top
@node Evaluation
@chapter Evaluation
@cindex evaluation
@cindex interpreter

18
doc/lispref/files.texi
View file

@ -3,8 +3,7 @@
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Files, Backups and Auto-Saving, Documentation, Top
@comment node-name, next, previous, up
@node Files
@chapter Files
This chapter describes the Emacs Lisp functions and variables to
@ -250,7 +249,6 @@ is permanent local, so it is unaffected by changes of major modes.
@end defvar
@node Subroutines of Visiting
@comment node-name, next, previous, up
@subsection Subroutines of Visiting
The @code{find-file-noselect} function uses two important subroutines
@ -506,7 +504,6 @@ major modes set it to @code{t} in particular buffers.
Name}).
@node Reading from Files
@comment node-name, next, previous, up
@section Reading from Files
@cindex reading from files
@ -569,7 +566,6 @@ program can read the file, use the function @code{file-local-copy}; see
@ref{Magic File Names}.
@node Writing to Files
@comment node-name, next, previous, up
@section Writing to Files
@cindex writing to files
@ -789,7 +785,6 @@ otherwise noted.
@end menu
@node Testing Accessibility
@comment node-name, next, previous, up
@subsection Testing Accessibility
@cindex accessibility of a file
@cindex file accessibility
@ -947,7 +942,6 @@ time as a list of two numbers. @xref{File Attributes}.
@end defun
@node Kinds of Files
@comment node-name, next, previous, up
@subsection Distinguishing Kinds of Files
This section describes how to distinguish various kinds of files, such
@ -1100,7 +1094,6 @@ we would have:
@xref{Buffer File Name}, for related information.
@node File Attributes
@comment node-name, next, previous, up
@subsection Other Information about Files
This section describes the functions for getting detailed
@ -1918,7 +1911,6 @@ form.
@end defun
@node Directory Names
@comment node-name, next, previous, up
@subsection Directory Names
@cindex directory name
@cindex file name of directory
@ -3133,10 +3125,10 @@ in the order of appearance in the list.
This command writes the current buffer contents into the file @var{file}
in a format based on @var{format}, which is a list of format names. It
constructs the actual format starting from @var{format}, then appending
any elements from the value of @code{buffer-file-format} with a non-nil
@var{preserve} flag (see above), if they are not already present in
@var{format}. It then updates @code{buffer-file-format} with this
format, making it the default for future saves. Except for the
any elements from the value of @code{buffer-file-format} with a
non-@code{nil} @var{preserve} flag (see above), if they are not already
present in @var{format}. It then updates @code{buffer-file-format} with
this format, making it the default for future saves. Except for the
@var{format} argument, this command is similar to @code{write-file}. In
particular, @var{confirm} has the same meaning and interactive treatment
as the corresponding argument to @code{write-file}. @xref{Definition of

10
doc/lispref/frames.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Frames, Positions, Windows, Top
@node Frames
@chapter Frames
@cindex frame
@ -108,7 +108,7 @@ for @code{framep} above.
To create a new frame, call the function @code{make-frame}.
@defun make-frame &optional alist
@deffn Command make-frame &optional alist
This function creates and returns a new frame, displaying the current
buffer.
@ -134,7 +134,7 @@ This function itself does not make the new frame the selected frame.
@xref{Input Focus}. The previously selected frame remains selected.
On graphical terminals, however, the windowing system may select the
new frame for its own reasons.
@end defun
@end deffn
@defvar before-make-frame-hook
A normal hook run by @code{make-frame} before it creates the frame.
@ -1395,7 +1395,7 @@ same meaning as for @code{select-frame} (see below). The return value
of this function is not significant.
@end defun
@defun select-frame frame &optional norecord
@deffn Command select-frame frame &optional norecord
This function selects frame @var{frame}, temporarily disregarding the
focus of the X server if any. The selection of @var{frame} lasts until
the next time the user does something to select a different frame, or
@ -1418,7 +1418,7 @@ been deleted.
In general, you should never use @code{select-frame} in a way that
could switch to a different terminal without switching back when
you're done.
@end defun
@end deffn
Emacs cooperates with the window system by arranging to select frames as
the server and window manager request. It does so by generating a

10
doc/lispref/functions.texi
View file

@ -3,7 +3,7 @@
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Functions, Macros, Variables, Top
@node Functions
@chapter Functions
A Lisp program is composed mainly of Lisp functions. This chapter
@ -1178,12 +1178,14 @@ equivalent to the following:
In addition, you can mark a certain a particular calling convention
for a function as obsolete:
@defun set-advertised-calling-convention function signature
@defun set-advertised-calling-convention function signature when
This function specifies the argument list @var{signature} as the
correct way to call @var{function}. This causes the Emacs byte
compiler to issue a warning whenever it comes across an Emacs Lisp
program that calls @var{function} any other way (however, it will
still allow the code to be byte compiled).
still allow the code to be byte compiled). @var{when} should be a
string indicating when the variable was first made obsolete (usually a
version number string).
For instance, in old versions of Emacs the @code{sit-for} function
accepted three arguments, like this
@ -1198,7 +1200,7 @@ this:
@example
(set-advertised-calling-convention
'sit-for '(seconds &optional nodisp))
'sit-for '(seconds &optional nodisp) "22.1")
@end example
@end defun

3
doc/lispref/gpl.texi
View file

@ -1,7 +1,6 @@
@c -*-texinfo-*-
@node GPL, Tips, GNU Free Documentation License, Top
@comment node-name, next, previous, up
@node GPL
@appendix GNU General Public License
@c The GNU General Public License.
@center Version 3, 29 June 2007

2
doc/lispref/hash.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Hash Tables, Symbols, Sequences Arrays Vectors, Top
@node Hash Tables
@chapter Hash Tables
@cindex hash tables
@cindex lookup tables

11
doc/lispref/help.texi
View file

@ -3,7 +3,7 @@
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Documentation, Files, Modes, Top
@node Documentation
@chapter Documentation
@cindex documentation strings
@ -34,7 +34,6 @@ Help, emacs, The GNU Emacs Manual}.
@end menu
@node Documentation Basics
@comment node-name, next, previous, up
@section Documentation Basics
@cindex documentation conventions
@cindex writing a documentation string
@ -511,7 +510,7 @@ for Meta.
@end smallexample
@end defun
@defun read-kbd-macro string &optional need-vector
@deffn Command read-kbd-macro string &optional need-vector
This function is used mainly for operating on keyboard macros, but it
can also be used as a rough inverse for @code{key-description}. You
call it with a string containing key descriptions, separated by spaces;
@ -519,7 +518,7 @@ it returns a string or vector containing the corresponding events.
(This may or may not be a single valid key sequence, depending on what
events you use; @pxref{Key Sequences}.) If @var{need-vector} is
non-@code{nil}, the return value is always a vector.
@end defun
@end deffn
@node Help Functions
@section Help Functions
@ -626,12 +625,12 @@ character, and the help character has no binding after that prefix. The
variable's default value is @code{describe-prefix-bindings}.
@end defvar
@defun describe-prefix-bindings
@deffn Command describe-prefix-bindings
This function calls @code{describe-bindings} to display a list of all
the subcommands of the prefix key of the most recent key sequence. The
prefix described consists of all but the last event of that key
sequence. (The last event is, presumably, the help character.)
@end defun
@end deffn
The following two functions are meant for modes that want to provide
help without relinquishing control, such as the ``electric'' modes.

2
doc/lispref/hooks.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1993, 1998, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Standard Hooks, Index, Standard Keymaps, Top
@node Standard Hooks
@appendix Standard Hooks
@cindex standard hooks
@cindex hook variables, list of

2
doc/lispref/index.texi
View file

@ -18,7 +18,7 @@
@c pindex is used for .el files and Unix programs
@node Index, , Standard Hooks, Top
@node Index
@unnumbered Index
@c Print the indices

32
doc/lispref/internals.texi
View file

@ -2,8 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1993, 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node GNU Emacs Internals, Standard Errors, Tips, Top
@comment node-name, next, previous, up
@node GNU Emacs Internals
@appendix GNU Emacs Internals
This chapter describes how the runnable Emacs executable is dumped with
@ -216,10 +215,23 @@ You should not change this flag in a running Emacs.
(such as by loading a library), that data is placed in normal storage.
If normal storage runs low, then Emacs asks the operating system to
allocate more memory. Different types of Lisp objects, such as
symbols, cons cells, markers, etc., are segregated in distinct blocks
in memory. (Vectors, long strings, buffers and certain other editing
types, which are fairly large, are allocated in individual blocks, one
per object, while small strings are packed into blocks of 8k bytes.)
symbols, cons cells, small vectors, markers, etc., are segregated in
distinct blocks in memory. (Large vectors, long strings, buffers and
certain other editing types, which are fairly large, are allocated in
individual blocks, one per object; small strings are packed into blocks
of 8k bytes, and small vectors are packed into blocks of 4k bytes).
@cindex vector-like objects, storage
@cindex storage of vector-like Lisp objects
Beyond the basic vector, a lot of objects like window, buffer, and
frame are managed as if they were vectors. The corresponding C data
structures include the @code{struct vectorlike_header} field whose
@code{next} field points to the next object in the chain:
@code{header.next.buffer} points to the next buffer (which could be
a killed buffer), and @code{header.next.vector} points to the next
vector in a free list. If a vector is small (smaller than or equal to
@code{VBLOCK_BYTES_MAX} bytes, see @file{alloc.c}), then
@code{header.next.nbytes} contains the vector size in bytes.
@cindex garbage collection
It is quite common to use some storage for a while, then release it
@ -244,8 +256,12 @@ might as well be reused, since no one will miss them. The second
The sweep phase puts unused cons cells onto a @dfn{free list}
for future allocation; likewise for symbols and markers. It compacts
the accessible strings so they occupy fewer 8k blocks; then it frees the
other 8k blocks. Vectors, buffers, windows, and other large objects are
individually allocated and freed using @code{malloc} and @code{free}.
other 8k blocks. Unreachable vectors from vector blocks are coalesced
to create largest possible free areas; if a free area spans a complete
4k block, that block is freed. Otherwise, the free area is recorded
in a free list array, where each entry corresponds to a free list
of areas of the same size. Large vectors, buffers, and other large
objects are allocated and freed individually.
@cindex CL note---allocate more storage
@quotation

3
doc/lispref/intro.texi
View file

@ -3,8 +3,7 @@
@c Copyright (C) 1990-1994, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Introduction, Lisp Data Types, Top, Top
@comment node-name, next, previous, up
@node Introduction
@chapter Introduction
Most of the GNU Emacs text editor is written in the programming

2
doc/lispref/keymaps.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1994, 1998-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Keymaps, Modes, Command Loop, Top
@node Keymaps
@chapter Keymaps
@cindex keymap

3
doc/lispref/lists.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Lists, Sequences Arrays Vectors, Strings and Characters, Top
@node Lists
@chapter Lists
@cindex lists
@cindex element (of list)
@ -369,7 +369,6 @@ making a copy of the list.
@end defun
@node Building Lists
@comment node-name, next, previous, up
@section Building Cons Cells and Lists
@cindex cons cells
@cindex building lists

2
doc/lispref/loading.texi
View file

@ -3,7 +3,7 @@
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Loading, Byte Compilation, Customization, Top
@node Loading
@chapter Loading
@cindex loading
@cindex library

2
doc/lispref/macros.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1995, 1998, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Macros, Customization, Functions, Top
@node Macros
@chapter Macros
@cindex macros

2
doc/lispref/maps.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1993, 1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Standard Keymaps, Standard Hooks, Standard Errors, Top
@node Standard Keymaps
@appendix Standard Keymaps
@cindex keymaps, standard

4
doc/lispref/markers.texi
View file

@ -2,7 +2,7 @@
@c This is part of the GNU Emacs Lisp Reference Manual.
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012 Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Markers, Text, Positions, Top
@node Markers
@chapter Markers
@cindex markers
@ -205,7 +205,7 @@ chapter.
@end example
@end defun
@defun copy-marker marker-or-integer &optional insertion-type
@defun copy-marker &optional marker-or-integer insertion-type
If passed a marker as its argument, @code{copy-marker} returns a
new marker that points to the same place and the same buffer as does
@var{marker-or-integer}. If passed an integer as its argument,

4
doc/lispref/minibuf.texi
View file

@ -3,7 +3,7 @@
@c Copyright (C) 1990-1995, 1998-1999, 2001-2012
@c Free Software Foundation, Inc.
@c See the file elisp.texi for copying conditions.
@node Minibuffers, Command Loop, Read and Print, Top
@node Minibuffers
@chapter Minibuffers
@cindex arguments, reading
@cindex complex arguments
@ -1404,7 +1404,7 @@ returns the pre-inserted contents of the minibuffer.
If the user types @key{RET} in an empty minibuffer, this function
returns an empty string, regardless of the value of
@var{require-match}. This is, for instance, how the user can make the
current buffer visit no file using @code{M-x set-visited-file-name}.
current buffer visit no file using @kbd{M-x set-visited-file-name}.
If @var{predicate} is non-@code{nil}, it specifies a function of one
argument that decides which file names are acceptable completion

Some files were not shown because too many files have changed in this diff Show more