Merge from trunk and resolve conflicts.

This commit is contained in:
Eli Zaretskii 2013-03-28 20:13:59 +02:00
commit d76bf86f43
2404 changed files with 87382 additions and 131780 deletions

411
ChangeLog
View file

@ -1,3 +1,412 @@
2013-03-27 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (HAVE_XKBGETKEYBOARD): Remove.
Subsumed by HAVE_XKB. All uses changed.
2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz
* lisp/eshell/em-unix.el: Moved su and sudo to...
* lisp/eshell/em-tramp.el: ...Eshell tramp module
* doc/misc/eshell.texi: Updated manual to reflect changes.
External su and sudo commands are now the default; the internal,
TRAMP-using variants can still be used by enabling the eshell-tramp
module.
2013-03-25 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac (HAVE_XKB): Define if Xkb is present.
2013-03-24 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-03-21 sys_select, sys_time: port 2013-01-30 fix to Cygwin
2013-03-18 Paul Eggert <eggert@cs.ucla.edu>
Fix bug when building Emacs with a GNU Make submake (Bug#13962).
* Makefile.in (QUIET_SUBMAKE): New macro.
(install-info, uninstall): Use it.
Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
* configure.ac (IMAGEMAGICK_MODULE): Reject 6.8.2.
We want to reject 6.8.2-3 through 6.8.3-9, but there seems to be
no way to do this in pkg-config, so make do with a reasonable
approximation.
Automate the build of ja-dic.el (Bug#13984).
* .bzrignore: Add leim/ja-dic/.
2013-03-13 Paul Eggert <eggert@cs.ucla.edu>
File synchronization fixes (Bug#13944).
* configure.ac (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
(fsync): Remove check; now done by gnulib.
* lib/fdatasync.c, lib/fsync.c, m4/fdatasync.m4, m4/fsync.m4:
New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
Merge from gnulib, incorporating:
2013-03-13 putenv: port to Solaris 10
2013-03-12 mktime: fix configure typo
2013-03-11 regex: port to mingw's recent addition of undeclared alarm
2013-03-11 putenv: avoid compilation warning on mingw
2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod.
2013-03-06 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872).
It can mess up 'configure' runs.
2013-03-05 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-man): Ignore gzip exit status.
2013-03-03 Glenn Morris <rgm@gnu.org>
* make-dist: Remove lzma (it's replaced by xz).
2013-03-01 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-02-21 putenv: port better to native Windows
2013-02-18 extern-inline: avoid compilation error with HP-UX cc
2013-02-14 putenv: fix heap corruption with mixed putenv/_putenv
2013-02-28 Ken Brown <kbrown@cornell.edu>
* configure.ac (HAVE_DATA_START): Fix test. (Bug#13818)
2013-02-25 Paul Eggert <eggert@cs.ucla.edu>
Simplify data_start configuration (Bug#13783).
* configure.ac (CRT_DIR, LIB_STANDARD, START_FILES, DATA_START)
(LD_FIRSTFLAG, ORDINARY_LINK, LIB_GCC): Remove.
(AC_CHECK_HEADERS_ONCE): Remove sys/resource.h, as it's
not always needed.
(HAVE_DATA_START): New macro.
2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz>
* lisp/eshell/em-cmpl.el: Corrected "context-related help"
keybinding in commentary.
2013-02-21 Paul Eggert <eggert@cs.ucla.edu>
Parallelize documentation builds.
This speeds up building of documentation on multiprocessor
platforms, and is motivated by Texinfo 5.0, which is much slower.
Add a toplevel rule 'make docs' to make all the documentation.
* .bzrignore: Add .dvi, .html, .ps.
* Makefile.in (DVIS, HTMLS, INFOS, PSS, DOCS): New macros.
($(DOCS), docs, vi, html, pdf, ps): New rules.
(info-real): Depend on $(INFOS) rather than doing it sequentially.
(dvi): Depend on $(DVIS) rather than doing it sequentially.
2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz>
* doc/misc/eshell.texi: Added documentation for Eshell insert
output redirection operator, >>>.
2013-02-15 Paul Eggert <eggert@cs.ucla.edu>
Fix AIX port (Bug#13650).
* configure.ac (DATA_START, DATA_SEG_BITS): Set to 0x20000000 on AIX.
2013-02-12 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/memrchr.$(O).
($(BLD)/memrchr.$(O)): New dependency.
2013-02-11 Paul Eggert <eggert@cs.ucla.edu>
Tune by using memchr and memrchr.
* .bzrignore: Add string.h.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/memrchr.c, lib/string.in.h, m4/memrchr.m4, m4/string_h.m4:
New files, from gnulib.
Merge from gnulib, incorporating:
2013-02-11 unsetenv etc.: port to Solaris 11 + GNU Emacs
2013-02-09 secure_getenv: fix C++ declaration typo
2013-02-11 Glenn Morris <rgm@gnu.org>
* configure.ac (emacs_config_options): Record some env vars.
2013-02-10 Glenn Morris <rgm@gnu.org>
* configure.ac (emacs_config_options): Strip out the (internal)
arguments --no-create and --no-recursion.
2013-02-08 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-02-08 careadlinkat: stop exporting careadlinkatcwd
The MS-Windows port can remove careadlinkatcwd at its convenience.
2013-02-08 extensions: port better to HP-UX
2013-02-06 extensions: port better to MINIX 3, HP-UX, autoheader 2.62
2013-02-06 unistd: avoid namespace pollution on non-glibc systems
2013-02-04 secure_getenv: new module [module not used by Emacs]
2013-01-30 sys_time: port to Solaris 2.6
2013-02-01 Paul Eggert <eggert@cs.ucla.edu>
Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539).
On my host, this speeds up directory-files-and-attributes by a
factor of 3, when applied to Emacs's src directory.
These functions are standardized by POSIX and are common these
days; fall back on a (slower) gnulib implementation if the host
is too old to supply them.
* .bzrignore: Add lib/dirent.h.
* lib/Makefile.am (libgnu_a_SOURCES): Add openat-die.c, save-cwd.c.
* lib/careadlinkat.c, lib/careadlinkat.h: Merge from gnulib,
incorporating: 2013-01-29 careadlinkat: do not provide careadlinkatcwd.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/dirent.in.h, lib/fdopendir.c, lib/fstatat.c, lib/openat-priv.h:
* lib/openat-proc.c, lib/openat.h, m4/dirent_h.m4, m4/fdopendir.m4:
* m4/fstatat.m4: New files, from gnulib.
* lib/openat-die.c, lib/save-cwd.c, lib/save-cwd.h: New files.
These last three are specific to Emacs and are not copied from gnulib.
They are simpler than the gnulib versions and are tuned for Emacs.
2013-02-01 Glenn Morris <rgm@gnu.org>
* make-dist: Only README files exist in lisp/ now, not README*.
2013-01-23 Giorgos Keramidas <gkeramidas@gmail.com> (tiny change)
* .bzrignore: add lib-src/blessmail.
2013-01-23 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-01-16 unistd: port to recent mingw
2013-01-19 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep): Put back a chmod that was
removed 2012-05-19. (Bug#13430)
2013-01-16 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-01-16 largefile: port better to Mac OS X 10.5
2013-01-15 stdint: fix build with Android's Bionic fox x86
2013-01-16 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac: Document that --enable-gcc-warnings emits errors.
(Bug#13448)
2013-01-13 Glenn Morris <rgm@gnu.org>
* make-dist: Add options for xz compression and no compression.
2013-01-12 Paul Eggert <eggert@cs.ucla.edu>
Enable conservative stack scanning for all architectures.
Suggested by Stefan Monnier in
<http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00183.html>.
* configure.ac (GC_MARK_STACK): Remove.
2013-01-11 Paul Eggert <eggert@cs.ucla.edu>
* lib/getopt_.h: Remove trailing CRs that crept in.
2013-01-11 Eli Zaretskii <eliz@gnu.org>
* lib/getopt_.h: Regenerate.
2013-01-10 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-01-09 stdlib: port to Solaris 2.6
2013-01-04 Glenn Morris <rgm@gnu.org>
* info/dir: Add htmlfontify.
2013-01-04 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-01-04 stdio: remove now-unnecessary stdio.c
2013-01-04 fprintftime: depend on stdio, not ignore-value
2013-01-04 fwrite: silence __wur only for older glibc versions
2013-01-04 fwrite: silence __wur without using inline
* lib/stdio.c: Remove.
* lib/stdio.in.h, lib/strftime.c: Update from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
2013-01-02 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating copyright-date changes and:
2012-12-31 dup2: work around cygwin bug
2012-12-30 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Check for GtkHandlebox.
Check for GtkTearoffMenuItem.
New enable: --enable-gtk-deprecation-warnings, default off.
(HAVE_GTK3): If above enable is off, add
-DGDK_DISABLE_DEPRECATION_WARNINGS to GTK_CFLAGS.
2012-12-30 Andreas Schwab <schwab@linux-m68k.org>
* configure.ac (TEMACS_LDFLAGS2): Don't define.
(LIBS_GNUSTEP): Set for GNUstep and substitute.
(LD_SWITCH_SYSTEM_TEMACS): Don't set for GNUstep.
2012-12-27 Glenn Morris <rgm@gnu.org>
* configure.ac (emacs_config_options): New.
Use $@ rather than undocumented $ac_configure_args.
Replace any embedded double quotes. (Bug#13274)
2012-12-27 Andreas Schwab <schwab@linux-m68k.org>
* configure.ac (SIGNALS_VIA_CHARACTERS): Also define for darwin.
(Bug#13222)
2012-12-26 Paul Eggert <eggert@cs.ucla.edu>
Revert static checking of stack smashing.
* configure.ac (WARN_CFLAGS): Omit -Wstack-protector when
configured with --enable-gcc-warnings. -Wstack-protector causes
diagnostics to be issued on Ubuntu 12.10 x86-64.
2012-12-24 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2012-12-21 AC_PROG_MKDIR_P: port workaround to pre-2.62 Autoconf
2012-12-20 AC_PROG_MKDIR_P: don't workaround if not buggy
2012-12-17 filemode, sys_stat: Handle MPX files a la AIX.
2012-12-21 Akinori MUSHA <knu@iDaemons.org> (tiny change)
* Makefile.in (install-arch-dep): Ignore chmod errors. (Bug#13233)
2012-12-16 Romain Francoise <romain@orebokech.com>
* configure.ac (acl): New option.
(HAVE_POSIX_ACL): Test for POSIX ACL support. This is typically
provided by libacl on GNU/Linux.
2012-12-14 Paul Eggert <eggert@cs.ucla.edu>
Fix permissions bugs with setgid directories etc. (Bug#13125)
* configure.ac (BSD4_2): Remove; no longer needed.
2012-12-13 Glenn Morris <rgm@gnu.org>
* info/dir: Add bovine, srecode, wisent.
2012-12-13 Andreas Schwab <schwab@suse.de>
* Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
(uninstall): Likewise. (Bug#13143)
2012-12-11 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib for 'inline' (Bug#13040), incorporating:
2012-12-11 extern-inline: avoid incompatibility with Darwin Libc
* m4/extern-inline.m4: Update from gnulib.
2012-12-11 Juanma Barranquero <lekktu@gmail.com>
* lib/makefile.w32-in (SIG2STR_H): New macro.
($(BLD)/sig2str.$(O)): Update dependencies.
2012-12-10 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (HAVE_INOTIFY): Speed up configure-time test.
There's no need to test for any of three inotify functions,
since we use all three. Check for just the first one.
2012-12-10 Daniel Colascione <dancol@dancol.org>
* .bzrignore: add src/emacs.res.
* configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
build how to compile Windows resource files; use these variables
to tell src/Makefile.in how and whether to compile resources.
2012-12-10 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
* configure.ac (inotify): New option.
(HAVE_INOTIFY): Test for inotify.
2012-12-09 Andreas Schwab <schwab@linux-m68k.org>
* configure.ac: Fix source command in .gdbinit.
Don't quote $MAKEINFO.
2012-12-09 Paul Eggert <eggert@cs.ucla.edu>
Allow spaces in some configuration vars (Bug#13078).
* configure.ac (srcdir): Don't assume $PWD lacks spaces.
(srcdir, MAKEINFO, PKG_CONFIG, PKG_CONFIG_MIN_VERSION):
All uses quoted, to allow spaces in these vars.
2012-12-08 Paul Eggert <eggert@cs.ucla.edu>
Use putenv+unsetenv instead of modifying environ directly (Bug#13070).
* lib/putenv.c, lib/unsetenv.c, m4/putenv.m4, m4/setenv.m4:
New files, copied automatically from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
2012-12-08 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in ($(BLD)/sig2str.$(O)): New dependency.
Remove a stray character at the beginning of the file.
(Bug#13026)
2012-12-08 Paul Eggert <eggert@cs.ucla.edu>
Simplify get_lim_data.
* configure.ac (ULIMIT_BREAK_VALUE): Remove.
Assume POSIX 1003.1-1988 or later for signal.h (Bug#13026).
* configure.ac (PTY_OPEN, PTY_TTY_NAME_SPRINTF):
Use SIGCHLD rather than SIGCLD.
* lib/sig2str.c, lib/sig2str.h, m4/sig2str.m4: New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BUILD)/sig2str.$(O).
2012-12-06 Glenn Morris <rgm@gnu.org>
* configure.ac: Handle info/ files with or without ".info" extension.
2012-11-30 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib for 'inline' (Bug#13040), incorporating:
2012-11-29 snippet/warn-on-use: no 'static inline'
2012-11-29 ftruncate, fts, lstat, openat, raise: no 'static inline'
2012-11-29 arctwo, md4, md5, sha1, sha256, sha512: no 'static inline'
2012-11-29 fflush, stat: no 'static inline'
2012-11-29 stdio: better 'inline'
2012-11-29 sys_stat: no 'static inline'
2012-11-29 unistd: better 'inline'
2012-11-29 c-strtod, memcoll, readutmp: no 'static inline'
2012-11-29 extern-inline: no 'static inline'
2012-11-29 sys_socket: better 'inline'
* lib/stdio.c, lib/unistd.c: New files, from gnulib.
* build-aux/snippet/warn-on-use.h, lib/gnulib.mk, lib/lstat.c:
* lib/md5.c, lib/sha1.c, lib/sha256.c, lib/sha512.c, lib/stat.c:
* lib/stdio.in.h, lib/sys_stat.in.h, lib/unistd.in.h, m4/c-strtod.m4:
* m4/extern-inline.m4, m4/gnulib-comp.m4, m4/lstat.m4, m4/md5.m4:
* m4/sha1.m4, m4/sha256.m4, m4/sha512.m4, m4/stat.m4, m4/stdio_h.m4:
* m4/sys_socket_h.m4, m4/sys_stat_h.m4, m4/unistd_h.m4:
Update from gnulib.
2012-11-27 Eli Zaretskii <eliz@gnu.org>
* make-dist (nt): Adjust to changes in names of the *.manifest files.
2012-11-24 Ken Brown <kbrown@cornell.edu>
* configure.ac (HAVE_MOUSE): Remove.
2012-11-23 Paul Eggert <eggert@cs.ucla.edu>
Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958).
@ -11703,7 +12112,7 @@
;; coding: utf-8
;; End:
Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,6 +1,6 @@
# Build Emacs from a fresh tarball or version-control checkout.
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#

View file

@ -1,5 +1,5 @@
GNU Emacs Installation Guide
Copyright (C) 1992, 1994, 1996-1997, 2000-2012
Copyright (C) 1992, 1994, 1996-1997, 2000-2013
Free Software Foundation, Inc.
See the end of the file for license conditions.
@ -656,7 +656,7 @@ Here is a complete list of the variables you may want to set.
path variables - `bindir' and `libexecdir'.
The above variables serve analogous purposes in the makefiles for all
GNU software; the following variable is specific to Emacs.
GNU software; the following variables are specific to Emacs.
`archlibdir' indicates where Emacs installs and expects the executable
files and other architecture-dependent data it uses while
@ -664,6 +664,10 @@ GNU software; the following variable is specific to Emacs.
see), is `/usr/local/libexec/emacs/VERSION/CONFIGURATION-NAME'
(where VERSION and CONFIGURATION-NAME are as described above).
`GZIP_PROG' is the name of the executable that compresses installed info,
manual, and .el files. It defaults to gzip. Setting it to
the empty string suppresses compression.
Remember that you must specify any variable values you need each time
you run `make' in the top directory. If you run `make' once to build
emacs, test it, and then run `make' again to install the files, you

View file

@ -1,4 +1,4 @@
Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copyright (C) 2002-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

View file

@ -2,7 +2,7 @@
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
# Copyright (C) 1992-2012 Free Software Foundation, Inc.
# Copyright (C) 1992-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@ -54,6 +54,9 @@
# make bootstrap
# Removes all the compiled files to force a new bootstrap from a
# clean slate, and then build in the normal way.
#
# make docs
# Make Emacs documentation files from their sources; requires makeinfo.
SHELL = /bin/sh
@ -64,6 +67,10 @@ CDPATH=
# If Make doesn't predefine MAKE, set it here.
@SET_MAKE@
# Prevent submakes from outputting "Entering directory ..." and
# "Leaving directory..." diagnostics that would mess up 'make echo-info'.
QUIET_SUBMAKE = MAKELEVEL=0
# ==================== Things `configure' Might Edit ====================
cache_file = @cache_file@
@ -445,7 +452,7 @@ install-arch-dep: src install-arch-indep install-doc
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) ; \
chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
if test "x${NO_BIN_LINK}" = x; then \
rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
@ -534,6 +541,7 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
tar -xvf - && cat > /dev/null) || exit 1; \
[ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
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 ; \
@ -568,7 +576,9 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
done )
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
# The last chmod isn't needed at present.
## The above chmods are needed because "umask 022; tar ..." is not
## guaranteed to do the right thing; eg if we are root and tar is
## preserving source permissions.
## We install only the relevant DOC file if possible
## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.
@ -603,7 +613,9 @@ install-info: info
[ -f dir ] || \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
info_misc=`cd $${thisdir}/doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \
info_misc=`cd $${thisdir}/doc/misc && \
$(QUIET_SUBMAKE) $(MAKE) -s echo-info \
`; \
cd ${srcdir}/info ; \
for elt in ${INFO_NONMISC} $${info_misc}; do \
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@ -618,6 +630,12 @@ install-info: info
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done)
## "gzip || true" is because some gzips exit with non-zero status
## if compression would not reduce the file size. Eg, the gzip in
## OpenBSD 4.9 seems to do this (2013/03). In Emacs, this can
## only happen with the tiny ctags.1 manpage. We don't really care if
## ctags.1 is compressed or not. "gzip -f" is another option here,
## but not sure if portable.
install-man:
umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
thisdir=`/bin/pwd`; \
@ -628,7 +646,7 @@ install-man:
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \
${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \
done
## Install those items from etc/ that need to end up elsewhere.
@ -690,7 +708,7 @@ uninstall:
done
-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
thisdir=`/bin/pwd`; \
(info_misc=`cd doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \
(info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
if cd $(DESTDIR)${infodir}; then \
for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd $${thisdir}; \
@ -856,13 +874,25 @@ check:
dist:
cd ${srcdir}; ./make-dist
DVIS = lispref-dvi lispintro-dvi emacs-dvi misc-dvi
HTMLS = lispref-html lispintro-html emacs-html misc-html
INFOS = lispref-info lispintro-info emacs-info misc-info
PDFS = lispref-pdf lispintro-pdf emacs-pdf misc-pdf
PSS = lispref-ps lispintro-ps emacs-ps # no misc-ps
DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
$(DOCS):
t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2
.PHONY: $(DOCS) docs pdf ps
.PHONY: info dvi dist check html info-real force-info check-info-dir
info-real:
(cd doc/emacs; $(MAKE) $(MFLAGS) info)
(cd doc/misc; $(MAKE) $(MFLAGS) info)
(cd doc/lispref; $(MAKE) $(MFLAGS) info)
(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
docs: $(DOCS)
dvi: $(DVIS)
html: $(HTMLS)
info-real: $(INFOS)
pdf: $(PDFS)
ps: $(PSS)
force-info:
# Note that man/Makefile knows how to put the info files in $(srcdir),
@ -901,12 +931,6 @@ check-info-dir: info
fi ; \
echo "info/dir is OK"
dvi:
(cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
(cd doc/misc; $(MAKE) $(MFLAGS) dvi)
(cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
(cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
#### Bootstrapping.
### This first cleans the lisp subdirectory, removing all compiled

2
README
View file

@ -1,4 +1,4 @@
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

View file

@ -9,8 +9,6 @@ documented in config.in, and this file would not be necessary.
AIX
_AIX
BSD4_2
BSD_SYSTEM
CYGWIN Compiling the Cygwin port.
__CYGWIN__ Ditto
GNU_LINUX
@ -91,7 +89,6 @@ BROKEN_NON_BLOCKING_CONNECT
BROKEN_PTY_READ_AFTER_EAGAIN
CLASH_DETECTION
DATA_SEG_BITS
DATA_START
DEFAULT_SOUND_DEVICE
DEVICE_SEP
DIRECTORY_SEP
@ -151,7 +148,6 @@ HAVE_FORK
HAVE_FREEIFADDRS
HAVE_FREETYPE
HAVE_FSEEKO
HAVE_FSYNC
HAVE_FUTIMENS
HAVE_FUTIMES
HAVE_FUTIMESAT
@ -259,7 +255,6 @@ HAVE_MEMSET
HAVE_MENUS
HAVE_MKSTEMP
HAVE_MMAP
HAVE_MOUSE
HAVE_MULTILINGUAL_MENU
HAVE_NANOTIME
HAVE_NET_IF_DL_H
@ -382,7 +377,6 @@ HAVE_WS2TCPIP_H
HAVE_XAW3D
HAVE_XFT
HAVE_XIM
HAVE_XKBGETKEYBOARD
HAVE_XPM
HAVE_XRMSETDATABASE
HAVE_XSCREENNUMBEROFSCREEN
@ -410,7 +404,6 @@ NO_EDITRES
NSIG
NSIG_MINIMUM
NULL_DEVICE
ORDINARY_LINK
PAGESIZE
PREFER_VSUSP
PTY_ITERATION
@ -420,14 +413,7 @@ PTY_TTY_NAME_SPRINTF
PURESIZE
RUN_TIME_REMAP
SETUP_SLAVE_PTY
SIGALRM
SIGCHLD
SIGHUP
SIGKILL
SIGNALS_VIA_CHARACTERS
SIGPIPE
SIGQUIT
SIGTRAP
STDC_HEADERS
SYSTEM_PURESIZE_EXTRA
SYSTEM_MALLOC
@ -437,7 +423,6 @@ TERM
TIME_WITH_SYS_TIME
TIOCSIGSEND
TM_IN_SYS_TIME
ULIMIT_BREAK_VALUE
UNIX98_PTYS
USE_TOOLKIT_SCROLL_BARS
USG_SUBTTY_WORKS

View file

@ -1,3 +1,113 @@
2013-03-18 Paul Eggert <eggert@cs.ucla.edu>
* notes/unicode: Mention some more iso-2022-7bit files (Bug#13936).
Automate the build of ja-dic.el (Bug#13984).
* notes/unicode: ja-dic.el is now UTF-8.
2013-03-16 Glenn Morris <rgm@gnu.org>
* admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi.
2013-03-16 Glenn Morris <rgm@gnu.org>
* admin.el (manual-html-mono, manual-html-node): Add -DWWW_GNU_ORG.
2013-03-13 Paul Eggert <eggert@cs.ucla.edu>
File synchronization fixes (Bug#13944).
* CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove.
* merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync.
2013-03-11 Paul Eggert <eggert@cs.ucla.edu>
* notes/unicode: Improve notes about Emacs source file encoding.
2013-03-11 Glenn Morris <rgm@gnu.org>
* admin.el (make-manuals): Add emacs-lisp-intro and some more
doc/misc manuals.
(manual-html-mono, manual-html-node, manual-txt):
Pass -I to makeinfo.
2013-03-10 Glenn Morris <rgm@gnu.org>
* admin.el (add-release-logs): Use UTC for release date.
2013-03-09 Glenn Morris <rgm@gnu.org>
* admin.el (add-release-logs): Provide interactive defaults.
Allow specification of the release date. Don't exclude gnus/.
2013-03-05 Paul Eggert <eggert@cs.ucla.edu>
* notes/unicode: Add notes about Emacs source file encoding.
2013-03-04 Paul Eggert <eggert@cs.ucla.edu>
* grammars/java-tags.wy (CHAR): Remove "('\u0000' to '\uffff')"
from summary, as this causes javat-wy.el to contain both a null byte
and a byte sequence that is not valid UTF-8, which is inconvenient.
2013-03-03 Paul Eggert <eggert@cs.ucla.edu>
* bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.
If there were a real need, it should be UTF-8 anyway.
2013-02-25 Paul Eggert <eggert@cs.ucla.edu>
Simplify data_start configuration (Bug#13783).
* CPP-DEFINES (DATA_START, ORDINARY_LINK): Remove.
2013-02-11 Paul Eggert <eggert@cs.ucla.edu>
Tune by using memchr and memrchr.
* merge-gnulib (GNULIB_MODULES): Add memrchr.
2013-02-01 Paul Eggert <eggert@cs.ucla.edu>
Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539).
* merge-gnulib (GNULIB_MODULES): Add fdopendir, fstatat, readlinkat.
(GNULIB_TOOL_FLAGS): Do not avoid at-internal, openat-h.
Avoid dup, open, opendir.
2013-01-15 Dmitry Antipov <dmantipov@yandex.ru>
* coccinelle/xsave.cocci: Semantic patch to adjust users of
XSAVE_POINTER and XSAVE_INTEGER macros.
2013-01-03 Glenn Morris <rgm@gnu.org>
* check-doc-strings: Update for CVS->bzr, moved lispref/ directory.
* emacs-pretesters, make-announcement, make-changelog-diff:
Remove files.
2012-12-14 Paul Eggert <eggert@cs.ucla.edu>
Fix permissions bugs with setgid directories etc. (Bug#13125)
* CPP-DEFINES (BSD4_2): Remove.
2012-12-08 Paul Eggert <eggert@cs.ucla.edu>
Use putenv+unsetenv instead of modifying environ directly (Bug#13070).
* merge-gnulib (GNULIB_MODULES): Add putenv, unsetenv.
Simplify get_lim_data.
* CPP-DEFINES (ULIMIT_BREAK_VALUE): Remove.
2012-12-03 Paul Eggert <eggert@cs.ucla.edu>
Assume POSIX 1003.1-1988 or later for signal.h (Bug#13026).
* CPP-DEFINES (SIGALRM, SIGCHLD, SIGHUP, SIGKILL, SIGPIPE, SIGQUIT):
Remove.
(SIGTRAP): Remove this one too, as config.h no longer defines it.
* merge-gnulib (GNULIB_MODULES): Add sig2str.
2012-11-24 Ken Brown <kbrown@cornell.edu>
* CPP-DEFINES (HAVE_MOUSE): Remove.
2012-11-23 Paul Eggert <eggert@cs.ucla.edu>
Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958).
@ -100,15 +210,14 @@
* grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
Remove.
(bovine-grammar-expand-form): Test for emacs-major-version.
(bovine-grammar-expand-form): Test for emacs-major-version.
* grammars/c.by: Add EXPLICIT to keyword tokens.
Add %provide token.
* grammars/f90.by: Add %provide token.
* grammar/grammar.wy (semantic-grammar-lexer): Remove, since it
* grammars/grammar.wy (semantic-grammar-lexer): Remove, since it
was copied to grammar.el. New %provide token to generate prefix
which conforms with Emacs conventions. Remove lexer definition,
which conforms with Emacs conventions. Remove lexer definition,
which is now in grammar.el.
2012-09-27 Glenn Morris <rgm@gnu.org>
@ -152,7 +261,7 @@
2012-09-13 Paul Eggert <eggert@cs.ucla.edu>
Simplify SIGIO usage (Bug#12408).
* CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
* CPP-DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY, NO_TERMIO): Remove.
2012-09-11 Paul Eggert <eggert@cs.ucla.edu>
@ -1640,7 +1749,7 @@
;; coding: utf-8
;; End:
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -16,9 +16,6 @@ maintainer has been found so far.
1.
==============================================================================
Richard Stallman
???
Jason Rumney
W32
@ -71,13 +68,6 @@ Jay Belanger
etc/calccard.tex
doc/misc/calc.texi
Michael Olson
ERC
lisp/erc/*
etc/ERC-NEWS
doc/misc/erc.texi
lisp/emacs-lisp/tq.el
Bastien Guerry
Org
lisp/org/*
@ -87,9 +77,6 @@ Bastien Guerry
2.
==============================================================================
Steven Tamm
MacOS
Eli Zaretskii
doc/*
lispref/*

View file

@ -1,4 +1,4 @@
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
@ -24,10 +24,6 @@ Instructions to create pretest or release tarballs, announcements, etc.
Utilities for setting version numbers and alike.
** make-announcement, make-changelog-diff
Scripts used to prepare release announcements.
* Scripts that can be used to build and test Emacs.

View file

@ -1,6 +1,6 @@
;;; admin.el --- utilities for Emacs administration
;; Copyright (C) 2001-2012 Free Software Foundation, Inc.
;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@ -28,25 +28,38 @@
(defvar add-log-time-format) ; in add-log
(defun add-release-logs (root version)
;; Does this information need to be in every ChangeLog, as opposed to
;; just the top-level one? Only if you allow changes the same
;; day as the release.
;; http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00161.html
(defun add-release-logs (root version &optional date)
"Add \"Version VERSION released.\" change log entries in ROOT.
Root must be the root of an Emacs source tree."
(interactive "DEmacs root directory: \nNVersion number: ")
Root must be the root of an Emacs source tree.
Optional argument DATE is the release date, default today."
(interactive (list (read-directory-name "Emacs root directory: ")
(read-string "Version number: "
(format "%s.%s" emacs-major-version
emacs-minor-version))
(read-string "Release date: "
(progn (require 'add-log)
(let ((add-log-time-zone-rule t))
(funcall add-log-time-format))))))
(setq root (expand-file-name root))
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
(error "%s doesn't seem to be the root of an Emacs source tree" root))
(require 'add-log)
(or date (setq date (let ((add-log-time-zone-rule t))
(funcall add-log-time-format))))
(let* ((logs (process-lines "find" root "-name" "ChangeLog"))
(entry (format "%s %s <%s>\n\n\t* Version %s released.\n\n"
(funcall add-log-time-format)
date
(or add-log-full-name (user-full-name))
(or add-log-mailing-address user-mail-address)
version)))
(dolist (log logs)
(unless (string-match "/gnus/" log)
(find-file log)
(goto-char (point-min))
(insert entry)))))
(find-file log)
(goto-char (point-min))
(insert entry))))
(defun set-version-in-file (root file version rx)
(find-file (expand-file-name file root))
@ -215,17 +228,33 @@ Root must be the root of an Emacs source tree."
(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)))
(let ((texi (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
(dest (expand-file-name "emacs-lisp-intro" dest))
dest2 dest3)
;; Mimic the atypical directory layout used for emacs-lisp-intro.
(make-directory dest)
(make-directory (setq dest2 (expand-file-name "html_node" dest)))
(manual-html-node texi dest2)
(make-directory (setq dest2 (expand-file-name "html_mono" dest)))
(manual-html-mono texi (expand-file-name "emacs-lisp-intro.html" dest2))
(make-directory (setq dest2 (expand-file-name "txt" dest)))
(manual-txt texi (expand-file-name "emacs-lisp-intro.txt" dest2))
(manual-pdf texi (expand-file-name "emacs-lisp-intro.pdf" dest))
(make-directory (setq dest2 (expand-file-name "dvi" dest)))
(make-directory (setq dest3 (expand-file-name "ps" dest)))
(manual-dvi texi (expand-file-name "emacs-lisp-intro.dvi" dest2)
(expand-file-name "emacs-lisp-intro.ps" dest3)))
;; Misc manuals
(let ((manuals '("ada-mode" "auth" "autotype" "calc" "cc-mode"
(let ((manuals '("ada-mode" "auth" "autotype" "bovine" "calc" "cc-mode"
"cl" "dbus" "dired-x" "ebrowse" "ede" "ediff"
"edt" "eieio" "emacs-mime" "epa" "erc" "ert"
"edt" "eieio" "emacs-gnutls" "emacs-mime" "epa" "erc" "ert"
"eshell" "eudc" "faq" "flymake" "forms"
"gnus" "emacs-gnutls" "idlwave" "info"
"gnus" "htmlfontify" "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")))
"reftex" "remember" "sasl" "sc" "semantic"
"ses" "sieve" "smtpmail" "speedbar" "srecode" "tramp"
"url" "vip" "viper" "widget" "wisent" "woman")))
(dolist (manual manuals)
(manual-misc-html manual root html-node-dir html-mono-dir)))
(message "Manuals created in %s" dest)))
@ -256,6 +285,11 @@ This function also edits the HTML files so that they validate as
HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
the @import directive."
(call-process "makeinfo" nil nil nil
"-D" "WWW_GNU_ORG"
"-I" (expand-file-name "../emacs"
(file-name-directory texi-file))
"-I" (expand-file-name "../misc"
(file-name-directory texi-file))
"--html" "--no-split" texi-file "-o" dest)
(with-temp-buffer
(insert-file-contents dest)
@ -277,6 +311,11 @@ the @import directive."
(unless (file-exists-p texi-file)
(error "Manual file %s not found" texi-file))
(call-process "makeinfo" nil nil nil
"-D" "WWW_GNU_ORG"
"-I" (expand-file-name "../emacs"
(file-name-directory texi-file))
"-I" (expand-file-name "../misc"
(file-name-directory texi-file))
"--html" texi-file "-o" dir)
;; Loop through the node files, fixing them up.
(dolist (f (directory-files dir nil "\\.html\\'"))
@ -308,17 +347,31 @@ the @import directive."
(defun manual-txt (texi-file dest)
"Run Makeinfo on TEXI-FILE, emitting plaintext output to DEST."
(call-process "makeinfo" nil nil nil
"-I" (expand-file-name "../emacs"
(file-name-directory texi-file))
"-I" (expand-file-name "../misc"
(file-name-directory texi-file))
"--plaintext" "--no-split" texi-file "-o" dest)
(shell-command (concat "gzip -c " dest " > " (concat dest ".gz"))))
(defun manual-pdf (texi-file dest)
"Run texi2pdf on TEXI-FILE, emitting plaintext output to DEST."
(call-process "texi2pdf" nil nil nil texi-file "-o" dest))
(call-process "texi2pdf" nil nil nil
"-I" (expand-file-name "../emacs"
(file-name-directory texi-file))
"-I" (expand-file-name "../misc"
(file-name-directory texi-file))
texi-file "-o" dest))
(defun manual-dvi (texi-file dest ps-dest)
"Run texi2dvi on TEXI-FILE, emitting dvi output to DEST.
Also generate PostScript output in PS-DEST."
(call-process "texi2dvi" nil nil nil texi-file "-o" dest)
(call-process "texi2dvi" nil nil nil
"-I" (expand-file-name "../emacs"
(file-name-directory texi-file))
"-I" (expand-file-name "../misc"
(file-name-directory texi-file))
texi-file "-o" dest)
(call-process "dvips" nil nil nil dest "-o" ps-dest)
(call-process "gzip" nil nil nil dest)
(call-process "gzip" nil nil nil ps-dest))

View file

@ -1,6 +1,6 @@
/* Allocate X colors. Used for testing with dense colormaps.
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,7 +1,7 @@
#! /usr/bin/perl
# Build Emacs in several different configurations.
# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,6 +1,6 @@
;;; bzrmerge.el --- help merge one Emacs bzr branch to another
;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: maint
@ -50,7 +50,7 @@ The list returned is sorted by oldest-first."
(call-process "bzr" nil t nil "status" "-v")
(goto-char (point-min))
(when (re-search-forward "^conflicts:\n" nil t)
(error "You still have unresolved conflicts"))
(user-error "You still have unresolved conflicts"))
(let ((merges ())
found)
(if (not (re-search-forward "^pending merges:\n" nil t))
@ -62,7 +62,7 @@ The list returned is sorted by oldest-first."
(setq found
(not (equal "unknown" (match-string 1)))))))
found)
(error "You still have uncommitted changes"))
(user-error "You still have uncommitted changes"))
;; This is really stupid, but it seems there's no easy way to figure
;; out which revisions have been merged already. The only info I can
;; find is the "pending merges" from "bzr status -v", which is not
@ -171,7 +171,7 @@ Type `y' to skip this revision,
(enable-local-eval nil))
(find-file-noselect file))
(if (buffer-modified-p)
(error "Unsaved changes in %s" (current-buffer)))
(user-error "Unsaved changes in %s" (current-buffer)))
(save-excursion
(cond
((derived-mode-p 'change-log-mode)
@ -320,10 +320,10 @@ Does not make other difference."
;; bzrmerge-add-metadata does not work when there
;; are conflicts.
(display-warning 'bzrmerge "Resolve conflicts manually.
¡BEWARE! Important metadata is kept in this Emacs session!
BEWARE! Important metadata is kept in this Emacs session!
Do not commit without re-running `M-x bzrmerge' first!"
:warning bzrmerge-warning-buffer))
(error "Resolve conflicts manually")))))
(user-error "Resolve conflicts manually")))))
(cons merge skip)))))
(defun bzrmerge (from)

View file

@ -1,4 +1,4 @@
Copyright (C) 2009-2012 Free Software Foundation, Inc.
Copyright (C) 2009-2013 Free Software Foundation, Inc.
Copyright (C) 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009

View file

@ -17,7 +17,7 @@ formal parameters, docstrings, and lispref texi.
This program is in the public domain.\n";
die $usage if @ARGV;
die $usage unless -r "src/alloc.c" && -d "CVS" && -d "lisp";
die $usage unless -r "src/alloc.c" && -d ".bzr" && -d "lisp";
my %texi_funtype;
my %texi_arglist;
@ -197,10 +197,8 @@ sub Check_function {
Show_details $show_details, $function, "@parms", $docstring;
}
my $lisprefdir;
if (-d "man/lispref") { $lisprefdir = "man/lispref"; }
elsif (-d "lispref") { $lisprefdir = "lispref"; }
else { die "Can't find lispref texi directory.\n"; }
my $lisprefdir = "doc/lispref";
die "Can't find lispref texi directory.\n" unless -d $lisprefdir;
open (FIND, "find $lisprefdir -name '*.texi' -print |") or die;
while (my $file = <FIND>) {

View file

@ -0,0 +1,11 @@
// Adjust users of XSAVE_POINTER and XSAVE_INTEGER.
@@
expression E;
@@
(
- XSAVE_POINTER (E)
+ XSAVE_POINTER (E, 0)
|
- XSAVE_INTEGER (E)
+ XSAVE_INTEGER (E, 1)
)

View file

@ -1,6 +1,6 @@
;;; cus-test.el --- tests for custom types and load problems
;; Copyright (C) 1998, 2000, 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 1998, 2000, 2002-2013 Free Software Foundation, Inc.
;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
;; Maintainer: Markus Rost <rost@math.ohio-state.edu>

View file

@ -1,6 +1,6 @@
#! /bin/sh
# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,217 +0,0 @@
Here are the guidelines for being an Emacs pretester.
If you would like to do this, say so, and I'll add you to
the pretest list.
Information for Emacs Pretesters
The purpose of Emacs pretesting is to verify that the new Emacs
distribution, about to be released, works properly on your system *with
no change whatever*, when installed following the precise
recommendations that come with the Emacs distribution.
Here are some guidelines on how to do pretesting so as to make it
helpful. All of them follow from common sense together with the
nature of the purpose and the situation.
Please save this file, and reread it when a new series of pretests
starts.
* Get the pretest from gnu/emacs/pretest/emacs-MM.0.NN.tar.gz
on alpha.gnu.org.
* After a few days of testing, if there are no problems, please report
that Emacs works for you and what configuration you are testing it on.
* If you want to communicate with other pretesters, send mail to
emacs-pretesters@gnu.org. I don't use that mailing list when I send
to you because I've found that mailing lists tend to amplify random
noise into long discussions or even arguments, and that can waste a
lot of time. But when you have a reason to ask other pretesters for
help, you can do it that way.
* It is absolutely vital that you report even the smallest change or
departure from the standard sources and procedure.
Otherwise, you are not testing the same program that we asked you to
test. Testing a different program is usually of no use whatever. It
can even cause trouble, if you fail to tell us that you tested some
other program instead of what we are about to release. We might think
that Emacs works, when in fact it has not even been tried, and might
have a glaring fault.
* Don't use a site-load.el file or a site-init.el file when you pretest.
Using either of those files means you are not testing Emacs as a typical
site would use it.
Actually, it does no harm to test Emacs with such customizations *as
well as* testing it "out of the box". Anything you do that could find
a bug is useful, as long as you make sure we know exactly what you
did. The important point is that testing with local changes is no
substitute for testing Emacs exactly as it is distributed.
* Even changing the compilation options counts as a change in the
program. The Emacs sources specify which compilation options to use.
Some of them are specified in makefiles, and some in machine-specific
configuration files. They also give you ways to override this--but if
you do, then you are not testing what ordinary users will do.
Therefore, when pretesting, it is vital to test with the default
compilation options.
(Testing with a different set of options can be useful *in addition*,
but not *instead of* the default options.)
* The machine and system configuration files of Emacs are parts of
Emacs. So when you test Emacs, you need to do it with the
configuration files that come with Emacs.
If Emacs does not come with configuration files for a certain machine,
and you test it with configuration files that don't come with Emacs,
this is effectively changing Emacs. Because the crucial fact about
the planned release is that, without changes, it doesn't work on that
machine.
To make Emacs work on that machine, we would need to install new
configuration files. That is not out of the question, since it is
safe--it certainly won't break any other machines that already work.
But you will have to rush in the legal papers to give the FSF
permission to use such a large piece of text.
* Look in the etc/MACHINES file.
The etc/MACHINES file says which configuration files to use for your
machine, so use the ones that are recommended. If you guess, you might
guess wrong and encounter spurious difficulties. What's more, if you
don't follow etc/MACHINES then you aren't helping to test that its
recommendations are valid.
The etc/MACHINES file may describe other things that you need to do
to make Emacs work on your machine. If so, you should follow these
recommendations also, for the same reason.
* Send your problem reports to bug-gnu-emacs@gnu.org.
Sometimes we won't know what to do about a system-dependent issue, and
we may need people to say what happens if you try a certain thing on a
certain system. When this happens, we'll send out a query.
* Don't delay sending information.
When you test on a system and encounter no problems, please report it
right away. That way, we will know that someone has tested Emacs on
that kind of system.
Please don't wait for several days "to see if it really works before
you say anything." Tell us right away that Emacs seems basically to
work; then, if you notice a problem a few days later, tell us
immediately about that when you see it.
It is okay if you double check things before reporting a problem, such
as to see if you can easily fix it. But don't wait very long. A good
rule to use in pretesting is always to report every problem on the
same day you encounter it, even if that means you can't find a
solution before you report the problem.
I'd much rather hear about a problem today and a solution tomorrow
than get both of them tomorrow at the same time.
* Make each bug report self-contained.
If you refer back to another message, whether from you or from someone
else, then it will be necessary for anyone who wants to investigate
the bug to find the other message. This may be difficult, it is
probably time-consuming.
To help save our time, simply copy the relevant parts of any previous
messages into your own bug report.
In particular, if we ask you for more information because a bug report
was incomplete, it is best to send me the *entire* collection of
relevant information, all together. If you send just the additional
information, that makes extra work for us. There is even a risk that
we won't remember what question you are sending the answer to.
* When you encounter a bug that manifests itself as a Lisp error,
try setting debug-on-error to t and making the bug happen again.
Then you will get a Lisp backtrace. Including that in your bug report
is very useful.
* For advice on debugging, see etc/DEBUG.
* Debugging optimized code is possible, if you compile with GCC, but
in some cases the optimized code can be confusing. If you are not
accustomed to that, recompile Emacs without -O. One way to do this is
make clean
make CFLAGS=-g
* Configure tries to figure out what kind of system you have by
compiling and linking programs which calls various functions and looks
at whether that succeeds. The file config.log contains any messages
produced by compilers while running configure, to aid debugging if
configure makes a mistake. But note that config.cache reads:
# Giving --cache-file=/dev/null disables caching, for debugging configure.
or more simply,
rm config.cache
./configure
* Don't try changing Emacs *in any way* during pretest unless it fails
to work unchanged.
* Always be precise when talking about changes you have made. Show
things rather than describing them. Use exact filenames (relative to
the main directory of the distribution), not partial ones. For
example, say "I changed Makefile" rather than "I changed the
makefile". Instead of saying "I defined the MUMBLE macro", send a
diff.
* Always use `diff -c' to make diffs. If you don't include context, it
may be hard for us to figure out where you propose to make the
changes. So we might ignore your patch.
* When you write a fix, keep in mind that we can't install a change
that *might* break other systems without the risk that it will fail to
work and therefore require an additional cycle of pretesting.
People often suggest fixing a problem by changing config.h or
src/Makefile to do something special that a particular system needs.
Sometimes it is totally obvious that such changes would break Emacs
for almost all users. We can't possibly make a change like that. All
we can do is ask you to find a fix that is safe to install.
Sometimes people send fixes that *might* be an improvement in
general--but it is hard to be sure of this. I can install such
changes some of the time, but not during pretest, when I am trying to
get a new version to work reliably as quickly as possible.
The safest changes for us to install are changes to the s- and m-
files. At least those can't break other systems.
Another safe kind of change is one that uses a conditional to make
sure it will apply only to a particular kind of system. Ordinarily,
that is a bad way to solve a problem, and I would want to find a
cleaner alternative. But the virtue of safety can make it superior at
pretest time.
* Don't suggest changes during pretest to add features or make
something cleaner. Every change risks introducing a bug, so I won't
install a change during pretest unless it is *necessary*.
* If you would like to suggest changes for purposes other than fixing
user-visible bugs, don't wait till pretest time. Instead, send them
after we have made a release that proves to be stable. That is the
easiest time to consider such suggestions. If you send them at
pretest time, we will have to defer them till later, and that might
mean we forget all about them.
* In some cases, if you don't follow these guidelines, your
information might still be useful, but we would have to do more work
to make use of it. That might cause it to fall by the wayside.
Local Variables:
mode: text
End:

View file

@ -1,5 +1,5 @@
;;; c.by -- LL grammar for C/C++ language specification
;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
;;
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; David Ponce <david@dponce.com>

View file

@ -1,6 +1,6 @@
;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
;;
;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
;;
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>

View file

@ -1,6 +1,6 @@
;;; java-tags.wy -- Semantic LALR grammar for Java
;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
;;
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
@ -154,7 +154,7 @@
%keyword CHAR "char"
%put CHAR summary
"Integral primitive type ('\u0000' to '\uffff') (0 to 65535)"
"Integral primitive type (0 to 65535)"
%keyword CLASS "class"
%put CLASS summary
@ -312,7 +312,7 @@
%keyword WHILE "while"
%put WHILE summary
"while (<expr>) <stmt> | do <stmt> while (<expr>);"
;; --------------------------
;; Official javadoc line tags
;; --------------------------
@ -340,27 +340,27 @@
%keyword _AUTHOR "@author"
%put _AUTHOR javadoc (seq 1 usage (type))
%keyword _VERSION "@version"
%put _VERSION javadoc (seq 2 usage (type))
%put _VERSION javadoc (seq 2 usage (type))
%keyword _PARAM "@param"
%put _PARAM javadoc (seq 3 usage (function) with-name t)
%put _PARAM javadoc (seq 3 usage (function) with-name t)
%keyword _RETURN "@return"
%put _RETURN javadoc (seq 4 usage (function))
%put _RETURN javadoc (seq 4 usage (function))
%keyword _EXCEPTION "@exception"
%put _EXCEPTION javadoc (seq 5 usage (function) with-name t)
%put _EXCEPTION javadoc (seq 5 usage (function) with-name t)
%keyword _THROWS "@throws"
%put _THROWS javadoc (seq 6 usage (function) with-name t)
%put _THROWS javadoc (seq 6 usage (function) with-name t)
%keyword _SEE "@see"
%put _SEE javadoc (seq 7 usage (type function variable) opt t with-ref t)
%put _SEE javadoc (seq 7 usage (type function variable) opt t with-ref t)
%keyword _SINCE "@since"
%put _SINCE javadoc (seq 8 usage (type function variable) opt t)
%put _SINCE javadoc (seq 8 usage (type function variable) opt t)
%keyword _SERIAL "@serial"
%put _SERIAL javadoc (seq 9 usage (variable) opt t)
%put _SERIAL javadoc (seq 9 usage (variable) opt t)
%keyword _SERIALDATA "@serialData"
%put _SERIALDATA javadoc (seq 10 usage (function) opt t)
%put _SERIALDATA javadoc (seq 10 usage (function) opt t)
%keyword _SERIALFIELD "@serialField"
%put _SERIALFIELD javadoc (seq 11 usage (variable) opt t)
%put _SERIALFIELD javadoc (seq 11 usage (variable) opt t)
%keyword _DEPRECATED "@deprecated"
%put _DEPRECATED javadoc (seq 12 usage (type function variable) opt t)
%put _DEPRECATED javadoc (seq 12 usage (type function variable) opt t)
%%
@ -387,7 +387,7 @@ package_declaration
;
;;; Include file token
;; ("FILE" include SYSTEM "DOCSTRING")
;; ("FILE" include SYSTEM "DOCSTRING")
import_declaration
: IMPORT qualified_name SEMICOLON
(INCLUDE-TAG $2 nil)
@ -476,7 +476,7 @@ static_initializer
;
;;; Function token
;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
constructor_declaration
: modifiers_opt constructor_declarator throwsc_opt constructor_body
(FUNCTION-TAG (car $2) nil (cdr $2)
@ -491,11 +491,11 @@ constructor_declarator
;
constructor_body
: block
: block
;
;;; Function token
;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
method_declaration
: modifiers_opt VOID method_declarator throwsc_opt method_body
(FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4)

View file

@ -1,6 +1,6 @@
;;; javascript-jv.wy -- LALR grammar for Javascript
;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
;; Copyright (C) 1998-2011 Ecma International.
;; Author: Joakim Verona

View file

@ -1,6 +1,6 @@
;;; make.by -- BY notation for Makefiles.
;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
;;
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; David Ponce <david@dponce.com>

View file

@ -1,6 +1,6 @@
;;; python.wy -- LALR grammar for Python
;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
;; 2009, 2010 Python Software Foundation; All Rights Reserved

View file

@ -1,6 +1,6 @@
;;; scheme.by -- Scheme BNF language specification
;; Copyright (C) 2001-2012 Free Software Foundation, Inc.
;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.

View file

@ -1,6 +1,6 @@
;;; srecode-template.wy --- Semantic Recoder Template parser
;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
;; Author: Eric Ludlam <zappo@gnu.org>
;; Keywords: syntax

View file

@ -1,87 +0,0 @@
#! /bin/bash
## Copyright (C) 2002-2012 Free Software Foundation, Inc.
## Author: Francesco Potorti` <pot@gnu.org>
## 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/>.
### Code:
if [ $# -ne 2 ]; then
echo "usage: $0 <old version number> <new version number>" >&2
exit 1
fi
if [ ! -f INSTALL -o ! -f configure -o ! -d lib-src ]; then
echo "this script should be run in the emacs root directory" >&2
exit 2
fi
OLD=$1
NEW=$2
outfile=emacs-$NEW.announce
oldtag=EMACS_PRETEST_$(echo $OLD|tr . _)
newtag=EMACS_PRETEST_$(echo $NEW|tr . _)
if [ -f $outfile ]; then
echo "$outfile exists"
echo -n "interrupt to abort, ENTER to overwrite "; read answer
fi
echo -n "tag name for OLD emacs version $OLD [$oldtag]: "; read answer
if [ "$answer" ]; then oldtag=$answer; fi
echo -n "tag name for NEW emacs version $NEW [$newtag]: "; read answer
if [ "$answer" ]; then newtag=$answer; fi
exec > $outfile
cat <<EOF
There is a new pretest available in
<ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$NEW.tar.gz>
Please report results from compiling and running the pretest to
<bug-gnu-emacs@gnu.org>. Your feedback is necessary for us
to know on which platforms the pretest has been tried.
If you have the tars from the previous pretest, and you have the
\`xdelta' utility, you can instead download the much smaller
<ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$OLD-$NEW.xdelta>
You can use a command like
$ xdelta patch XDELTA PREVIOUS-TAR CURRENT-TAR
to generate the new tar from the old one, where XDELTA is the xdelta
file you downloaded, PREVIOUS-TAR is the tar file from the previous
pretest, and CURRENT-TAR is the name of the tar file you downloaded.
Information about xdelta can be found on the GNU ftp site, in
/non-gnu/xdelta.README.
Changes since $OLD
EOF
make-changelog-diff $oldtag $newtag
echo " announcement created in $outfile" >&2

View file

@ -1,29 +0,0 @@
#! /bin/bash
## Author: Francesco Potorti` <pot@gnu.org>
if [ $# -ne 2 ]; then
echo "usage: $0 TAG1 TAG2" >&2
exit 1
fi
if [ ! -f INSTALL -o ! -f configure -o ! -d lib-src ]; then
echo "this script should be run in the emacs root directory" >&2
exit 2
fi
cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) |
sed -n -e 's/^=\+/======/p' -e 's/^> //p' -e 's/^diff.*//p' \
-e 's/^RCS file: .cvsroot.emacs.emacs.\(.*\),v/\1/p' |
sed -n -e "/^======$/ {
N
N
h
d
}
H
s/.*//
x
s/^\n//
p"

View file

@ -2,7 +2,7 @@
# Build Emacs with various options for profiling, debugging,
# with and without warnings enabled etc.
# Copyright (C) 2001-2012 Free Software Foundation, Inc.
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,42 +1,75 @@
Instructions to create pretest or release tarballs.
-- originally written by Gerd Moellmann, amended by Francesco Potortì
Instructions to create pretest or release tarballs. -*- coding: utf-8 -*-
-- originally written by Gerd Moellmann, amended by Francesco Potortì
with the initial help of Eli Zaretskii
For each step, check for possible errors.
Steps to take before starting on the first pretest in any release sequence:
1. Decide on versions of automake and autoconf, and ensure you will
have them available for the duration of the release process.
2. Consider increasing the value of the variable
`customize-changed-options-previous-release' in cus-edit.el to
refer to a newer version of Emacs. (This is probably needed only
when preparing the first pretest for a major Emacs release.)
Commit cus-edit.el if changed.
General steps (for each step, check for possible errors):
1. `bzr update' (for a bound branch), or `bzr pull'.
bzr status # check for locally modified files
bzr status # check for locally modified files
2. Bootstrap to make 100% sure all elc files are up-to-date, and to
make sure that the later tagged version will bootstrap, should it be
necessary to check it out.
3. Regenerate Emacs' etc/AUTHORS file (M-x load-file RET
lisp/emacs-lisp/authors.el RET, then M-x authors RET, then save
the *Authors* buffer). This may require fixing syntactically
incorrect ChangeLog entries beforehand.
3. Regenerate the etc/AUTHORS file:
M-: (require 'authors) RET
M-x authors RET
There is almost guaranteed to be an "*Authors Errors*" buffer with
problems caused by certain bad ChangeLog entries. You can ignore
the very old ones (eg lisp/erc has a lot). If there are errors
related to new entries (especially entries that are new since the
last pretest), see if you can fix them. If there was a ChangeLog
typo, fix it. If a file was deleted or renamed, consider adding
an appropriate entry to authors-ignored-files, authors-valid-file-names,
or authors-renamed-files-alist.
If necessary, repeat M-x authors after making those changes.
Save the "*Authors*" buffer as etc/AUTHORS.
Check the diff looks reasonable. Maybe add entries to
authors-ambiguous-files or authors-aliases, and repeat.
Commit any fixes to ChangeLogs or authors.el.
4. Set the version number (M-x load-file RET admin/admin.el RET, then
M-x set-version RET). For a release, add released change log
M-x set-version RET). For a release, add released ChangeLog
entries (M-x add-release-logs RET).
For a pretest, start at version .90. After .99, use .990 (so that
it sorts).
If needed, increment the value of the variable
`customize-changed-options-previous-release' in cus-edit.el to
refer to a newer release of Emacs. (This is probably needed only
when preparing a major Emacs release, or branching for it.)
The final pretest should be a release candidate. Set the version
number to that of the actual release. Pick a date about a week
from now when you intend to make the release. Use M-x add-release-logs
to add the ChangeLog entries for that date to the tar file (but
not yet to the repository). Name the tar file as
emacs-XX.Y-rc1.tar. If all goes well in the following week, you
can simply rename the file and use it for the actual release.
5. autoreconf -i -I m4 --force
make bootstrap
6. Commit etc/AUTHORS, all the files changed by M-x set-version, and
lisp/cus-edit.el (if modified).
Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.
6. Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed
by M-x set-version.
For a release, also commit the ChangeLog files in all directories.
7. make-dist --snapshot. Check the contents of the new tar with
7. ./make-dist --snapshot --no-compress
Check the contents of the new tar with
admin/diff-tar-files against an older tar file. Some old pretest
tarballs may be found at <ftp://alpha.gnu.org/gnu/emacs/pretest>;
old release tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
@ -46,36 +79,54 @@ For each step, check for possible errors.
something like `find . | sort' in a clean bzr tree, and compare the
results against the new tar contents.
8. xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
9. tar -zxf emacs-NEW.tar.gz; cd emacs-NEW
./configure && make && make -n install
8. tar -xf emacs-NEW.tar; cd emacs-NEW
./configure --prefix=/tmp/emacs && make && make install
Use `script' or M-x compile to save the compilation log in
compile-NEW.log and compare it against an old one. The easiest way
to do that is to visit the old log in Emacs, change the version
number of the old Emacs to __, do the same with the new log and do
M-x ediff. Especially check that Info files aren't built.
M-x ediff. Especially check that Info files aren't built, and that
no autotools (autoconf etc) run.
10. cd EMACS_ROOT_DIR; bzr tag TAG
TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
release.
9. cd EMACS_ROOT_DIR && bzr tag TAG
TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release.
Shortly before the release, cut the version branch also, and open
a Savannah support request asking for commits to the new branch to
be sent to the emacs-diffs mailing list (by default, the list
normally only gets commits to the trunk).
11. Now you should upload the files to the GNU ftp server. In order to
10. Decide what compression schemes to offer.
For a release, at least gz and xz:
gzip --best -c emacs-NEW.tar > emacs-NEW.tar.gz
xz -c emacs-NEW.tar > emacs-NEW.tar.xz
Now you should upload the files to the GNU ftp server. In order to
do that, you must be registered as an Emacs maintainer and have your
GPG key acknowledged by the ftp people. Mail <ftp-upload@gnu.org>
for instructions.
GPG key acknowledged by the ftp people. For instructions, see
http://www.gnu.org/prep/maintain/html_node/Automated-Upload-Registration.html
The simplest method is to use the gnulib <http://www.gnu.org/s/gnulib/>
script "build-aux/gnupload" to upload each FILE, like this:
You can use the gnupload script to upload each FILE, like this:
gnupload --to alpha.gnu.org:emacs/pretest FILE (for a pretest)
gnupload --to ftp.gnu.org:emacs FILE (for a release)
For a pretest:
gnupload [--user your@gpg.key.email] --to alpha.gnu.org:emacs/pretest \
FILE.gz FILE.xz ...
For a release:
gnupload [--user your@gpg.key.email] --to ftp.gnu.org:emacs \
FILE.gz FILE.xz ...
You only need the --user part if you have multiple GPG keys and do
not want to use the default.
Obviously, if you do not have a fast uplink, be prepared for the
upload to take a while.
If you prefer to do it yourself rather than use gnupload:
For each FILE, create a detached GPG binary signature and a
clearsigned directive file like this:
Instead of using gnupload, for each FILE, create a detached GPG
binary signature and a clearsigned directive file like this:
gpg -b FILE
echo directory: emacs/pretest > FILE.directive (for a pretest)
echo directory: emacs > FILE.directive (for a release)
@ -86,16 +137,17 @@ For each step, check for possible errors.
For a pretest, place the files in /incoming/alpha instead, so that
they appear on ftp://alpha.gnu.org/.
For a release, upload a bz2 tarfile as well; this can save a lot
of bandwidth.
12. After five minutes, verify that the files are visible at
ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
11. After five minutes, verify that the files are visible at
ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, or
ftp://ftp.gnu.org/gnu/emacs/ for a release.
13. For a pretest, announce it on emacs-devel and BCC the pretesters.
For a release, announce it on info-gnu@gnu.org,
info-gnu-emacs@gnu.org, and emacs-devel.
Download them and check the signatures. Check they build.
14. For a release, update the Emacs homepage in the web repository.
12. For a pretest, announce it on emacs-devel and info-gnu-emacs@gnu.org.
For a release, also announce it on info-gnu@gnu.org. (Probably
bcc the info- addresses to make it less likely that people will
followup on those lists.)
13. For a release, update the Emacs homepage in the web repository.
Also add the new NEWS file as NEWS.xx.y.
Maybe regenerate the html manuals, update the FAQ, etc, etc.

View file

@ -4,7 +4,7 @@
#
# admin/merge-gnulib
# Copyright 2012 Free Software Foundation, Inc.
# Copyright 2012-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@ -29,20 +29,22 @@ GNULIB_MODULES='
alloca-opt c-ctype c-strcase
careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
dtoastr dtotimespec dup2 environ execinfo faccessat
fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday
fcntl-h fdatasync fdopendir filemode fstatat fsync
getloadavg getopt-gnu gettime gettimeofday
ignore-value intprops largefile lstat
manywarnings mktime pselect pthread_sigmask readlink
socklen stat-time stdalign stdarg stdbool stdio
manywarnings memrchr mktime
pselect pthread_sigmask putenv readlink readlinkat
sig2str socklen stat-time stdalign stdarg stdbool stdio
strftime strtoimax strtoumax symlink sys_stat
sys_time time timer-time timespec-add timespec-sub utimens
sys_time time timer-time timespec-add timespec-sub unsetenv utimens
warnings
'
GNULIB_TOOL_FLAGS='
--avoid=at-internal
--avoid=dup
--avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat
--avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
--avoid=openat-die --avoid=openat-h
--avoid=open --avoid=openat-die --avoid=opendir
--avoid=raise
--avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types
--avoid=threadlib

View file

@ -182,6 +182,71 @@ where revision N+1 is the one where file was removed.
You could also try `bzr add --file-ids-from', if you have a copy of
another branch where file still exists.
* Undoing a commit (uncommitting)
It is possible to undo/remove a bzr commit (ie, to uncommit).
Only do this if you really, really, need to. For example, if you
somehow made a commit that triggers a bug in bzr itself.
Don't do it because you made a typo in a commit or the log.
If you do need to do this, do it as soon as possible, because the
longer you leave it, the more work is involved.
0. First, tell emacs-devel that you are going to do this, and suggest
people not commit anything to the affected branch for the duration.
In the following, replace USER with your Savannah username, and
BRANCH with the name of the branch.
Let's assume that revno 100 is the bad commit, and that there have
been two more commits after that (because nothing is ever easy).
1. Ensure your copy of the branch is up-to-date (for a bound
branch, bzr up; for an unbound branch, bzr pull) and has no local
changes (bzr st).
2. Make a record of the commits you are going to undo:
bzr diff -c 102 > /tmp/102.diff
etc
Also record the commit message, author, and any --fixes information.
3. Most Emacs branches are set up to prevent just this kind of thing.
So we need to disable that protection:
bzr config append_revisions_only=False \
-d bzr+ssh://USER@bzr.savannah.gnu.org/emacs/BRANCH/
4. Undo the commits:
bzr uncommit -r -4
This will show the commits it is going to undo, and prompt you to confirm.
5. If using an unbound branch:
bzr push --overwrite
6. Now, replay the commits you just undid (obviously, fix whatever it
was in the bad commit that caused the problem):
patch -p0 < /tmp/100.diff
bzr commit --author ... --fixes ... -F /tmp/100.log
etc
7. If using an unbound branch:
bzr push
8. Finally, re-enable the branch protection:
bzr config append_revisions_only=True \
-d bzr+ssh://USER@bzr.savannah.gnu.org/emacs/BRANCH/
9. Tell emacs-devel that it is ok to use the branch again.
Anyone with local changes should back them up before doing anything.
For a bound branch, bzr up will convert any of the undone commits to a
pending merge. Just bzr revert these away.
For an unbound branch, bzr pull will complain about diverged branches
and refuse to do anything. Use bzr pull --overwrite.
* Loggerhead
Loggerhead is the bzr tool for viewing a repository over http (similar
@ -202,3 +267,52 @@ For example, on RHEL6 I needed:
yum --enablerepo=epel install python-simpletal
Then point your web-browser to http://127.0.0.1:8080/ .
* Bisecting
This is a semi-automated way to find the revision that introduced a bug.
First, get the bzr bisect plugin if you do not have it already:
cd ~/.bazaar/plugins
bzr branch lp:bzr-bisect bisect
`bzr help bisect' should work now.
It's probably simplest to make a new copy of the branch to work in
from this point onwards.
Identify the last known "good" revision where the relevant issue is
NOT present (e.g. maybe Emacs 24.1). Let's say this is revision 1000.
bzr bisect start
bzr bisect no -r 1000
At this point, bzr will switch to the mid-point of revision 1000 and
the current revision. If you know that the issue was definitely
present in some specific revision (say 2000), you can use:
bzr bisect yes -r 2000
Now bzr switches to revision 1500.
Now test whether the issue is present. You might need to rebuild
Emacs to do this, or if you know the problem is in a specific Lisp
file, you might be able to get away with just loading that one file in
current Emacs.
If the issue is present, use
bzr bisect yes
If it is not, use
bzr bisect no
Repeat until you zero-in on the specific revision.
When finished, use
bzr bisect reset
or simply delete the entire branch if you created it just for this.

View file

@ -1,4 +1,4 @@
Copyright (C) 2007-2012 Free Software Foundation, Inc.
Copyright (C) 2007-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

View file

@ -1,4 +1,4 @@
Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copyright (C) 2002-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

View file

@ -1,6 +1,6 @@
Some lisp/emacs-lisp/ Features and Where They Are Documented
Copyright (C) 2007-2012 Free Software Foundation, Inc.
Copyright (C) 2007-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.

View file

@ -1,6 +1,6 @@
-*- coding: utf-8; mode: text; -*-
Copyright (C) 2007-2012 Free Software Foundation, Inc.
Copyright (C) 2007-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
From README.multi-tty in the multi-tty branch.

View file

@ -1,6 +1,6 @@
-*-mode: text; coding: latin-1;-*-
-*-mode: text; coding: utf-8;-*-
Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copyright (C) 2002-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
Problems, fixmes and other unicode-related issues
@ -12,9 +12,9 @@ regard to completeness.
* SINGLE_BYTE_CHAR_P returns true for Latin-1 characters, which has
undesirable effects. E.g.:
(multibyte-string-p (let ((s "x")) (aset s 0 ?£) s)) => nil
(multibyte-string-p (concat [?£])) => nil
(text-char-description ?£) => "M-#"
(multibyte-string-p (let ((s "x")) (aset s 0 ?£) s)) => nil
(multibyte-string-p (concat [?£])) => nil
(text-char-description ?£) => "M-#"
These examples are all fixed by the change of 2002-10-14, but
there still exist questionable SINGLE_BYTE_CHAR_P in the
@ -77,7 +77,7 @@ regard to completeness.
spelling and calendar, but that's not a Unicode issue.)
* Handle Unicode combining characters usefully, e.g. diacritics, and
handle more scripts specifically (à la Devanagari). There are
handle more scripts specifically (à la Devanagari). There are
issues with canonicalization.
* We need tabular input methods, e.g. for maths symbols. (Not
@ -98,6 +98,136 @@ regard to completeness.
* Old auto-save files, and similar files, such as Gnus drafts,
containing non-ASCII characters probably won't be re-read correctly.
Source file encoding
--------------------
Most Emacs source files are encoded in UTF-8 (or in ASCII, which is a
subset), but there are a few exceptions, listed below. Perhaps
someday many of these files will be converted to UTF-8, for
convenience when using tools like 'grep -r', but this might need
nontrivial changes to the build process.
* chinese-big5
These are verbatim copies of files taken from external sources.
They haven't been converted to UTF-8.
leim/CXTERM-DIC/4Corner.tit
leim/CXTERM-DIC/ARRAY30.tit
leim/CXTERM-DIC/ECDICT.tit
leim/CXTERM-DIC/ETZY.tit
leim/CXTERM-DIC/PY-b5.tit
leim/CXTERM-DIC/Punct-b5.tit
leim/CXTERM-DIC/QJ-b5.tit
leim/CXTERM-DIC/ZOZY.tit
leim/MISC-DIC/CTLau-b5.html
leim/MISC-DIC/cangjie-table.b5
* chinese-iso-8bit
These are verbatim copies of files taken from external sources.
They haven't been converted to UTF-8.
leim/CXTERM-DIC/CCDOSPY.tit
leim/CXTERM-DIC/Punct.tit
leim/CXTERM-DIC/QJ.tit
leim/CXTERM-DIC/SW.tit
leim/CXTERM-DIC/TONEPY.tit
leim/MISC-DIC/pinyin.map
leim/MISC-DIC/CTLau.html
leim/MISC-DIC/ziranma.cin
* cp850
This file contains non-ASCII characters in unibyte strings. When
editing a keyboard layout it's more convenient to see 'é' than
'\202', and the MS-DOS compiler requires the single byte if a
backslash escape is not being used.
src/msdos.c
* iso-2022-cn-ext
This file is externally generated from leim/MISC-DIC/cangjie-table.b5
by Big5->CNS converter. It hasn't been converted to UTF-8.
leim/MISC-DIC/cangjie-table.cns
* iso-latin-2
These files are processed by csplain, a program that requires
Latin-2 input. In 2012 the csplain maintainers started
recommending UTF-8, but these files haven't been converted yet.
etc/refcards/cs-dired-ref.tex
etc/refcards/cs-refcard.tex
etc/refcards/cs-survival.tex
etc/refcards/sk-dired-ref.tex
etc/refcards/sk-refcard.tex
etc/refcards/sk-survival.tex
* japanese-iso-8bit
SKK-JISYO.L is a verbatim copy of a file taken from an external source.
It hasn't been converted to UTF-8.
leim/SKK-DIC/SKK-JISYO.L
* japanese-shift-jis
This is a verbatim copy of a file taken from an external source.
It hasn't been converted to UTF-8.
admin/charsets/mapfiles/cns2ucsdkw.txt
* no-conversion
This file purposely contains arbitrary bytes interspersed within text,
to test whether the Emacs distribution is corrupted.
lib-src/testfile
* iso-2022-7bit
This file switches between CJK charsets, which is not encoded in UTF-8.
etc/HELLO
Each of these files contains just one CJK charset, but Emacs
currently has no easy way to specify set-charset-priority on a
per-file basis, so converting any of these files to UTF-8 might
change the file's appearance when viewed by an Emacs that is
operating in some other language environment.
etc/tutorials/TUTORIAL.ja
etc/tutorials/TUTORIAL.ko
leim/quail/cyril-jis.el
leim/quail/hanja-jis.el
leim/quail/hanja.el
leim/quail/hanja3.el
leim/quail/japanese.el
leim/quail/py-punct.el
leim/quail/pypunct-b5.el
leim/quail/symbol-ksc.el
lisp/international/ja-dic-cnv.el
lisp/international/ja-dic-utl.el
lisp/international/kinsoku.el
lisp/international/kkc.el
lisp/international/titdic-cnv.el
lisp/language/japan-util.el
lisp/language/japanese.el
lisp/term/x-win.el
These files contain characters that cannot be encoded in UTF-8.
leim/quail/tibetan.el
leim/quail/ethiopic.el
lisp/international/titdic-cnv.el
lisp/language/tibetan.el
lisp/language/tibet-util.el
lisp/language/ind-util.el
This file is part of GNU Emacs.

View file

@ -1,4 +1,4 @@
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
Emacs for Windows

View file

@ -1,4 +1,4 @@
Copyright (C) 2001-2012 Free Software Foundation, Inc.
Copyright (C) 2001-2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
Precompiled Distributions of
@ -288,4 +288,4 @@ 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/>.
along with GNU Emacs. If not, see http://www.gnu.org/licenses/.

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-2013 Free Software Foundation, Inc.
## Author: Miles Bader <miles@gnu.org>

View file

@ -1,6 +1,6 @@
# Makefile -- Makefile to generate character property tables.
# Copyright (C) 2012 Free Software Foundation, Inc.
# Copyright (C) 2012-2013 Free Software Foundation, Inc.
# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
# National Institute of Advanced Industrial Science and Technology (AIST)

View file

@ -1,7 +1,7 @@
#!/bin/sh
### autogen.sh - tool to help build Emacs from a bzr checkout
## Copyright (C) 2011-2012 Free Software Foundation, Inc.
## Copyright (C) 2011-2013 Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>

View file

@ -15,7 +15,7 @@
@SET_MAKE@
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# Copyright (C) 2002-2013 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=at-internal --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=openat-die --avoid=openat-h --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub utimens 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=dup --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings memrchr mktime pselect pthread_sigmask putenv readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@ -65,12 +65,15 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/c-strtod.m4 \
$(top_srcdir)/m4/clock_time.m4 \
$(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/dup2.m4 \
$(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/euidaccess.m4 \
$(top_srcdir)/m4/execinfo.m4 $(top_srcdir)/m4/extensions.m4 \
$(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/dirent_h.m4 \
$(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/environ.m4 \
$(top_srcdir)/m4/euidaccess.m4 $(top_srcdir)/m4/execinfo.m4 \
$(top_srcdir)/m4/extensions.m4 \
$(top_srcdir)/m4/extern-inline.m4 \
$(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fcntl_h.m4 \
$(top_srcdir)/m4/fdatasync.m4 $(top_srcdir)/m4/fdopendir.m4 \
$(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/fpending.m4 \
$(top_srcdir)/m4/fstatat.m4 $(top_srcdir)/m4/fsync.m4 \
$(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getloadavg.m4 \
$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettime.m4 \
$(top_srcdir)/m4/gettimeofday.m4 \
@ -80,20 +83,22 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/off_t.m4 $(top_srcdir)/m4/pathmax.m4 \
$(top_srcdir)/m4/pselect.m4 \
$(top_srcdir)/m4/pthread_sigmask.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/sha1.m4 \
$(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/multiarch.m4 \
$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pselect.m4 \
$(top_srcdir)/m4/pthread_sigmask.m4 $(top_srcdir)/m4/putenv.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \
$(top_srcdir)/m4/setenv.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/socklen.m4 \
$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/st_dm_mode.m4 \
$(top_srcdir)/m4/stat-time.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/sig2str.m4 $(top_srcdir)/m4/signal_h.m4 \
$(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/ssize_t.m4 \
$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/stat-time.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/string_h.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_select_h.m4 \
@ -119,7 +124,7 @@ am__libgnu_a_SOURCES_DIST = allocator.c c-ctype.h c-ctype.c \
close-stream.c md5.c sha1.c sha256.c sha512.c dtoastr.c \
dtotimespec.c filemode.c gettext.h gettime.c stat-time.c \
strftime.c timespec.c timespec-add.c timespec-sub.c u64.c \
utimens.c
unistd.c utimens.c openat-die.c save-cwd.c
am__objects_1 =
am_libgnu_a_OBJECTS = allocator.$(OBJEXT) c-ctype.$(OBJEXT) \
c-strcasecmp.$(OBJEXT) c-strncasecmp.$(OBJEXT) \
@ -128,7 +133,8 @@ am_libgnu_a_OBJECTS = allocator.$(OBJEXT) c-ctype.$(OBJEXT) \
dtoastr.$(OBJEXT) dtotimespec.$(OBJEXT) filemode.$(OBJEXT) \
$(am__objects_1) gettime.$(OBJEXT) stat-time.$(OBJEXT) \
strftime.$(OBJEXT) timespec.$(OBJEXT) timespec-add.$(OBJEXT) \
timespec-sub.$(OBJEXT) u64.$(OBJEXT) utimens.$(OBJEXT)
timespec-sub.$(OBJEXT) u64.$(OBJEXT) unistd.$(OBJEXT) \
utimens.$(OBJEXT) openat-die.$(OBJEXT) save-cwd.$(OBJEXT)
libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
@ -169,7 +175,6 @@ CFLAGS_SOUND = @CFLAGS_SOUND@
COM_ERRLIB = @COM_ERRLIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CRT_DIR = @CRT_DIR@
CRYPTOLIB = @CRYPTOLIB@
CYGPATH_W = @CYGPATH_W@
CYGWIN_OBJ = @CYGWIN_OBJ@
@ -199,12 +204,15 @@ GCONF_LIBS = @GCONF_LIBS@
GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
GETOPT_H = @GETOPT_H@
GMALLOC_OBJ = @GMALLOC_OBJ@
GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
GNULIB_ATOLL = @GNULIB_ATOLL@
GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
GNULIB_DIRFD = @GNULIB_DIRFD@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@ -219,7 +227,10 @@ GNULIB_FCLOSE = @GNULIB_FCLOSE@
GNULIB_FCNTL = @GNULIB_FCNTL@
GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
GNULIB_FDOPEN = @GNULIB_FDOPEN@
GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@
GNULIB_FFLUSH = @GNULIB_FFLUSH@
GNULIB_FFSL = @GNULIB_FFSL@
GNULIB_FFSLL = @GNULIB_FFSLL@
GNULIB_FGETC = @GNULIB_FGETC@
GNULIB_FGETS = @GNULIB_FGETS@
GNULIB_FOPEN = @GNULIB_FOPEN@
@ -270,7 +281,25 @@ GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_LSTAT = @GNULIB_LSTAT@
GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
GNULIB_MBSCHR = @GNULIB_MBSCHR@
GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
GNULIB_MBSLEN = @GNULIB_MBSLEN@
GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
GNULIB_MBSSEP = @GNULIB_MBSSEP@
GNULIB_MBSSPN = @GNULIB_MBSSPN@
GNULIB_MBSSTR = @GNULIB_MBSSTR@
GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
GNULIB_MBTOWC = @GNULIB_MBTOWC@
GNULIB_MEMCHR = @GNULIB_MEMCHR@
GNULIB_MEMMEM = @GNULIB_MEMMEM@
GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
GNULIB_MKDIRAT = @GNULIB_MKDIRAT@
GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
GNULIB_MKFIFO = @GNULIB_MKFIFO@
@ -288,6 +317,7 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
GNULIB_OPEN = @GNULIB_OPEN@
GNULIB_OPENAT = @GNULIB_OPENAT@
GNULIB_OPENDIR = @GNULIB_OPENDIR@
GNULIB_PCLOSE = @GNULIB_PCLOSE@
GNULIB_PERROR = @GNULIB_PERROR@
GNULIB_PIPE = @GNULIB_PIPE@
@ -309,7 +339,9 @@ GNULIB_PWRITE = @GNULIB_PWRITE@
GNULIB_RAISE = @GNULIB_RAISE@
GNULIB_RANDOM = @GNULIB_RANDOM@
GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
GNULIB_READ = @GNULIB_READ@
GNULIB_READDIR = @GNULIB_READDIR@
GNULIB_READLINK = @GNULIB_READLINK@
GNULIB_READLINKAT = @GNULIB_READLINKAT@
GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
@ -317,9 +349,12 @@ GNULIB_REALPATH = @GNULIB_REALPATH@
GNULIB_REMOVE = @GNULIB_REMOVE@
GNULIB_RENAME = @GNULIB_RENAME@
GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
GNULIB_RMDIR = @GNULIB_RMDIR@
GNULIB_RPMATCH = @GNULIB_RPMATCH@
GNULIB_SCANDIR = @GNULIB_SCANDIR@
GNULIB_SCANF = @GNULIB_SCANF@
GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@
GNULIB_SELECT = @GNULIB_SELECT@
GNULIB_SETENV = @GNULIB_SETENV@
GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
@ -332,12 +367,28 @@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
GNULIB_STAT = @GNULIB_STAT@
GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
GNULIB_STPCPY = @GNULIB_STPCPY@
GNULIB_STPNCPY = @GNULIB_STPNCPY@
GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
GNULIB_STRDUP = @GNULIB_STRDUP@
GNULIB_STRERROR = @GNULIB_STRERROR@
GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
GNULIB_STRNCAT = @GNULIB_STRNCAT@
GNULIB_STRNDUP = @GNULIB_STRNDUP@
GNULIB_STRNLEN = @GNULIB_STRNLEN@
GNULIB_STRPBRK = @GNULIB_STRPBRK@
GNULIB_STRPTIME = @GNULIB_STRPTIME@
GNULIB_STRSEP = @GNULIB_STRSEP@
GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
GNULIB_SYMLINK = @GNULIB_SYMLINK@
GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
@ -379,12 +430,16 @@ GTK_LIBS = @GTK_LIBS@
GTK_OBJ = @GTK_OBJ@
GZIP_INFO = @GZIP_INFO@
GZIP_PROG = @GZIP_PROG@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
@ -398,15 +453,24 @@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
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_STRDUP = @HAVE_DECL_STRDUP@
HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
HAVE_DIRENT_H = @HAVE_DIRENT_H@
HAVE_DPRINTF = @HAVE_DPRINTF@
HAVE_DUP2 = @HAVE_DUP2@
HAVE_DUP3 = @HAVE_DUP3@
@ -417,6 +481,9 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@
HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
HAVE_FCNTL = @HAVE_FCNTL@
HAVE_FDATASYNC = @HAVE_FDATASYNC@
HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
HAVE_FFSL = @HAVE_FFSL@
HAVE_FFSLL = @HAVE_FFSLL@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSTATAT = @HAVE_FSTATAT@
HAVE_FSYNC = @HAVE_FSYNC@
@ -441,6 +508,9 @@ HAVE_LINKAT = @HAVE_LINKAT@
HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
HAVE_LSTAT = @HAVE_LSTAT@
HAVE_MAKEINFO = @HAVE_MAKEINFO@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDIRAT = @HAVE_MKDIRAT@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
HAVE_MKFIFO = @HAVE_MKFIFO@
@ -453,6 +523,7 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
HAVE_OS_H = @HAVE_OS_H@
HAVE_PCLOSE = @HAVE_PCLOSE@
HAVE_PIPE = @HAVE_PIPE@
@ -470,11 +541,16 @@ HAVE_RAISE = @HAVE_RAISE@
HAVE_RANDOM = @HAVE_RANDOM@
HAVE_RANDOM_H = @HAVE_RANDOM_H@
HAVE_RANDOM_R = @HAVE_RANDOM_R@
HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
HAVE_READDIR = @HAVE_READDIR@
HAVE_READLINK = @HAVE_READLINK@
HAVE_READLINKAT = @HAVE_READLINKAT@
HAVE_REALPATH = @HAVE_REALPATH@
HAVE_RENAMEAT = @HAVE_RENAMEAT@
HAVE_REWINDDIR = @HAVE_REWINDDIR@
HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SCANDIR = @HAVE_SCANDIR@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
HAVE_SIGACTION = @HAVE_SIGACTION@
@ -486,13 +562,20 @@ HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
HAVE_SIGSET_T = @HAVE_SIGSET_T@
HAVE_SLEEP = @HAVE_SLEEP@
HAVE_STDINT_H = @HAVE_STDINT_H@
HAVE_STPCPY = @HAVE_STPCPY@
HAVE_STPNCPY = @HAVE_STPNCPY@
HAVE_STRCASESTR = @HAVE_STRCASESTR@
HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRPTIME = @HAVE_STRPTIME@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@
HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
HAVE_SYMLINK = @HAVE_SYMLINK@
HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
@ -536,11 +619,11 @@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
KRB4LIB = @KRB4LIB@
KRB5LIB = @KRB5LIB@
LDFLAGS = @LDFLAGS@
LD_FIRSTFLAG = @LD_FIRSTFLAG@
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@
LIBACL_LIBS = @LIBACL_LIBS@
LIBGIF = @LIBGIF@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
@ -558,6 +641,7 @@ LIBRESOLV = @LIBRESOLV@
LIBS = @LIBS@
LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
LIBSOUND = @LIBSOUND@
LIBS_GNUSTEP = @LIBS_GNUSTEP@
LIBS_MAIL = @LIBS_MAIL@
LIBS_SYSTEM = @LIBS_SYSTEM@
LIBS_TERMCAP = @LIBS_TERMCAP@
@ -574,11 +658,10 @@ LIBX_OTHER = @LIBX_OTHER@
LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
LIB_EACCESS = @LIB_EACCESS@
LIB_EXECINFO = @LIB_EXECINFO@
LIB_GCC = @LIB_GCC@
LIB_FDATASYNC = @LIB_FDATASYNC@
LIB_MATH = @LIB_MATH@
LIB_PTHREAD = @LIB_PTHREAD@
LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
LIB_STANDARD = @LIB_STANDARD@
LIB_TIMER_TIME = @LIB_TIMER_TIME@
LN_S = @LN_S@
LTLIBINTL = @LTLIBINTL@
@ -588,6 +671,7 @@ M17N_FLT_LIBS = @M17N_FLT_LIBS@
MAKEINFO = @MAKEINFO@
MKDEPDIR = @MKDEPDIR@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
@ -597,11 +681,13 @@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
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_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H@
NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@
NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_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_DIRENT_H = @NEXT_DIRENT_H@
NEXT_FCNTL_H = @NEXT_FCNTL_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
@ -611,6 +697,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@
NEXT_STDINT_H = @NEXT_STDINT_H@
NEXT_STDIO_H = @NEXT_STDIO_H@
NEXT_STDLIB_H = @NEXT_STDLIB_H@
NEXT_STRING_H = @NEXT_STRING_H@
NEXT_SYS_SELECT_H = @NEXT_SYS_SELECT_H@
NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@
NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
@ -648,6 +735,8 @@ REPLACE_CALLOC = @REPLACE_CALLOC@
REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
REPLACE_CHOWN = @REPLACE_CHOWN@
REPLACE_CLOSE = @REPLACE_CLOSE@
REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
REPLACE_DIRFD = @REPLACE_DIRFD@
REPLACE_DPRINTF = @REPLACE_DPRINTF@
REPLACE_DUP = @REPLACE_DUP@
REPLACE_DUP2 = @REPLACE_DUP2@
@ -655,6 +744,7 @@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
REPLACE_FCLOSE = @REPLACE_FCLOSE@
REPLACE_FCNTL = @REPLACE_FCNTL@
REPLACE_FDOPEN = @REPLACE_FDOPEN@
REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
@ -685,6 +775,8 @@ REPLACE_LSEEK = @REPLACE_LSEEK@
REPLACE_LSTAT = @REPLACE_LSTAT@
REPLACE_MALLOC = @REPLACE_MALLOC@
REPLACE_MBTOWC = @REPLACE_MBTOWC@
REPLACE_MEMCHR = @REPLACE_MEMCHR@
REPLACE_MEMMEM = @REPLACE_MEMMEM@
REPLACE_MKDIR = @REPLACE_MKDIR@
REPLACE_MKFIFO = @REPLACE_MKFIFO@
REPLACE_MKNOD = @REPLACE_MKNOD@
@ -695,6 +787,7 @@ REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
REPLACE_OPEN = @REPLACE_OPEN@
REPLACE_OPENAT = @REPLACE_OPENAT@
REPLACE_OPENDIR = @REPLACE_OPENDIR@
REPLACE_PERROR = @REPLACE_PERROR@
REPLACE_POPEN = @REPLACE_POPEN@
REPLACE_PREAD = @REPLACE_PREAD@
@ -723,8 +816,20 @@ REPLACE_SPRINTF = @REPLACE_SPRINTF@
REPLACE_STAT = @REPLACE_STAT@
REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
REPLACE_STPNCPY = @REPLACE_STPNCPY@
REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
REPLACE_STRDUP = @REPLACE_STRDUP@
REPLACE_STRERROR = @REPLACE_STRERROR@
REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
REPLACE_STRNCAT = @REPLACE_STRNCAT@
REPLACE_STRNDUP = @REPLACE_STRNDUP@
REPLACE_STRNLEN = @REPLACE_STRNLEN@
REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_TIMEGM = @REPLACE_TIMEGM@
@ -751,7 +856,6 @@ SET_MAKE = @SET_MAKE@
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@
@ -760,12 +864,12 @@ STDINT_H = @STDINT_H@
STRIP = @STRIP@
SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
TERMCAP_OBJ = @TERMCAP_OBJ@
TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
TOOLKIT_LIBW = @TOOLKIT_LIBW@
UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
UNEXEC_OBJ = @UNEXEC_OBJ@
UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
@ -773,6 +877,8 @@ VERSION = @VERSION@
VMLIMIT_OBJ = @VMLIMIT_OBJ@
W32_LIBS = @W32_LIBS@
W32_OBJ = @W32_OBJ@
W32_RES = @W32_RES@
W32_RES_LINK = @W32_RES_LINK@
WARN_CFLAGS = @WARN_CFLAGS@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
WERROR_CFLAGS = @WERROR_CFLAGS@
@ -780,6 +886,7 @@ WIDGET_OBJ = @WIDGET_OBJ@
WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
WINDOW_SYSTEM_OBJ = @WINDOW_SYSTEM_OBJ@
WINDRES = @WINDRES@
WINT_T_SUFFIX = @WINT_T_SUFFIX@
XFT_CFLAGS = @XFT_CFLAGS@
XFT_LIBS = @XFT_LIBS@
@ -874,39 +981,43 @@ x_default_search_path = @x_default_search_path@
# statements but through direct file reference. Therefore this snippet must be
# present in all Makefile.am that need it. This is ensured by the applicability
# 'all' defined above.
BUILT_SOURCES = $(ALLOCA_H) $(EXECINFO_H) fcntl.h $(GETOPT_H) \
BUILT_SOURCES = $(ALLOCA_H) dirent.h $(EXECINFO_H) fcntl.h $(GETOPT_H) \
inttypes.h signal.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/select.h sys/stat.h sys/time.h time.h \
unistd.h
EXTRA_DIST = alloca.in.h allocator.h careadlinkat.h close-stream.h \
md5.h sha1.h sha256.h sha512.h dosname.h ftoastr.c ftoastr.h \
dup2.c euidaccess.c execinfo.c execinfo.in.h at-func.c \
faccessat.c fcntl.in.h filemode.h fpending.c fpending.h \
getgroups.c getloadavg.c getopt.c getopt.in.h getopt1.c \
getopt_int.h gettimeofday.c group-member.c ignore-value.h \
intprops.h inttypes.in.h lstat.c mktime-internal.h mktime.c \
pathmax.h pselect.c pthread_sigmask.c readlink.c root-uid.h \
signal.in.h $(top_srcdir)/build-aux/snippet/_Noreturn.h \
stdio.h stdlib.h string.h sys/select.h sys/stat.h sys/time.h \
time.h unistd.h
EXTRA_DIST = alloca.in.h allocator.h openat-priv.h openat-proc.c \
careadlinkat.h close-stream.h md5.h sha1.h sha256.h sha512.h \
dirent.in.h dosname.h ftoastr.c ftoastr.h dup2.c euidaccess.c \
execinfo.c execinfo.in.h at-func.c faccessat.c fcntl.in.h \
fdatasync.c fdopendir.c filemode.h fpending.c fpending.h \
at-func.c fstatat.c fsync.c getgroups.c getloadavg.c getopt.c \
getopt.in.h getopt1.c getopt_int.h gettimeofday.c \
group-member.c ignore-value.h intprops.h inttypes.in.h lstat.c \
memrchr.c mktime-internal.h mktime.c openat.h pathmax.h \
pselect.c pthread_sigmask.c putenv.c readlink.c at-func.c \
readlinkat.c root-uid.h sig2str.c sig2str.h signal.in.h \
$(top_srcdir)/build-aux/snippet/_Noreturn.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 \
stat-time.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_select.in.h sys_stat.in.h \
sys_time.in.h time.in.h time_r.c timespec.h u64.h unistd.in.h \
utimens.h verify.h xalloc-oversized.h
stdint.in.h stdio.in.h stdlib.in.h strftime.h string.in.h \
strtoimax.c strtol.c strtoll.c strtol.c strtoul.c strtoull.c \
strtoimax.c strtoumax.c symlink.c sys_select.in.h \
sys_stat.in.h sys_time.in.h time.in.h time_r.c timespec.h \
u64.h unistd.in.h unsetenv.c utimens.h verify.h \
xalloc-oversized.h
MOSTLYCLEANDIRS = sys sys
MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t execinfo.h \
execinfo.h-t fcntl.h fcntl.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 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/select.h sys/select.h-t sys/stat.h \
sys/stat.h-t sys/time.h sys/time.h-t time.h time.h-t unistd.h \
unistd.h-t
MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t dirent.h \
dirent.h-t execinfo.h execinfo.h-t fcntl.h fcntl.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 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 string.h \
string.h-t sys/select.h sys/select.h-t sys/stat.h sys/stat.h-t \
sys/time.h sys/time.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$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
@ -914,15 +1025,18 @@ libgnu_a_SOURCES = allocator.c c-ctype.h c-ctype.c c-strcase.h \
c-strcasecmp.c c-strncasecmp.c careadlinkat.c close-stream.c \
md5.c sha1.c sha256.c sha512.c dtoastr.c dtotimespec.c \
filemode.c $(am__append_1) gettime.c stat-time.c strftime.c \
timespec.c timespec-add.c timespec-sub.c u64.c utimens.c
timespec.c timespec-add.c timespec-sub.c u64.c unistd.c \
utimens.c openat-die.c save-cwd.c
libgnu_a_LIBADD = $(gl_LIBOBJS)
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_libgnu_a_SOURCES = ftoastr.c dup2.c euidaccess.c execinfo.c \
at-func.c faccessat.c fpending.c getgroups.c getloadavg.c \
getopt.c getopt1.c gettimeofday.c group-member.c lstat.c \
mktime.c pselect.c pthread_sigmask.c readlink.c stat.c \
EXTRA_libgnu_a_SOURCES = openat-proc.c ftoastr.c dup2.c euidaccess.c \
execinfo.c at-func.c faccessat.c fdatasync.c fdopendir.c \
fpending.c at-func.c fstatat.c fsync.c getgroups.c \
getloadavg.c getopt.c getopt1.c gettimeofday.c group-member.c \
lstat.c memrchr.c mktime.c pselect.c pthread_sigmask.c \
putenv.c readlink.c at-func.c readlinkat.c sig2str.c stat.c \
strtoimax.c strtol.c strtoll.c strtol.c strtoul.c strtoull.c \
strtoimax.c strtoumax.c symlink.c time_r.c
strtoimax.c strtoumax.c symlink.c time_r.c unsetenv.c
# Because this Makefile snippet defines a variable used by other
# gnulib Makefile snippets, it must be present in all Makefile.am that
@ -993,8 +1107,12 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euidaccess.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/execinfo.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faccessat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdatasync.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdopendir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemode.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fpending.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstatat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsync.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftoastr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getgroups.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getloadavg.Po@am__quote@
@ -1005,13 +1123,20 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group-member.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-die.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-proc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pselect.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_sigmask.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putenv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlink.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlinkat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig2str.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strftime.Po@am__quote@
@ -1027,6 +1152,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec-sub.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u64.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimens.Po@am__quote@
.c.o:
@ -1255,6 +1382,45 @@ uninstall-am:
@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@
# We need the following in order to create <dirent.h> when the system
# doesn't have one that works with the given compiler.
dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|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_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
-e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \
-e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \
-e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \
-e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \
-e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \
-e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \
-e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \
-e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \
-e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \
-e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \
-e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \
-e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \
-e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \
-e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \
-e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \
-e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \
-e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \
-e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \
-e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \
-e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \
-e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|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)/dirent.in.h; \
} > $@-t && \
mv $@-t $@
# We need the following in order to create <execinfo.h> when the system
# doesn't have one that works.
@GL_GENERATE_EXECINFO_H_TRUE@execinfo.h: execinfo.in.h $(top_builddir)/config.status
@ -1649,6 +1815,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \
-e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \
-e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \
-e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
-e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
@ -1677,6 +1844,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
-e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
-e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
-e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
-e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
@ -1707,6 +1875,97 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
} > $@-t && \
mv $@-t $@
# We need the following in order to create <string.h> when the system
# doesn't have one that works with the given compiler.
string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(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_STRING_H''@|$(NEXT_STRING_H)|g' \
-e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \
-e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \
-e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \
-e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \
-e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \
-e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \
-e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \
-e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \
-e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \
-e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \
-e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \
-e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \
-e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \
-e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \
-e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \
-e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \
-e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \
-e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \
-e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \
-e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \
-e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \
-e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \
-e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \
-e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \
-e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \
-e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \
-e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \
-e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \
-e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \
-e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \
-e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \
-e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \
-e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \
-e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \
-e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \
-e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \
-e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \
< $(srcdir)/string.in.h | \
sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
-e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
-e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
-e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
-e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
-e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
-e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
-e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \
-e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
-e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
-e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \
-e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \
-e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \
-e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \
-e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \
-e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
-e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
-e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
-e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
-e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
-e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
-e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
-e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
-e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
-e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
-e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
-e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
-e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
-e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
-e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
-e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
-e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
-e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
-e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
-e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)/string.in.h; \
} > $@-t && \
mv $@-t $@
# We need the following in order to create <sys/select.h> when the system
# doesn't have one that works with the given compiler.
sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)

11
autogen/aclocal.m4 vendored
View file

@ -989,6 +989,7 @@ m4_include([m4/alloca.m4])
m4_include([m4/c-strtod.m4])
m4_include([m4/clock_time.m4])
m4_include([m4/close-stream.m4])
m4_include([m4/dirent_h.m4])
m4_include([m4/dup2.m4])
m4_include([m4/environ.m4])
m4_include([m4/euidaccess.m4])
@ -997,8 +998,12 @@ m4_include([m4/extensions.m4])
m4_include([m4/extern-inline.m4])
m4_include([m4/faccessat.m4])
m4_include([m4/fcntl_h.m4])
m4_include([m4/fdatasync.m4])
m4_include([m4/fdopendir.m4])
m4_include([m4/filemode.m4])
m4_include([m4/fpending.m4])
m4_include([m4/fstatat.m4])
m4_include([m4/fsync.m4])
m4_include([m4/getgroups.m4])
m4_include([m4/getloadavg.m4])
m4_include([m4/getopt.m4])
@ -1014,6 +1019,7 @@ m4_include([m4/longlong.m4])
m4_include([m4/lstat.m4])
m4_include([m4/manywarnings.m4])
m4_include([m4/md5.m4])
m4_include([m4/memrchr.m4])
m4_include([m4/mktime.m4])
m4_include([m4/multiarch.m4])
m4_include([m4/nocrash.m4])
@ -1021,10 +1027,14 @@ m4_include([m4/off_t.m4])
m4_include([m4/pathmax.m4])
m4_include([m4/pselect.m4])
m4_include([m4/pthread_sigmask.m4])
m4_include([m4/putenv.m4])
m4_include([m4/readlink.m4])
m4_include([m4/readlinkat.m4])
m4_include([m4/setenv.m4])
m4_include([m4/sha1.m4])
m4_include([m4/sha256.m4])
m4_include([m4/sha512.m4])
m4_include([m4/sig2str.m4])
m4_include([m4/signal_h.m4])
m4_include([m4/socklen.m4])
m4_include([m4/ssize_t.m4])
@ -1039,6 +1049,7 @@ m4_include([m4/stdint.m4])
m4_include([m4/stdio_h.m4])
m4_include([m4/stdlib_h.m4])
m4_include([m4/strftime.m4])
m4_include([m4/string_h.m4])
m4_include([m4/strtoimax.m4])
m4_include([m4/strtoll.m4])
m4_include([m4/strtoull.m4])

View file

@ -2,7 +2,7 @@
/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2013
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -56,15 +56,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define on FreeBSD to work around an issue when reading from a PTY. */
#undef BROKEN_PTY_READ_AFTER_EAGAIN
/* Define if the system is compatible with BSD 4.2. */
#undef BSD4_2
/* Define if the system is compatible with BSD 4.2. */
#undef BSD_SYSTEM
/* Define if AH_BOTTOM should change BSD_SYSTEM. */
#undef BSD_SYSTEM_AHB
/* Define if Emacs cannot be dumped on your system. */
#undef CANNOT_DUMP
@ -96,9 +87,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */
#undef DATA_SEG_BITS
/* Address of the start of the data segment. */
#undef DATA_START
/* Name of the default sound device. */
#undef DEFAULT_SOUND_DEVICE
@ -163,10 +151,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Mark a secondary stack, like the register stack on the ia64. */
#undef GC_MARK_SECONDARY_STACK
/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not
known to work. */
#undef GC_MARK_STACK
/* Define if setjmp is known to save all registers relevant for conservative
garbage collection in the jmp_buf. */
#undef GC_SETJMP_WORKS
@ -197,6 +181,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
whether the gnulib module faccessat shall be considered present. */
#undef GNULIB_FACCESSAT
/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
whether the gnulib module fdopendir shall be considered present. */
#undef GNULIB_FDOPENDIR
/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
whether the gnulib module fscanf shall be considered present. */
#undef GNULIB_FSCANF
@ -224,9 +212,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */
#undef HAVE_AIX_SMT_EXP
/* Define to 1 if you have the `alarm' function. */
#undef HAVE_ALARM
/* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
may be supplied by this distribution. */
#undef HAVE_ALLOCA
@ -262,6 +247,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `copysign' function. */
#undef HAVE_COPYSIGN
/* Define to 1 if data_start is the address of the start of the main data
segment. */
#undef HAVE_DATA_START
/* Define to 1 if using D-Bus. */
#undef HAVE_DBUS
@ -283,6 +272,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */
#undef HAVE_DBUS_WATCH_GET_UNIX_FD
/* Define to 1 if you have the declaration of `alarm', and to 0 if you don't.
*/
#undef HAVE_DECL_ALARM
/* Define to 1 if you have the declaration of `fdatasync', and to 0 if you
don't. */
#undef HAVE_DECL_FDATASYNC
/* Define to 1 if you have the declaration of `fdopendir', and to 0 if you
don't. */
#undef HAVE_DECL_FDOPENDIR
/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
*/
#undef HAVE_DECL_GETENV
@ -291,6 +292,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
don't. */
#undef HAVE_DECL_LOCALTIME_R
/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
don't. */
#undef HAVE_DECL_MEMRCHR
/* Define to 1 if you have the declaration of `strmode', and to 0 if you
don't. */
#undef HAVE_DECL_STRMODE
@ -319,6 +324,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
*/
#undef HAVE_DECL_TZNAME
/* Define to 1 if you have the declaration of `unsetenv', and to 0 if you
don't. */
#undef HAVE_DECL_UNSETENV
/* Define to 1 if you have the declaration of `_putenv', and to 0 if you
don't. */
#undef HAVE_DECL__PUTENV
/* Define to 1 if you have the declaration of `__fpending', and to 0 if you
don't. */
#undef HAVE_DECL___FPENDING
@ -336,6 +349,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `difftime' function. */
#undef HAVE_DIFFTIME
/* Define to 1 if you have the <dirent.h> header file. */
#undef HAVE_DIRENT_H
/* Define to 1 if you have the 'dup2' function. */
#undef HAVE_DUP2
@ -360,6 +376,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `faccessat' function. */
#undef HAVE_FACCESSAT
/* Define to 1 if you have the `fdatasync' function. */
#undef HAVE_FDATASYNC
/* Define to 1 if you have the `fdopendir' function. */
#undef HAVE_FDOPENDIR
/* Define to 1 if you have the `fork' function. */
#undef HAVE_FORK
@ -372,6 +394,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
#undef HAVE_FSEEKO
/* Define to 1 if you have the `fstatat' function. */
#undef HAVE_FSTATAT
/* Define to 1 if you have the `fsync' function. */
#undef HAVE_FSYNC
@ -478,12 +503,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `gtk_file_selection_new' function. */
#undef HAVE_GTK_FILE_SELECTION_NEW
/* Define to 1 if you have the `gtk_handle_box_new' function. */
#undef HAVE_GTK_HANDLE_BOX_NEW
/* Define to 1 if you have the `gtk_main' function. */
#undef HAVE_GTK_MAIN
/* Define to 1 if you have the `gtk_orientable_set_orientation' function. */
#undef HAVE_GTK_ORIENTABLE_SET_ORIENTATION
/* Define to 1 if you have the `gtk_tearoff_menu_item_new' function. */
#undef HAVE_GTK_TEAROFF_MENU_ITEM_NEW
/* Define to 1 if you have the `gtk_widget_get_mapped' function. */
#undef HAVE_GTK_WIDGET_GET_MAPPED
@ -514,6 +545,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have inet sockets. */
#undef HAVE_INET_SOCKETS
/* Define to 1 to use inotify. */
#undef HAVE_INOTIFY
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@ -670,6 +704,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `memrchr' function. */
#undef HAVE_MEMRCHR
/* 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. */
@ -681,9 +718,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define if you have mouse support. */
#undef HAVE_MOUSE
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@ -715,6 +749,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <png.h> header file. */
#undef HAVE_PNG_H
/* Define to 1 if using POSIX ACL support. */
#undef HAVE_POSIX_ACL
/* Define to 1 if you have the `posix_memalign' function. */
#undef HAVE_POSIX_MEMALIGN
@ -787,6 +824,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `shutdown' function. */
#undef HAVE_SHUTDOWN
/* Define to 1 if you have the `sig2str' function. */
#undef HAVE_SIG2STR
/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
#undef HAVE_SIGNED_SIG_ATOMIC_T
@ -909,6 +949,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
/* Define to 1 if you have the <sys/inotify.h> header file. */
#undef HAVE_SYS_INOTIFY_H
/* Define to 1 if you have the <sys/inttypes.h> header file. */
#undef HAVE_SYS_INTTYPES_H
@ -986,6 +1029,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `unsetenv' function. */
#undef HAVE_UNSETENV
/* Define to 1 if the system has the type 'unsigned long long int'. */
#undef HAVE_UNSIGNED_LONG_LONG_INT
@ -1025,6 +1071,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if `fork' works. */
#undef HAVE_WORKING_FORK
/* Define to 1 if fstatat (..., 0) works. For example, it does not work in AIX
7.1. */
#undef HAVE_WORKING_FSTATAT_ZERO_FLAG
/* Define if utimes works properly. */
#undef HAVE_WORKING_UTIMES
@ -1056,8 +1106,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if XIM is available */
#undef HAVE_XIM
/* Define to 1 if you have the XkbGetKeyboard function. */
#undef HAVE_XKBGETKEYBOARD
/* Define to 1 if you have the Xkb extension. */
#undef HAVE_XKB
/* Define to 1 if you have the Xpm library (-lXpm). */
#undef HAVE_XPM
@ -1184,9 +1234,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if the nlist n_name member is a pointer */
#undef N_NAME_POINTER
/* Define if the C compiler is the linker. */
#undef ORDINARY_LINK
/* Name of package */
#undef PACKAGE
@ -1331,9 +1378,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
timespec. */
#undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
/* Undocumented. */
#undef ULIMIT_BREAK_VALUE
/* Define to 1 for Encore UMAX. */
#undef UMAX
@ -1365,6 +1409,38 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using the Motif X toolkit. */
#undef USE_MOTIF
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable general extensions on OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable X/Open extensions if necessary. HP-UX 11.11 defines
mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
whether compiling with -Ae or -D_HPUX_SOURCE=1. */
#ifndef _XOPEN_SOURCE
# undef _XOPEN_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to 1 if we should use toolkit scroll bars. */
#undef USE_TOOLKIT_SCROLL_BARS
@ -1390,6 +1466,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Version number of package */
#undef VERSION
/* Define to 1 if unsetenv returns void instead of int. */
#undef VOID_UNSETENV
/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
'wchar_t'. */
#undef WCHAR_T_SUFFIX
@ -1426,10 +1505,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if the system is AIX. */
#undef _AIX
/* Enable large inode numbers on Mac OS X. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif
/* Enable large inode numbers on Mac OS X 10.5. */
#undef _DARWIN_USE_64_BIT_INODE
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
@ -1450,6 +1527,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if GNUstep uses ObjC exceptions. */
#undef _NATIVE_OBJC_EXCEPTIONS
/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
#undef _NETBSD_SOURCE
/* The _Noreturn keyword of C11. */
#if ! (defined _Noreturn \
|| (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
@ -1474,35 +1554,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Needed for system_process_attributes on Solaris. */
#undef _STRUCTURED_PROC
/* Define to 500 only on HP-UX. */
#undef _XOPEN_SOURCE
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable general extensions on Mac OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to rpl_ if the getopt replacement functions and variables should be
used. */
#undef __GETOPT_PREFIX
@ -1523,13 +1574,22 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
when FOO is an inline function in the header; see
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
_GL_INLINE_HEADER_END contains useful stuff to put
in the same include file, after uses of _GL_INLINE. */
#if (__GNUC__ \
? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
: 199901L <= __STDC_VERSION__)
in the same include file, after uses of _GL_INLINE.
Suppress extern inline with HP-UX cc, as it appears to be broken; see
<http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
Suppress the use of extern inline on Apple's platforms,
as Libc-825.25 (2012-09-19) is incompatible with it; see
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
Perhaps Apple will fix this some day. */
#if ((__GNUC__ \
? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
: 199901L <= __STDC_VERSION__ && !defined __HP_cc) \
&& !defined __APPLE__)
# define _GL_INLINE inline
# define _GL_EXTERN_INLINE extern inline
#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
# if __GNUC_GNU_INLINE__
/* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
@ -1538,8 +1598,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
# endif
# define _GL_EXTERN_INLINE extern
#else
# define _GL_INLINE static inline
# define _GL_EXTERN_INLINE static inline
# define _GL_INLINE static _GL_UNUSED
# define _GL_EXTERN_INLINE static _GL_UNUSED
#endif
#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
@ -1567,12 +1627,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to rpl_gmtime if the replacement function should be used. */
#undef gmtime
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.

2760
autogen/configure vendored

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,7 @@
#!/bin/bash
### update_autogen - update the generated files in Emacs autogen/ directory
## Copyright (C) 2011-2012 Free Software Foundation, Inc.
## Copyright (C) 2011-2013 Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>

View file

@ -8,7 +8,7 @@ VERSION='2012-01-06 07:23'; # UTC
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# Copyright (C) 2002-2013 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

View file

@ -1,5 +1,5 @@
/* A C macro for declaring that specific arguments must not be NULL.
Copyright (C) 2009-2012 Free Software Foundation, Inc.
Copyright (C) 2009-2013 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

View file

@ -1,5 +1,5 @@
/* C++ compatible function declaration macros.
Copyright (C) 2010-2012 Free Software Foundation, Inc.
Copyright (C) 2010-2013 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

View file

@ -1,5 +1,5 @@
/* A C macro for emitting warnings if a function is used.
Copyright (C) 2010-2012 Free Software Foundation, Inc.
Copyright (C) 2010-2013 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
@ -55,7 +55,7 @@
rather than issue the nice warning, but the end result of informing
the developer about their portability problem is still achieved):
#if HAVE_RAW_DECL_ENVIRON
static inline char ***rpl_environ (void) { return &environ; }
static char ***rpl_environ (void) { return &environ; }
_GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
# undef environ
# define environ (*rpl_environ ())

View file

@ -1,8 +1,8 @@
#!/bin/sh
# Write into $1/subdirs.el a list of subdirs of directory $1.
# Copyright (C) 1994-1995, 1997, 1999, 2001-2012
# Free Software Foundation, Inc.
# Copyright (C) 1994-1995, 1997, 1999, 2001-2013 Free Software
# Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,7 +1,7 @@
@echo off
rem ----------------------------------------------------------------------
rem Configuration script for MSDOS
rem Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc.
rem Copyright (C) 1994-1999, 2001-2013 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.

View file

@ -4,7 +4,7 @@ dnl autoconf
dnl in the directory containing this script.
dnl If you changed any AC_DEFINES, also run autoheader.
dnl
dnl Copyright (C) 1994-1996, 1999-2012 Free Software Foundation, Inc.
dnl Copyright (C) 1994-1996, 1999-2013 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Emacs.
dnl
@ -23,6 +23,21 @@ dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.65)
AC_INIT(emacs, 24.3.50)
dnl This is the documented way to record the args passed to configure,
dnl rather than $ac_configure_args.
emacs_config_options="$@"
## Add some environment variables, if they were passed via the environment
## rather than on the command-line.
for var in CFLAGS CPPFLAGS LDFLAGS; do
case "$emacs_config_options" in
*$var=*) continue ;;
esac
eval val="\$${var}"
test x"$val" = x && continue
emacs_config_options="${emacs_config_options}${emacs_config_options:+ }$var=\"$val\""
done
AC_CONFIG_HEADER(src/config.h:src/config.in)
AC_CONFIG_SRCDIR(src/lisp.h)
AC_CONFIG_AUX_DIR(build-aux)
@ -130,7 +145,7 @@ OPTION_DEFAULT_ON([sound],[don't compile with sound support])
dnl FIXME currently it is not the last.
dnl This should be the last --with option, because --with-x is
dnl added later on when we find the path of X, and it's best to
dnl added later on when we find the file name of X, and it's best to
dnl keep them together visually.
AC_ARG_WITH([x-toolkit],[AS_HELP_STRING([--with-x-toolkit=KIT],
[use an X toolkit (KIT one of: yes or gtk, gtk2, gtk3, lucid or athena, motif, no)])],
@ -184,7 +199,9 @@ OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
OPTION_DEFAULT_ON([gconf],[don't compile with GConf support])
OPTION_DEFAULT_ON([gsettings],[don't compile with GSettings support])
OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support])
OPTION_DEFAULT_ON([acl],[don't compile with ACL support])
OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support])
OPTION_DEFAULT_ON([inotify],[don't compile with inotify (file-watch) support])
## For the times when you want to build Emacs but don't have
## a suitable makeinfo, and can live without the manuals.
@ -205,20 +222,14 @@ fi
AC_SUBST(GZIP_INFO)
AC_ARG_WITH([pkg-config-prog],dnl
[AS_HELP_STRING([--with-pkg-config-prog=PATH],
[path to pkg-config for finding GTK and librsvg])])
[AS_HELP_STRING([--with-pkg-config-prog=FILENAME],
[file name of pkg-config for finding GTK and librsvg])])
if test "X${with_pkg_config_prog}" != X; then
if test "${with_pkg_config_prog}" != yes; then
PKG_CONFIG="${with_pkg_config_prog}"
fi
fi
CRT_DIR=
AC_ARG_WITH([crt-dir],dnl
[AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc.
The default is /usr/lib, or /usr/lib64 on some platforms.])])
CRT_DIR="${with_crt_dir}"
AC_ARG_WITH(gameuser,dnl
[AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])])
test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \
@ -226,7 +237,8 @@ test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \
test "X$gameuser" = X && gameuser=games
AC_ARG_WITH([gnustep-conf],dnl
[AS_HELP_STRING([--with-gnustep-conf=PATH],[path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])])
[AS_HELP_STRING([--with-gnustep-conf=FILENAME],
[name of GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])])
test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \
GNUSTEP_CONFIG_FILE="${with_gnustep_conf}"
test "X$GNUSTEP_CONFIG_FILE" = "X" && \
@ -353,8 +365,13 @@ AC_ARG_ENABLE(autodepend,
found])],
[ac_enable_autodepend="${enableval}"],[ac_enable_autodepend=yes])
AC_ARG_ENABLE(gtk-deprecation-warnings,
[AS_HELP_STRING([--enable-gtk-deprecation-warnings],
[Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])],
[ac_enable_gtk_deprecation_warnings="${enableval}"],[])
#### Make srcdir absolute, if it isn't already. It's important to
#### avoid running the path through pwd unnecessarily, since pwd can
#### avoid running the file name through pwd unnecessarily, since pwd can
#### give you automounter prefixes, which can go away. We do all this
#### so Emacs can find its files when run uninstalled.
## Make sure CDPATH doesn't affect cd (in case PWD is relative).
@ -364,17 +381,17 @@ case "${srcdir}" in
. )
## We may be able to use the $PWD environment variable to make this
## absolute. But sometimes PWD is inaccurate.
## Note: we used to use ${PWD} at the end instead of `pwd`,
## Note: we used to use $PWD at the end instead of `pwd`,
## but that tested only for a well-formed and valid PWD,
## it did not object when PWD was well-formed and valid but just wrong.
if test ".${PWD}" != "." && test ".`(cd ${PWD} ; sh -c pwd)`" = ".`pwd`" ;
if test ".$PWD" != "." && test ".`(cd "$PWD" ; sh -c pwd)`" = ".`pwd`" ;
then
srcdir="$PWD"
else
srcdir="`(cd ${srcdir}; pwd)`"
srcdir=`(cd "$srcdir"; pwd)`
fi
;;
* ) srcdir="`(cd ${srcdir}; pwd)`" ;;
* ) srcdir=`(cd "$srcdir"; pwd)` ;;
esac
### Canonicalize the configuration name.
@ -582,7 +599,8 @@ else
test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS"
fi
# Avoid gnulib's tests for O_NOATIME and O_NOFOLLOW, as we don't use them.
# Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW,
# as we don't use them.
AC_DEFUN([gl_FCNTL_O_FLAGS])
# Avoid gnulib's threadlib module, as we do threads our own way.
AC_DEFUN([gl_THREADLIB])
@ -624,7 +642,7 @@ fi
AC_ARG_ENABLE([gcc-warnings],
[AS_HELP_STRING([--enable-gcc-warnings],
[turn on lots of GCC warnings. This is intended for
[turn on lots of GCC warnings/errors. This is intended for
developers, and may generate false alarms when used
with older or non-GNU development tools.])],
[case $enableval in
@ -732,23 +750,12 @@ else
# <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
nw="$nw -Wshadow"
# Emacs's use of alloca inhibits protecting the stack.
nw="$nw -Wstack-protector"
# The following line should be removable at some point.
nw="$nw -Wsuggest-attribute=pure"
AC_MSG_CHECKING([whether to use -Wstack-protector])
AC_PREPROC_IFELSE(
[AC_LANG_PROGRAM(
[[#if (1 <= __LONG_MAX__ >> 31 >> 31 \
&& 4 < __GNUC__ + (7 < __GNUC_MINOR__ + (2 <= __GNUC_PATCHLEVEL__)))
/* OK */
#else
#error "Not GCC, or GCC before 4.7.2, or 'long int' has < 64 bits."
#endif
]])],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
nw="$nw -Wstack-protector"])
gl_MANYWARN_ALL_GCC([ws])
gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
for w in $ws; do
@ -818,9 +825,13 @@ fi
AC_PATH_PROG(MAKEINFO, makeinfo, no)
dnl By this stage, configure has already checked for egrep and set EGREP,
dnl or exited with an error if no egrep was found.
if test "$MAKEINFO" != "no" && \
test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)'`" = x; then
MAKEINFO=no
if test "$MAKEINFO" != "no"; then
case `
$MAKEINFO --version 2> /dev/null |
$EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)'
` in
'') MAKEINFO=no;;
esac
fi
## Makeinfo is unusual. For a released Emacs, the manuals are
@ -838,7 +849,7 @@ if test "$MAKEINFO" = "no"; then
MAKEINFO=makeinfo
if test "x${with_makeinfo}" = "xno"; then
HAVE_MAKEINFO=no
elif test ! -e $srcdir/info/emacs; then
elif test ! -e "$srcdir/info/emacs" && test ! -e "$srcdir/info/emacs.info"; then
AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your
source tree does not seem to have pre-built manuals in the `info' directory.
Either install a suitable version of makeinfo, or re-run configure
@ -1046,45 +1057,32 @@ AC_DEFUN([AC_TYPE_UID_T])
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
cygwin )
LIB_MATH=
START_FILES='pre-crt0.o'
;;
darwin )
## Adding -lm confuses the dynamic linker, so omit it.
LIB_MATH=
START_FILES='pre-crt0.o'
;;
freebsd )
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
SYSTEM_TYPE=berkeley-unix
;;
gnu-linux | gnu-kfreebsd )
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
;;
hpux10-20 | hpux11 )
LIB_STANDARD=-lc
START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o'
;;
mingw32 )
LIB_MATH=
;;
dnl NB this may be adjusted below.
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
;;
@ -1095,96 +1093,9 @@ case $opsys in
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=
for file in x $LIB_STANDARD $START_FILES; do
case "$file" in
*CRT_DIR*) crt_files="$crt_files `echo $file | sed -e 's|.*/||'`" ;;
esac
done
if test "x$crt_files" != x; then
## If user specified a crt-dir, use that unconditionally.
crt_gcc=no
if test "X$CRT_DIR" = "X"; then
CRT_DIR=/usr/lib # default
case "$canonical" in
x86_64-*-linux-gnu* | s390x-*-linux-gnu*)
## On x86-64 and s390x GNU/Linux distributions, the standard library
## can be in a variety of places. We only try /usr/lib64 and /usr/lib.
## For anything else (eg /usr/lib32), it is up the user to specify
## the location (bug#5655).
## Test for crtn.o, not just the directory, because sometimes the
## directory exists but does not have the relevant files (bug#1287).
## FIXME better to test for binary compatibility somehow.
test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
;;
powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;;
esac
case "$opsys" in
hpux10-20) CRT_DIR=/lib ;;
esac
test "x${GCC}" = xyes && crt_gcc=yes
fi # CRT_DIR = ""
crt_missing=
for file in $crt_files; do
## If we're using gcc, try to determine it automatically by asking
## gcc. [If this doesn't work, CRT_DIR will remain at the
## system-dependent default from above.]
if test $crt_gcc = yes && test ! -e $CRT_DIR/$file; then
crt_file=`$CC --print-file-name=$file 2>/dev/null`
case "$crt_file" in
*/*)
CRT_DIR=`AS_DIRNAME(["$crt_file"])`
;;
esac
fi
dnl We expect all the files to be in a single directory, so after the
dnl first there is no point asking gcc.
crt_gcc=no
test -e $CRT_DIR/$file || crt_missing="$crt_missing $file"
done # $crt_files
test "x$crt_missing" = x || \
AC_MSG_ERROR([Required file(s) not found:$crt_missing
Try using the --with-crt-dir option.])
fi # crt_files != ""
AC_SUBST(CRT_DIR)
case $opsys in
netbsd | openbsd )
if test -f $CRT_DIR/crti.o; then
test -f $CRT_DIR/crtn.o || \
AC_MSG_ERROR([Required file not found: crtn.o])
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
fi
;;
esac
pre_PKG_CONFIG_CFLAGS=$CFLAGS
pre_PKG_CONFIG_LIBS=$LIBS
@ -1200,15 +1111,15 @@ AC_DEFUN([PKG_CHECK_MODULES], [
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])
*** The pkg-config script could not be found. Make sure it is in your path, or give the full name of 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])
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
if "$PKG_CONFIG" --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" 2>&AS_MESSAGE_LOG_FD &&
$1_CFLAGS=`$PKG_CONFIG --cflags "$2" 2>&AS_MESSAGE_LOG_FD` &&
$1_LIBS=`$PKG_CONFIG --libs "$2" 2>&AS_MESSAGE_LOG_FD`; then
if "$PKG_CONFIG" --exists "$2" 2>&AS_MESSAGE_LOG_FD &&
$1_CFLAGS=`"$PKG_CONFIG" --cflags "$2" 2>&AS_MESSAGE_LOG_FD` &&
$1_LIBS=`"$PKG_CONFIG" --libs "$2" 2>&AS_MESSAGE_LOG_FD`; then
edit_cflags="
s,///*,/,g
s/^/ /
@ -1226,7 +1137,7 @@ AC_DEFUN([PKG_CHECK_MODULES], [
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so. Do it in a subshell
## to capture any diagnostics in invoking pkg-config.
$1_PKG_ERRORS=`($PKG_CONFIG --print-errors "$2") 2>&1`
$1_PKG_ERRORS=`("$PKG_CONFIG" --print-errors "$2") 2>&1`
ifelse([$4], ,echo "$$1_PKG_ERRORS",)
fi
@ -1303,7 +1214,7 @@ dnl checks for header files
AC_CHECK_HEADERS_ONCE(
linux/version.h sys/systeminfo.h
coff.h pty.h
sys/vlimit.h sys/resource.h
sys/resource.h
sys/utsname.h pwd.h utmp.h util.h)
AC_MSG_CHECKING(if personality LINUX32 can be set)
@ -1491,8 +1402,8 @@ tmp_CPPFLAGS="$CPPFLAGS"
tmp_CFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c"
CFLAGS="$CFLAGS -x objective-c"
TEMACS_LDFLAGS2="\${LDFLAGS}"
GNU_OBJC_CFLAGS=
LIBS_GNUSTEP=
if test "${with_ns}" != no; then
if test "${opsys}" = darwin; then
NS_IMPL_COCOA=yes
@ -1519,9 +1430,7 @@ if test "${with_ns}" != no; then
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
LIB_STANDARD=
START_FILES=
TEMACS_LDFLAGS2=
LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread"
dnl GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS to 0 or 1.
dnl If they had chosen to either define it or not, we could have
dnl just used AC_CHECK_DECL here.
@ -1572,7 +1481,7 @@ fail;
fi
fi
AC_SUBST(TEMACS_LDFLAGS2)
AC_SUBST(LIBS_GNUSTEP)
INSTALL_ARCH_INDEP_EXTRA=install-etc
ns_self_contained=no
@ -1610,11 +1519,12 @@ AC_SUBST(INSTALL_ARCH_INDEP_EXTRA)
AC_SUBST(ns_self_contained)
AC_SUBST(NS_OBJ)
AC_SUBST(NS_OBJC_OBJ)
AC_SUBST(LIB_STANDARD)
HAVE_W32=no
W32_OBJ=
W32_LIBS=
W32_RES=
W32_RES_LINK=
if test "${with_w32}" != no; then
if test "${opsys}" != "cygwin"; then
if test "${opsys}" != "mingw32"; then
@ -1644,11 +1554,17 @@ fi
if test "${HAVE_W32}" = "yes"; then
AC_DEFINE(HAVE_NTGUI, 1, [Define to use native MS Windows GUI.])
AC_CHECK_TOOL(WINDRES, [windres],
[AC_MSG_ERROR([No resource compiler found.])])
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
if test "${opsys}" = "cygwin"; then
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
W32_RES="emacs.res"
# Tell the linker that emacs.res is an object (which we compile from
# the rc file), not a linker script.
W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res"
else
W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
W32_LIBS="$W32_LIBS -lwinmm -ladvapi32 -lgdi32 -lcomdlg32 -luser32"
@ -1657,6 +1573,8 @@ if test "${HAVE_W32}" = "yes"; then
fi
AC_SUBST(W32_OBJ)
AC_SUBST(W32_LIBS)
AC_SUBST(W32_RES)
AC_SUBST(W32_RES_LINK)
if test "${HAVE_W32}" = "yes"; then
window_system=w32
@ -1704,11 +1622,6 @@ dnl use the toolkit if we have gtk, or X11R5 or newer.
;;
esac
if test -n "${term_header}"; then
AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}",
[Define to the header for the built-in window system.])
fi
if test "$window_system" = none && test "X$with_x" != "Xno"; then
AC_CHECK_PROG(HAVE_XSERVER, X, true, false)
if test "$HAVE_XSERVER" = true ||
@ -1767,6 +1680,20 @@ if test "${system_malloc}" = "yes"; then
else
test "$doug_lea_malloc" != "yes" && GMALLOC_OBJ=gmalloc.o
VMLIMIT_OBJ=vm-limit.o
AC_CHECK_HEADERS([sys/vlimit.h])
AC_CACHE_CHECK([for data_start], [emacs_cv_data_start],
[AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[extern char data_start[]; char ch;]],
[[return data_start < &ch;]])],
[emacs_cv_data_start=yes],
[emacs_cv_data_start=no])])
if test $emacs_cv_data_start = yes; then
AC_DEFINE([HAVE_DATA_START], 1,
[Define to 1 if data_start is the address of the start
of the main data segment.])
fi
fi
AC_SUBST(GMALLOC_OBJ)
AC_SUBST(VMLIMIT_OBJ)
@ -1936,7 +1863,7 @@ if test "${HAVE_X11}" = "yes"; then
emacs_xkb=yes, emacs_xkb=no)
AC_MSG_RESULT($emacs_xkb)
if test $emacs_xkb = yes; then
AC_DEFINE(HAVE_XKBGETKEYBOARD, 1, [Define to 1 if you have the XkbGetKeyboard function.])
AC_DEFINE(HAVE_XKB, 1, [Define to 1 if you have the Xkb extension.])
fi
AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
@ -1995,7 +1922,8 @@ if test "${HAVE_X11}" = "yes"; then
## 6.2.8 is the earliest version known to work, but earlier versions
## might work - let us know if you find one.
## 6.0.7 does not work. See bug#7955.
IMAGEMAGICK_MODULE="Wand >= 6.2.8"
## 6.8.2 makes Emacs crash; see Bug#13867.
IMAGEMAGICK_MODULE="Wand >= 6.2.8 Wand != 6.8.2"
PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :)
AC_SUBST(IMAGEMAGICK_CFLAGS)
AC_SUBST(IMAGEMAGICK_LIBS)
@ -2030,6 +1958,9 @@ if test "${opsys}" != "mingw32"; then
GTK_OBJ=emacsgtkfixed.o
term_header=gtkutil.h
USE_GTK_TOOLKIT="GTK3"
if test "x$ac_enable_gtk_deprecation_warnings" = x; then
GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS"
fi
else
check_gtk2=yes
gtk3_pkg_errors="$GTK_PKG_ERRORS "
@ -2071,7 +2002,7 @@ if test x"$pkg_check_gtk" = xyes; then
AC_DEFINE(USE_GTK, 1, [Define to 1 if using GTK.])
GTK_OBJ="gtkutil.o $GTK_OBJ"
USE_X_TOOLKIT=none
if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then
if "$PKG_CONFIG" --atleast-version=2.10 gtk+-2.0; then
:
else
AC_MSG_WARN([[Your version of Gtk+ will have problems with
@ -2106,6 +2037,23 @@ if test "${HAVE_GTK}" = "yes"; then
AC_CHECK_FUNCS(gtk_file_selection_new)
fi
dnl Same as above for gtk_handle_box.
HAVE_GTK_HANDLE_BOX=no
AC_CHECK_DECL(GTK_TYPE_HANDLE_BOX, HAVE_GTK_HANDLE_BOX=yes,
HAVE_GTK_HANDLE_BOX=no, [AC_INCLUDES_DEFAULT
#include <gtk/gtk.h>])
if test "$HAVE_GTK_HANDLE_BOX" = yes; then
AC_CHECK_FUNCS(gtk_handle_box_new)
fi
dnl Same as above for gtk_tearoff_menu_item.
HAVE_GTK_TEAROFF_MENU_ITEM=no
AC_CHECK_DECL(GTK_TYPE_TEAROFF_MENU_ITEM, HAVE_GTK_TEAROFF_MENU_ITEM=yes,
HAVE_GTK_TEAROFF_MENU_ITEM=no, [AC_INCLUDES_DEFAULT
#include <gtk/gtk.h>])
if test "$HAVE_GTK_TEAROFF_MENU_ITEM" = yes; then
AC_CHECK_FUNCS(gtk_tearoff_menu_item_new)
fi
dnl Check for functions introduced in 2.14 and later.
AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \
@ -2219,6 +2167,34 @@ fi
AC_SUBST(LIBGNUTLS_LIBS)
AC_SUBST(LIBGNUTLS_CFLAGS)
dnl inotify is only available on GNU/Linux.
if test "${with_inotify}" = "yes"; then
AC_CHECK_HEADERS(sys/inotify.h)
if test "$ac_cv_header_sys_inotify_h" = yes ; then
AC_CHECK_FUNC(inotify_init1)
fi
fi
if test "$ac_cv_func_inotify_init1" = yes; then
AC_DEFINE(HAVE_INOTIFY, 1, [Define to 1 to use inotify.])
fi
dnl POSIX ACL support: provided by libacl on GNU/Linux, by libc on FreeBSD.
HAVE_POSIX_ACL=no
LIBACL_LIBS=
if test "${with_acl}" = "yes"; then
AC_CHECK_LIB([acl], [acl_set_file], HAVE_POSIX_ACL=yes, HAVE_POSIX_ACL=no)
if test "$HAVE_POSIX_ACL" = yes; then
AC_DEFINE(HAVE_POSIX_ACL, 1, [Define to 1 if using POSIX ACL support.])
LIBACL_LIBS=-lacl
else
AC_CHECK_FUNC(acl_set_file, HAVE_POSIX_ACL=yes, HAVE_POSIX_ACL=no)
if test "$HAVE_POSIX_ACL" = yes; then
AC_DEFINE(HAVE_POSIX_ACL, 1, [Define to 1 if using POSIX ACL support.])
fi
fi
fi
AC_SUBST(LIBACL_LIBS)
dnl Do not put whitespace before the #include statements below.
dnl Older compilers (eg sunos4 cc) choke on it.
HAVE_XAW3D=no
@ -3026,7 +3002,7 @@ select getpagesize setlocale \
utimes getrlimit setrlimit shutdown getaddrinfo \
strsignal setitimer \
sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
gai_strerror mkstemp getline getdelim fsync sync \
gai_strerror mkstemp getline getdelim sync \
difftime posix_memalign \
getpwent endpwent getgrent endgrent \
touchlock \
@ -3761,7 +3737,7 @@ case $opsys in
AC_DEFINE(PTY_ITERATION, [])
dnl Not used, because PTY_ITERATION is defined.
AC_DEFINE(FIRST_PTY_LETTER, ['q'])
AC_DEFINE(PTY_OPEN, [ { struct sigaction ocstat, cstat; struct stat stb; char * name; sigemptyset(&cstat.sa_mask); cstat.sa_handler = SIG_DFL; cstat.sa_flags = 0; sigaction(SIGCLD, &cstat, &ocstat); name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); sigaction(SIGCLD, &ocstat, (struct sigaction *)0); if (name == 0) return -1; if (fd < 0) return -1; if (fstat (fd, &stb) < 0) return -1; strcpy (pty_name, name); }])
AC_DEFINE(PTY_OPEN, [ { struct sigaction ocstat, cstat; struct stat stb; char * name; sigemptyset(&cstat.sa_mask); cstat.sa_handler = SIG_DFL; cstat.sa_flags = 0; sigaction(SIGCHLD, &cstat, &ocstat); name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); sigaction(SIGCHLD, &ocstat, (struct sigaction *)0); if (name == 0) return -1; if (fd < 0) return -1; if (fstat (fd, &stb) < 0) return -1; strcpy (pty_name, name); }])
dnl No need to get the pty name at all.
AC_DEFINE(PTY_NAME_SPRINTF, [])
dnl No need to use sprintf to get the tty name--we get that from _getpty.
@ -3772,12 +3748,12 @@ case $opsys in
dnl On SysVr4, grantpt(3) forks a subprocess, so keep sigchld_handler()
dnl from intercepting that death. If any child but grantpt's should die
dnl within, it should be caught after sigrelse(2).
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; int grantpt_result; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); grantpt_result = grantpt (fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (grantpt_result == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); }])
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; int grantpt_result; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); grantpt_result = grantpt (fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (grantpt_result == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); }])
;;
unixware )
dnl Comments are as per sol2*.
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; int grantpt_result; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); grantpt_result = grantpt (fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (grantpt_result == -1) fatal("could not grant slave pty"); if (unlockpt(fd) == -1) fatal("could not unlock slave pty"); if (!(ptyname = ptsname(fd))) fatal ("could not enable slave pty"); snprintf (pty_name, sizeof pty_name, "%s", ptyname); }])
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; int grantpt_result; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); grantpt_result = grantpt (fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (grantpt_result == -1) fatal("could not grant slave pty"); if (unlockpt(fd) == -1) fatal("could not unlock slave pty"); if (!(ptyname = ptsname(fd))) fatal ("could not enable slave pty"); snprintf (pty_name, sizeof pty_name, "%s", ptyname); }])
;;
esac
@ -3800,7 +3776,7 @@ AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by
case $opsys in
dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX.
dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX.
aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd )
aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin )
AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
;;
@ -3822,9 +3798,7 @@ case $opsys in
esac
dnl Used in vm-limit.c
AH_TEMPLATE(DATA_START, [Address of the start of the data segment.])
dnl Used in lisp.h, emacs.c, mem-limits.h
dnl Used in lisp.h, emacs.c, vm-limit.c
dnl NEWS.18 describes this as "a number which contains
dnl the high bits to be inclusive or'ed with pointers that are unpacked."
AH_TEMPLATE(DATA_SEG_BITS, [Extra bits to be or'd in with any pointers
@ -3832,24 +3806,20 @@ stored in a Lisp_Object.])
dnl if Emacs uses fewer than 32 bits for the value field of a LISP_OBJECT.
case $opsys in
gnu)
dnl libc defines data_start.
AC_DEFINE(DATA_START, [({ extern int data_start; (char *) &data_start; })])
aix*)
dnl This works with 32-bit executables; Emacs doesn't support 64-bit.
AC_DEFINE(DATA_SEG_BITS, [0x20000000])
;;
hpux*)
dnl The data segment on this machine always starts at address 0x40000000.
AC_DEFINE(DATA_START, [0x40000000])
AC_DEFINE(DATA_SEG_BITS, [0x40000000])
;;
irix6-5)
AC_DEFINE(DATA_START, [0x10000000])
AC_DEFINE(DATA_SEG_BITS, [0x10000000])
;;
esac
AH_TEMPLATE(ULIMIT_BREAK_VALUE, [Undocumented.])
AH_TEMPLATE(TAB3, [Undocumented.])
case $opsys in
@ -3861,14 +3831,6 @@ case $opsys in
;;
gnu-linux | gnu-kfreebsd )
dnl libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared
dnl library, we cannot get the maximum address for brk.
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
#ifndef __i386__
# error "not i386"
#endif
]], [[]])], AC_DEFINE(ULIMIT_BREAK_VALUE, [(32*1024*1024)]), [])
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
#ifndef __ia64__
# error "not ia64"
@ -3882,30 +3844,16 @@ case $opsys in
AC_DEFINE(RUN_TIME_REMAP, 1, [Define if emacs.c needs to call
run_time_remap; for HPUX.])
;;
irix6-5)
dnl Ulimit(UL_GMEMLIM) is busted...
AC_DEFINE(ULIMIT_BREAK_VALUE, [0x14000000])
;;
esac
dnl These won't be used automatically yet. We also need to know, at least,
dnl This won't be used automatically yet. We also need to know, at least,
dnl that the stack is continuous.
AH_TEMPLATE(GC_SETJMP_WORKS, [Define if setjmp is known to save all
registers relevant for conservative garbage collection in the jmp_buf.])
AH_TEMPLATE(GC_MARK_STACK, [Define to GC_USE_GCPROS_AS_BEFORE if
conservative garbage collection is not known to work.])
case $opsys in
aix4-2 | hpux* | unixware)
dnl Conservative garbage collection has not been tested, so for now
dnl play it safe and stick with the old-fashioned way of marking.
AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE])
;;
dnl Not all the architectures are tested, but there are Debian packages
dnl for SCM and/or Guile on them, so the technique must work. See also
dnl comments in alloc.c concerning setjmp and gcc.
@ -3920,8 +3868,7 @@ case $opsys in
#else
# error "setjmp not known to work on this arch"
#endif
]], [[]])], AC_DEFINE(GC_SETJMP_WORKS, 1),
AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE]) )
]], [[]])], AC_DEFINE(GC_SETJMP_WORKS, 1))
;;
esac
@ -3993,8 +3940,6 @@ esac
dnl Define symbols to identify the version of Unix this is.
dnl Define all the symbols that apply correctly.
AH_TEMPLATE(BSD4_2, [Define if the system is compatible with BSD 4.2.])
AH_TEMPLATE(BSD_SYSTEM, [Define if the system is compatible with BSD 4.2.])
AH_TEMPLATE(DOS_NT, [Define if the system is MS DOS or MS Windows.])
AH_TEMPLATE(MSDOS, [Define if the system is MS DOS.])
AH_TEMPLATE(USG, [Define if the system is compatible with System III.])
@ -4018,33 +3963,12 @@ case $opsys in
;;
darwin)
dnl BSD4_3 and BSD4_4 are already defined in sys/param.h.
AC_DEFINE(BSD4_2, [])
AC_DEFINE(BSD_SYSTEM, [])
dnl More specific than the above two. We cannot use __APPLE__ as this
dnl may not be defined on non-OSX Darwin, and we cannot define DARWIN
dnl here because Panther and lower CoreFoundation.h uses DARWIN to
dnl Not __APPLE__, as this may not be defined on non-OSX Darwin.
dnl Not DARWIN, because Panther and lower CoreFoundation.h use DARWIN to
dnl distinguish OS X from pure Darwin.
AC_DEFINE(DARWIN_OS, [], [Define if the system is Darwin.])
;;
freebsd)
AC_DEFINE(BSD4_2, [])
dnl Hack to avoid calling AC_PREPROC_IFELSE multiple times.
dnl Would not be needed with autoconf >= 2.67, where the
dnl preprocessed output is accessible in "conftest.i".
AC_DEFINE(BSD_SYSTEM_AHB, 1, [Define if AH_BOTTOM should change BSD_SYSTEM.])
;;
gnu | netbsd | openbsd )
AC_DEFINE(BSD4_2, [])
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
#ifndef BSD_SYSTEM
# error "BSD_SYSTEM not defined"
#endif
]], [[]])], [], AC_DEFINE(BSD_SYSTEM, 43) )
;;
gnu-linux | gnu-kfreebsd )
AC_DEFINE(USG, [])
AC_DEFINE(GNU_LINUX, [], [Define if ths system is compatible with GNU/Linux.])
@ -4171,7 +4095,7 @@ fi
version=$PACKAGE_VERSION
copyright="Copyright (C) 2012 Free Software Foundation, Inc."
copyright="Copyright (C) 2013 Free Software Foundation, Inc."
AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
[Short copyright string for this version of Emacs.])
AC_SUBST(copyright)
@ -4226,7 +4150,9 @@ fi
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
[Define to the canonical Emacs configuration name.])
AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
dnl Replace any embedded " characters (bug#13274).
emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g"`
AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}",
[Define to the options passed to configure.])
AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure
define this to include extra configuration information.])
@ -4427,15 +4353,8 @@ case "$opsys" in
LD_SWITCH_SYSTEM_TEMACS="-fno-pie -prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"
## This is here because src/Makefile.in did some extra fiddling around
## with LD_SWITCH_SYSTEM. The cpp logic was:
## #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.
## 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,
## rather than LD_SWITCH_SYSTEM.
## with LD_SWITCH_SYSTEM. It seems cleaner to put this in
## LD_SWITCH_SYSTEM_TEMACS instead,
test "x$LD_SWITCH_SYSTEM" = "x" && test "x$GCC" != "xyes" && \
LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS"
;;
@ -4456,98 +4375,11 @@ case "$opsys" in
*) LD_SWITCH_SYSTEM_TEMACS= ;;
esac
if test "$NS_IMPL_GNUSTEP" = "yes"; then
LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
fi
AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
LD_FIRSTFLAG=
ORDINARY_LINK=
case "$opsys" in
## gnu: GNU needs its own crt0.
aix4-2|cygwin|darwin|gnu|hpux*|irix6-5|mingw32|sol2*|unixware) ORDINARY_LINK=yes ;;
## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the
## library search parth, i.e. it won't search /usr/lib for libc and
## friends. Using -nostartfiles instead avoids this problem, and
## will also work on earlier NetBSD releases.
netbsd|openbsd) LD_FIRSTFLAG="-nostartfiles" ;;
## powerpc*: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says
## MkLinux/LinuxPPC needs this.
## s390x-* only supports opsys = gnu-linux so it can be added here.
gnu-*)
case "$canonical" in
powerpc*|s390x-*) LD_FIRSTFLAG="-nostdlib" ;;
esac
;;
esac
if test "x$ORDINARY_LINK" = "xyes"; then
LD_FIRSTFLAG=""
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 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
## places that are difficult to figure out at make time. Fortunately,
## these same versions allow you to pass arbitrary flags on to the
## linker, so there is no reason not to use it as a linker.
##
## Well, it is not quite perfect. The "-nostdlib" keeps GCC from
## searching for libraries in its internal directories, so we have to
## ask GCC explicitly where to find libgcc.a (LIB_GCC below).
LD_FIRSTFLAG="-nostdlib"
fi
## FIXME? What setting of EDIT_LDFLAGS should this have?
test "$NS_IMPL_GNUSTEP" = "yes" && LD_FIRSTFLAG="-rdynamic"
AC_SUBST(LD_FIRSTFLAG)
## FIXME? The logic here is not precisely the same as that above.
## There is no check here for a pre-defined LD_FIRSTFLAG.
## Should we only be setting LIB_GCC if LD ~ -nostdlib?
LIB_GCC=
if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
case "$opsys" in
freebsd|netbsd|openbsd) LIB_GCC= ;;
gnu-*)
## armin76@gentoo.org reported that the lgcc_s flag is necessary to
## build on ARM EABI under GNU/Linux. (Bug#5518)
case $host_cpu in
arm*)
LIB_GCC="-lgcc_s"
;;
*)
## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then
## immediately undefine it again and redefine it to empty.
## Was the C_SWITCH_X_SITE part really necessary?
## LIB_GCC=`$CC $C_SWITCH_X_SITE -print-libgcc-file-name`
LIB_GCC=
;;
esac
;;
## Ask GCC where to find libgcc.a.
*) LIB_GCC=`$CC -print-libgcc-file-name 2> /dev/null` ;;
esac
fi dnl if $GCC
AC_SUBST(LIB_GCC)
## Common for all window systems
if test "$window_system" != "none"; then
AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.])
AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.])
WINDOW_SYSTEM_OBJ="fontset.o fringe.o image.o"
fi
@ -4555,7 +4387,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ)
AH_TOP([/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012
Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2013
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -4713,7 +4545,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
dnl test/ is not present in release tarfiles.
opt_makefile=test/automated/Makefile
if test -f $srcdir/${opt_makefile}.in; then
if test -f "$srcdir/$opt_makefile.in"; then
SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
dnl Again, it's best not to use a variable. Though you can add
dnl ", [], [opt_makefile='$opt_makefile']" and it should work.
@ -4724,7 +4556,7 @@ fi
dnl admin/ may or may not be present.
opt_makefile=admin/unidata/Makefile
if test -f $srcdir/${opt_makefile}.in; then
if test -f "$srcdir/$opt_makefile.in"; then
SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
AC_CONFIG_FILES([admin/unidata/Makefile])
fi
@ -4755,9 +4587,9 @@ ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force
], [GCC="$GCC" CPPFLAGS="$CPPFLAGS"])
AC_CONFIG_COMMANDS([gdbinit], [
if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then
echo creating src/.gdbinit
echo source $srcdir/src/.gdbinit > src/.gdbinit
echo "source $srcdir/src/.gdbinit" > src/.gdbinit
fi
])

View file

@ -1,3 +1,137 @@
2013-03-17 Paul Eggert <eggert@cs.ucla.edu>
doc: convert some TeX accents to UTF-8
* ack.texi (Acknowledgments):
* emacs.texi (Acknowledgments):
Convert some TeX accents (e.g., '@l{}') to UTF-8 (e.g., 'ł').
Apparently the TeX accents cause problems when generating gnu.org
web pages, e.g., @l{} is rendered as '/l' on
<http://www.gnu.org/software/emacs/manual/html_node/
emacs/Acknowledgments.html>.
2013-03-16 Glenn Morris <rgm@gnu.org>
* emacs.texi (Top): Add some stuff specific to www.gnu.org.
2013-03-16 Glenn Morris <rgm@gnu.org>
* Version 24.3 released.
2013-03-04 Paul Eggert <eggert@cs.ucla.edu>
Prefer UTF-8 for documentation.
With GNU Texinfo 5.0, this generates nicer-looking info files,
since they can use curly quotes. With older Texinfo it doesn't matter.
* ack.texi, cal-xtra.texi, calendar.texi, emacs-xtra.texi, emacs.texi:
Switch from Latin-1 to UTF-8.
2013-02-28 Bastien Guerry <bzg@gnu.org>
* xresources.texi (GTK resources): Fix broken link.
2013-02-25 Eli Zaretskii <eliz@gnu.org>
* files.texi (Interlocking): Don't refer to symlinks as the
exclusive means of locking files.
2013-02-22 Glenn Morris <rgm@gnu.org>
* ack.texi (Acknowledgments):
* emacs.texi (Acknowledgments): Small updates.
2013-02-21 Glenn Morris <rgm@gnu.org>
* files.texi (File Conveniences): Not just GIFs can be animated.
2013-02-13 Glenn Morris <rgm@gnu.org>
* ack.texi (Acknowledgments): Don't mention yow any more.
2013-02-13 Paul Eggert <eggert@cs.ucla.edu>
* cmdargs.texi (General Variables):
Fix TMPDIR documentation to match the code's behavior.
2013-02-10 Glenn Morris <rgm@gnu.org>
* trouble.texi (Checklist): Update bug keybinding.
2013-02-09 Eli Zaretskii <eliz@gnu.org>
* msdog.texi (Text and Binary): Delete the description of
file-name-buffer-file-type-alist.
2013-01-19 Paul Eggert <eggert@cs.ucla.edu>
* trouble.texi (Crashing): Suggest -p for newer addr2line. (Bug#13445)
Without it, I don't see function names. Older addr2line
implementations will die out sooner or later, so tailor the
first suggestion to recent addr2line, with a followup about
older ones.
2013-01-19 Glenn Morris <rgm@gnu.org>
* custom.texi (Directory Variables): Fix paren typo.
* trouble.texi (Crashing): Not all addr2line have -p. (Bug#13445)
* custom.texi (Custom Themes): Fix typo.
2013-01-07 Bastien Guerry <bzg@gnu.org>
* help.texi (Apropos): Document `apropos-user-option' and update
the doc for `apropos-variable'.
2013-01-05 Glenn Morris <rgm@gnu.org>
* text.texi (HTML Mode): Remove deleted nxml C-RET binding.
2012-12-21 Glenn Morris <rgm@gnu.org>
* emacs-xtra.texi (copying): The FSF does not sell copies of this.
Simply include doclicense.
2012-12-21 Chong Yidong <cyd@gnu.org>
* frames.texi (Mouse Commands): Fix description of the effect of
mouse dragging (Bug#13049).
2012-12-15 Juri Linkov <juri@jurta.org>
* misc.texi (Recursive Edit): Add a link to "Query Replace".
(Bug#13181)
2012-12-10 Dani Moncayo <dmoncayo@gmail.com>
* killing.texi (Deletion): Doc fix (Bug#12748).
2012-12-06 Paul Eggert <eggert@cs.ucla.edu>
* doclicense.texi, gpl.texi: Update to latest version from FSF.
These are just minor editorial changes.
2012-12-06 Juanma Barranquero <lekktu@gmail.com>
* vc1-xtra.texi (General VC Options): Remove obsolete reference
to `vc-path'.
2012-12-03 Chong Yidong <cyd@gnu.org>
* custom.texi (Init Rebinding): kbd is now a function (Bug#13052).
2012-12-02 Kevin Ryde <user42@zip.com.au>
* maintaining.texi (Tag Syntax): Mention (defvar foo) handling.
2012-12-01 Kevin Ryde <user42@zip.com.au>
* maintaining.texi (Tag Syntax): Mention Perl's "use constant".
2012-11-24 Paul Eggert <eggert@cs.ucla.edu>
* doclicense.texi, gpl.texi: Update to latest version from FSF.
These are just minor editorial changes.
2012-11-21 Dani Moncayo <dmoncayo@gmail.com>
* display.texi (Auto Scrolling): Fix some inaccuracies, plus
@ -9667,7 +9801,7 @@
;; coding: utf-8
;; End:
Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.

View file

@ -1,6 +1,6 @@
#### Makefile for the Emacs Manual
# Copyright (C) 1994, 1996-2012 Free Software Foundation, Inc.
# Copyright (C) 1994, 1996-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Abbrevs
@chapter Abbrevs
@ -141,7 +141,7 @@ abbrev definitions, both global and local.
When Abbrev mode is enabled, an abbrev expands whenever it is
present in the buffer just before point and you type a self-inserting
whitespace or punctuation character (@key{SPC}, comma, etc.@:). More
whitespace or punctuation character (@key{SPC}, comma, etc.). More
precisely, any character that is not a word constituent expands an
abbrev, and any word-constituent character can be part of an abbrev.
The most common way to use an abbrev is to insert it and then insert a

View file

@ -1,6 +1,6 @@
@c -*- coding: iso-latin-1 -*-
@c -*- coding: utf-8 -*-
@c This is part of the Emacs manual.
@c Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
@c Copyright (C) 1994-1997, 1999-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@node Acknowledgments
@ -44,7 +44,7 @@ Tomas Abrahamsson wrote @file{artist.el}, a package for producing
@acronym{ASCII} art with a mouse or with keyboard keys.
@item
Jay K.@: Adams wrote @file{jka-compr.el} and @file{jka-cmpr-hook.el},
Jay K. Adams wrote @file{jka-compr.el} and @file{jka-cmpr-hook.el},
providing automatic decompression and recompression for compressed
files.
@ -53,7 +53,7 @@ Michael Albinus wrote @file{dbus.el}, a package that implements the
D-Bus message bus protocol; @file{zeroconf.el}, a mode for browsing
Avahi services; @file{xesam.el}, a Xesam-based search engine
interface; and @file{secrets.el}, an interface to keyring daemons for
storing confidential data. He and Kai Großjohann wrote the Tramp package, which
storing confidential data. He and Kai Großjohann wrote the Tramp package, which
provides transparent remote file editing using rcp, ssh, ftp, and
other network protocols. He and Daniel Pittman wrote
@file{tramp-cache.el}.
@ -68,7 +68,7 @@ Joe Arceneaux wrote the original text property implementation, and
implemented support for X11.
@item
Emil Åström, Milan Zamaza, and Stefan Bruda wrote @file{prolog.el},
Emil Åström, Milan Zamaza, and Stefan Bruda wrote @file{prolog.el},
a mode for editing Prolog (and Mercury) code.
@item
@ -96,13 +96,13 @@ Eli Barzilay wrote @file{calculator.el}, a desktop calculator for
Emacs.
@item
Steven L.@: Baur wrote @file{footnote.el} which lets you include
Steven L. Baur wrote @file{footnote.el} which lets you include
footnotes in email messages; and @file{gnus-audio.el} and
@file{earcon.el}, which provide sound effects for Gnus. He also wrote
@file{gnus-setup.el}.
@item
Alexander L.@: Belikoff, Sergey Berezin, Sacha Chua, David Edmondson,
Alexander L. Belikoff, Sergey Berezin, Sacha Chua, David Edmondson,
Noah Friedman, Andreas Fuchs, Mario Lang, Ben Mesander, Lawrence
Mitchell, Gergely Nagy, Michael Olson, Per Persson, Jorgen Schaefer,
Alex Schroeder, and Tom Tromey wrote ERC, an advanced Internet Relay
@ -115,7 +115,7 @@ Christian Limpach and Adrian Robert developed and maintained the
NeXTstep port of Emacs.
@item
Anna M.@: Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
@item
Ray Blaak and Simon South wrote @file{delphi.el}, a mode for editing
@ -130,14 +130,14 @@ Jim Blandy wrote Emacs 19's input system, brought its configuration and
build process up to the GNU coding standards, and contributed to the
frame support and multi-face support. Jim also wrote @file{tvi970.el},
terminal support for the TeleVideo 970 terminals; and co-wrote
@file{wyse50.el} (q.v.@:).
@file{wyse50.el} (q.v.).
@item
Per Bothner wrote @file{term.el}, a terminal emulator in an Emacs
buffer.
@item
Terrence M.@: Brannon wrote @file{landmark.el}, a neural-network robot
Terrence M. Brannon wrote @file{landmark.el}, a neural-network robot
that learns landmarks.
@item
@ -162,11 +162,11 @@ Kevin Broadey wrote @file{foldout.el}, providing folding extensions to
Emacs's outline modes.
@item
David M.@: Brown wrote @file{array.el}, for editing arrays and other
David M. Brown wrote @file{array.el}, for editing arrays and other
tabular data.
@item
W@l{}odek Bzyl and Ryszard Kubiak wrote @file{ogonek.el}, a package for
Włodek Bzyl and Ryszard Kubiak wrote @file{ogonek.el}, a package for
changing the encoding of Polish characters.
@item
@ -184,7 +184,7 @@ Emacs Lisp functions; and @file{trace.el}, a tracing facility for Emacs
Lisp.
@item
Chris Chase, Carsten Dominik, and J.@: D.@: Smith wrote IDLWAVE mode,
Chris Chase, Carsten Dominik, and J. D. Smith wrote IDLWAVE mode,
for editing IDL and WAVE CL.
@item
@ -202,7 +202,7 @@ Andrew Choi and Yamamoto Mitsuharu wrote the Carbon support, used
prior to Emacs 23 for Mac OS.
@item
Chong Yidong was the Emacs co-maintainer from Emacs 23 onwards. He made many
Chong Yidong was the Emacs co-maintainer from Emacs 23 to 24.3. He made many
improvements to the Emacs display engine. He also wrote
@file{tabulated-list.el}, a generic major mode for lists of data;
and improved support for themes and packages.
@ -260,16 +260,16 @@ text replace the current selection.
Eric Ding wrote @file{goto-addr.el},
@item
Jan Djärv added support for the GTK+ toolkit and X drag-and-drop.
Jan Djärv added support for the GTK+ toolkit and X drag-and-drop.
He also wrote @file{dynamic-setting.el}.
@item
Carsten Dominik wrote Ref@TeX{}, a package for setting up labels and
cross-references in @LaTeX{} documents; and co-wrote IDLWAVE mode
(q.v.@:). He was the original author of Org mode, for maintaining notes,
(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
Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S.@: Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip
over maintainership. Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böcker, Lennart
Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S. Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip
Jackson, Martyn Jago, Thorsten Jolitz, Jambunathan K, Tokuya Kameshima, Sergey Litvinov, David Maus, Ross Patterson, Juan Pechiar, Sebastian Rose, Eric Schulte,
Paul Sexton, Ulf Stegemann, Andy Stewart, Christopher Suckling, David O'Toole, John Wiegley, Zhang Weize,
Piotr Zielinski, and others also wrote various Org mode components.
@ -303,7 +303,7 @@ folders have mail waiting in them; and @file{iswitchb.el}, a feature
for incremental reading and completion of buffer names.
@item
Torbjörn Einarsson wrote @file{f90.el}, a mode for Fortran 90 files.
Torbjörn Einarsson wrote @file{f90.el}, a mode for Fortran 90 files.
@item
Tsugutomo Enami co-wrote the support for international character sets.
@ -365,7 +365,7 @@ Kevin Gallagher rewrote and enhanced the EDT emulation, and wrote
flow control.
@item
Fabián E. Gallina rewrote @file{python.el}, the major mode for the
Fabián E. Gallina rewrote @file{python.el}, the major mode for the
Python programming language used in Emacs 24.3 onwards.
@item
@ -373,7 +373,7 @@ Kevin Gallo added multiple-frame support for Windows NT and wrote
@file{w32-win.el}, support functions for the MS-Windows window system.
@item
Juan León Lahoz García wrote @file{wdired.el}, a package for
Juan León Lahoz García wrote @file{wdired.el}, a package for
performing file operations by directly editing Dired buffers.
@item
@ -429,7 +429,7 @@ characters used by @TeX{} and net tradition.
@item
Bastien Guerry wrote @file{gnus-bookmark.el}, bookmark support for Gnus;
as well as helping to maintain Org mode (q.v.@:).
as well as helping to maintain Org mode (q.v.).
@item
Henry Guillaume wrote @file{find-file.el}, a package to visit files
@ -456,7 +456,7 @@ Jesper Harder wrote @file{yenc.el}, for decoding yenc encoded messages.
Alexandru Harsanyi wrote a library for accessing SOAP web services.
@item
K.@: Shane Hartman wrote @file{chistory.el} and @file{echistory.el},
K. Shane Hartman wrote @file{chistory.el} and @file{echistory.el},
packages for browsing command history lists; @file{electric.el} and
@file{helper.el}, which provide an alternative command loop and
appropriate help facilities; @file{emacsbug.el}, a package for
@ -510,9 +510,9 @@ He also wrote @file{network-stream.el}, for opening network processes;
@file{url-queue.el}, for controlling parallel downloads of URLs;
and implemented libxml2 support.
Components of Gnus have also been written by: Nagy Andras, David
Blacka, Scott Byer, Ludovic Courtès, Julien Danjou, Kevin Greiner, Kai
Großjohann, Joe Hildebrand, Paul Jarc, Simon Josefsson, Sascha
Lüdecke, David Moore, Jim Radford, Benjamin Rutt, Raymond Scholz,
Blacka, Scott Byer, Ludovic Courtès, Julien Danjou, Kevin Greiner, Kai
Großjohann, Joe Hildebrand, Paul Jarc, Simon Josefsson, Sascha
Lüdecke, David Moore, Jim Radford, Benjamin Rutt, Raymond Scholz,
Thomas Steffen, Reiner Steib, Didier Verna, Ilja Weis, Katsumi
Yamaoka, Teodor Zlatanov, and others (@pxref{Contributors,,,gnus, the
Gnus Manual}).
@ -553,7 +553,7 @@ S/MIME and Sieve components; and @file{tls.el} and @file{starttls.el}
for the Transport Layer Security protocol.
@item
Arne Jørgensen wrote @file{latexenc.el}, a package to
Arne Jørgensen wrote @file{latexenc.el}, a package to
automatically guess the correct coding system in @LaTeX{} files.
@item
@ -605,7 +605,7 @@ files and running a PostScript interpreter interactively from within
Emacs.
@item
Karel Klí@v{c} contributed SELinux support, for preserving the
Karel Klíč contributed SELinux support, for preserving the
Security-Enhanced Linux context of files on backup and copy.
@item
@ -617,7 +617,7 @@ Pavel Kobyakov wrote @file{flymake.el}, a minor mode for performing
on-the-fly syntax checking.
@item
David M.@: Koppelman wrote @file{hi-lock.el}, a minor mode for
David M. Koppelman wrote @file{hi-lock.el}, a minor mode for
interactive automatic highlighting of parts of the buffer text.
@item
@ -630,12 +630,12 @@ menu support.
@item
Sebastian Kremer wrote @code{dired-mode}, with contributions by Lawrence
R.@: Dodd. He also wrote @file{ls-lisp.el}, a Lisp emulation of the
R. Dodd. He also wrote @file{ls-lisp.el}, a Lisp emulation of the
@code{ls} command for platforms that don't have @code{ls} as a standard
program.
@item
David K@ringaccent{a}gedal wrote @file{tempo.el}, providing support for
David Kågedal wrote @file{tempo.el}, providing support for
easy insertion of boilerplate text and other common constructions.
@item
@ -647,7 +647,7 @@ Daniel LaLiberte wrote @file{edebug.el}, a source-level debugger for
Emacs Lisp; @file{cl-specs.el}, specifications to help @code{edebug}
debug code written using David Gillespie's Common Lisp support; and
@file{isearch.el}, Emacs's incremental search minor mode. He also
co-wrote @file{hideif.el} (q.v.@:).
co-wrote @file{hideif.el} (q.v.).
@item
Karl Landstrom and Daniel Colascione wrote @file{js.el}, a mode for
@ -673,7 +673,7 @@ Emacs Lisp programs.
@item
Lars Lindberg wrote @file{msb.el}, which provides more flexible menus
for buffer selection; co-wrote @file{imenu.el} (q.v.@:); and rewrote
for buffer selection; co-wrote @file{imenu.el} (q.v.); and rewrote
@file{dabbrev.el}, originally written by Don Morrison.
@item
@ -694,7 +694,7 @@ directory-local variables; and the @code{info-finder} feature that
creates a virtual Info manual of package keywords.
@item
Károly L@H{o}rentey wrote the ``multi-terminal'' code, which allows
Károly Lőrentey wrote the ``multi-terminal'' code, which allows
Emacs to run on graphical and text terminals simultaneously.
@item
@ -726,7 +726,7 @@ the display of the Emacs tool bar. With Riccardo Murri he wrote
Eric Ludlam wrote the Speedbar package; @file{checkdoc.el}, for checking
doc strings in Emacs Lisp programs; @file{dframe.el}, providing
dedicated frame support modes; @file{ezimage.el}, a generalized way to
place images over text; @file{chart.el} for drawing bar charts etc; and
place images over text; @file{chart.el} for drawing bar charts etc.; and
the EIEIO (Enhanced Implementation of Emacs Interpreted Objects)
package. He was also the main author of the CEDET (Collection of Emacs
Development Environment Tools) package. Portions were also written by
@ -752,11 +752,11 @@ maintained CC Mode from Emacs 22 onwards.
Michael McNamara and Wilson Snyder wrote Verilog mode.
@item
Christopher J.@: Madsen wrote @file{decipher.el}, a package for cracking
Christopher J. Madsen wrote @file{decipher.el}, a package for cracking
simple substitution ciphers.
@item
Neil M.@: Mager wrote @file{appt.el}, functions to notify users of their
Neil M. Mager wrote @file{appt.el}, functions to notify users of their
appointments. It finds appointments recorded in the diary files
used by the @code{calendar} package.
@ -811,9 +811,8 @@ Richard Mlynarik wrote @file{cl-indent.el}, a package for indenting
Common Lisp code; @file{ebuff-menu.el}, an ``electric'' browser for
buffer listings; @file{ehelp.el}, bindings for browsing help screens;
@file{rfc822.el}, a parser for E-mail addresses in the RFC-822 format,
used in mail messages and news articles; @file{terminal.el}, a
terminal emulator for Emacs subprocesses; and @file{yow.el}, an
essential utility.
used in mail messages and news articles; and @file{terminal.el}, a
terminal emulator for Emacs subprocesses.
@item
Gerd Moellmann was the Emacs maintainer from the beginning of Emacs 21
@ -826,7 +825,7 @@ facility. He also wrote @code{ebrowse}, the C@t{++} browser;
and @file{rx.el}, a regular expression constructor.
@item
Stefan Monnier was the Emacs co-maintainer from Emacs 23 onwards. He added
Stefan Monnier was the Emacs (co-)maintainer from Emacs 23 onwards. He added
support for Arch and Subversion to VC, re-wrote much of the Emacs server
to use the built-in networking primitives, and re-wrote the abbrev and
minibuffer completion code for Emacs 23. He also wrote @code{PCL-CVS},
@ -859,7 +858,7 @@ Erik Naggum wrote the time-conversion functions. He also wrote
@file{parse-time.el}, for parsing time strings.
@item
Takahashi Naoto co-wrote @file{quail.el} (q.v.@:), and wrote
Takahashi Naoto co-wrote @file{quail.el} (q.v.), and wrote
@file{robin.el}, another input method.
@item
@ -908,7 +907,7 @@ Takaaki Ota wrote @file{table.el}, a package for creating and editing
embedded text-based tables.
@item
Pieter E.@: J.@: Pareit wrote @file{mixal-mode.el}, an editing mode for
Pieter E. J. Pareit wrote @file{mixal-mode.el}, an editing mode for
the MIX assembly language.
@item
@ -924,7 +923,7 @@ Damon Anton Permezel wrote @file{hanoi.el}, an animated demonstration of
the ``Towers of Hanoi'' puzzle.
@item
William M.@: Perry wrote @file{mailcap.el} (with Lars Magne
William M. Perry wrote @file{mailcap.el} (with Lars Magne
Ingebrigtsen), a MIME media types configuration facility;
@file{mwheel.el}, a package for supporting mouse wheels; co-wrote (with
Dave Love) @file{socks.el}, a Socks v5 client; and developed the URL
@ -953,7 +952,7 @@ support for Wyse 50 terminals. He also co-wrote @file{compile.el}
(q.v.@:) and @file{ada-stmt.el}.
@item
Richard L.@: Pieri wrote @file{pop3.el}, a Post Office Protocol (RFC
Richard L. Pieri wrote @file{pop3.el}, a Post Office Protocol (RFC
1460) interface for Emacs.
@item
@ -961,7 +960,7 @@ Fred Pierresteguy and Paul Reilly made Emacs work with X Toolkit
widgets.
@item
François Pinard, Greg McGary, and Bruno Haible wrote @file{po.el},
François Pinard, Greg McGary, and Bruno Haible wrote @file{po.el},
support for PO translation files.
@item
@ -976,12 +975,12 @@ minor mode for displaying a ruler in the header line; and
structures.
@item
Francesco A.@: Potorti wrote @file{cmacexp.el}, providing a command which
Francesco A. Potorti wrote @file{cmacexp.el}, providing a command which
runs the C preprocessor on a region of a file and displays the results.
He also expanded and redesigned the @code{etags} program.
@item
Michael D.@: Prange and Steven A.@: Wood wrote @file{fortran.el}, a mode
Michael D. Prange and Steven A. Wood wrote @file{fortran.el}, a mode
for editing Fortran code.
@item
@ -989,7 +988,7 @@ Ashwin Ram wrote @file{refer.el}, commands to look up references in
bibliography files by keyword.
@item
Eric S.@: Raymond wrote @file{vc.el}, an interface to the RCS and SCCS
Eric S. Raymond wrote @file{vc.el}, an interface to the RCS and SCCS
source code version control systems, with Paul Eggert; @file{gud.el},
a package for running source-level debuggers like GDB and SDB in
Emacs; @file{asm-mode.el}, a mode for editing assembly language code;
@ -1005,14 +1004,14 @@ used in Emacs Lisp library files; and code to set and make use of the
which each lisp function loaded into Emacs came.
@item
Edward M.@: Reingold wrote the calendar and diary support,
Edward M. Reingold wrote the calendar and diary support,
with contributions from Stewart Clamen (@file{cal-mayan.el}), Nachum
Dershowitz (@file{cal-hebrew.el}), Paul Eggert (@file{cal-dst.el}),
Steve Fisk (@file{cal-tex.el}), Michael Kifer (@file{cal-x.el}), Lara
Rios (@file{cal-menu.el}), and Denis B.@: Roegel (@file{solar.el}).
Rios (@file{cal-menu.el}), and Denis B. Roegel (@file{solar.el}).
Andy Oram contributed to its documentation. Reingold also contributed
to @file{tex-mode.el}, a mode for editing @TeX{} files, as did William
F.@: Schelter, Dick King, Stephen Gildea, Michael Prange, and Jacob
F. Schelter, Dick King, Stephen Gildea, Michael Prange, and Jacob
Gore.
@item
@ -1031,7 +1030,7 @@ VT line of terminals.
@item
Nick Roberts wrote @file{t-mouse.el}, for mouse support in text
terminals; and @file{gdb-ui.el}, a graphical user interface to GDB.
terminals; and @file{gdb-ui.el}, a graphical user interface to GDB@.
Together with Dmitry Dzhus, he wrote @file{gdb-mi.el}, the successor to
@file{gdb-ui.el}.
@ -1043,7 +1042,7 @@ into ``handwriting''.
Markus Rost wrote @file{cus-test.el}, a testing framework for customize.
@item
Guillermo J.@: Rozas wrote @file{scheme.el}, a mode for editing Scheme and
Guillermo J. Rozas wrote @file{scheme.el}, a mode for editing Scheme and
DSSSL code.
@item
@ -1067,7 +1066,7 @@ Kevin Ryde wrote @file{info-xref.el}, a library for checking
references in Info files.
@item
James B.@: Salem and Brewster Kahle wrote @file{completion.el}, providing
James B. Salem and Brewster Kahle wrote @file{completion.el}, providing
dynamic word completion.
@item
@ -1091,7 +1090,7 @@ Michael Schmidt and Tom Perrine wrote @file{modula2.el}, a mode for
editing Modula-2 code, based on work by Mick Jordan and Peter Robinson.
@item
Ronald S.@: Schnell wrote @file{dunnet.el}, a text adventure game.
Ronald S. Schnell wrote @file{dunnet.el}, a text adventure game.
@item
Philippe Schnoebelen wrote @file{gomoku.el}, a Go Moku game played
@ -1111,7 +1110,7 @@ for interactively running an SQL interpreter in an Emacs buffer;
@file{cus-theme.el}, an interface for custom themes; @file{master.el}, a
package for making a buffer @samp{master} over another; and
@file{spam-stat.el}, for statistical detection of junk email. He also
wrote parts of the IRC client ERC (q.v.@:).
wrote parts of the IRC client ERC (q.v.).
@item
Randal Schwartz wrote @file{pp.el}, a pretty-printer for lisp objects.
@ -1162,7 +1161,7 @@ David Smith wrote @file{ielm.el}, a mode for interacting with the Emacs
Lisp interpreter as a subprocess.
@item
Paul D.@: Smith wrote @file{snmp-mode.el}.
Paul D. Smith wrote @file{snmp-mode.el}.
@item
William Sommerfeld wrote @file{scribe.el}, a mode for editing Scribe
@ -1204,7 +1203,7 @@ cursor'' that you can move with the keyboard and use for copying text.
Ken Stevens wrote @file{ispell.el}, a spell-checker interface.
@item
Kim F.@: Storm made many improvements to the Emacs display engine,
Kim F. Storm made many improvements to the Emacs display engine,
process support, and networking support. He also wrote
@file{bindat.el}, a package for encoding and decoding binary data;
CUA mode, which allows Emacs to emulate the standard CUA key
@ -1225,7 +1224,7 @@ Olaf Sylvester wrote @file{bs.el}, a package for manipulating Emacs
buffers.
@item
Tibor @v{S}imko and Milan Zamazal wrote @file{slovak.el}, support for
Tibor Šimko and Milan Zamazal wrote @file{slovak.el}, support for
editing text in Slovak language.
@item
@ -1278,12 +1277,12 @@ for Gnus; and @file{timezone.el}, providing functions for dealing with
time zones.
@item
Neil W.@: Van Dyke wrote @file{webjump.el}, a ``hot links'' package.
Neil W. Van Dyke wrote @file{webjump.el}, a ``hot links'' package.
@item
Didier Verna wrote @file{rect.el}, a package of functions for
operations on rectangle regions of text. He also contributed to Gnus
(q.v.@:).
(q.v.).
@item
Joakim Verona implemented ImageMagick support.
@ -1332,7 +1331,7 @@ the shift key and motion commands; and @file{dos-fns.el}, functions
for use under MS-DOS.
@item
Joe Wells wrote the original version of @file{apropos.el} (q.v.@:);
Joe Wells wrote the original version of @file{apropos.el} (q.v.);
@file{resume.el}, support for processing command-line arguments after
resuming a suspended Emacs job; and @file{mail-extr.el}, a package for
extracting names and addresses from mail headers, with contributions
@ -1346,12 +1345,12 @@ mode for editing VHDL source code.
John Wiegley wrote @file{align.el}, a set of commands for aligning text
according to regular-expression based rules; @file{isearchb.el} for fast
buffer switching; @file{timeclock.el}, a package for keeping track of
time spent on projects; the Bahá'í calendar support;
time spent on projects; the Bahá'í calendar support;
@file{pcomplete.el}, a programmable completion facility;
@file{remember.el}, a mode for jotting down things to remember;
@file{eudcb-mab.el}, an address book backend for the Emacs Unified
Directory Client; and @code{eshell}, a command shell implemented
entirely in Emacs Lisp. He also contributed to Org mode (q.v.@:).
entirely in Emacs Lisp. He also contributed to Org mode (q.v.).
@item
Mike Williams wrote @file{thingatpt.el}, a library of functions for
@ -1362,16 +1361,16 @@ Roland Winkler wrote @file{proced.el}, a system process editor.
@item
Bill Wohler wrote MH-E, the Emacs interface to the MH mail system;
making use of earlier work by James R.@: Larus. Satyaki Das, Peter S.@:
Galbraith, Stephen Gildea, and Jeffrey C.@: Honig also wrote various
making use of earlier work by James R. Larus. Satyaki Das, Peter S.
Galbraith, Stephen Gildea, and Jeffrey C. Honig also wrote various
MH-E components.
@item
Dale R.@: Worley wrote @file{emerge.el}, a package for interactively
Dale R. Worley wrote @file{emerge.el}, a package for interactively
merging two versions of a file.
@item
Francis J.@: Wright wrote @file{woman.el}, a package for browsing
Francis J. Wright wrote @file{woman.el}, a package for browsing
manual pages without the @code{man} command.
@item
@ -1429,13 +1428,13 @@ messages; @file{rfc1843.el}, an HZ decoding package;
other Gnus components.
@item
Ian T.@: Zimmerman wrote @file{gametree.el}.
Ian T. Zimmerman wrote @file{gametree.el}.
@item
Reto Zimmermann wrote @file{vera-mode.el}.
@item
Neal Ziring and Felix S.@: T.@: Wu wrote @file{vi.el}, an emulation of the
Neal Ziring and Felix S. T. Wu wrote @file{vi.el}, an emulation of the
VI text editor.
@item

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2005-2012 Free Software Foundation, Inc.
@c Copyright (C) 2005-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Antinews

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the
@ -40,7 +40,7 @@ explained in the corresponding sections.
@menu
* Auto Reverting the Buffer Menu:: Auto Revert of the Buffer Menu.
* Auto Reverting Dired:: Auto Revert of Dired buffers.
* Supporting additional buffers:: How to add more Auto Revert support.
* Supporting additional buffers:: How to add more Auto Revert support.
@end menu
@node Auto Reverting the Buffer Menu
@ -66,9 +66,9 @@ operating systems. It may not work satisfactorily on some other
systems.
Dired buffers only auto-revert when the file list of the buffer's main
directory changes (e.g. when a new file is added). They do not
directory changes (e.g., when a new file is added). They do not
auto-revert when information about a particular file changes
(e.g. when the size changes) or when inserted subdirectories change.
(e.g., when the size changes) or when inserted subdirectories change.
To be sure that @emph{all} listed information is up to date, you have
to manually revert using @kbd{g}, @emph{even} if auto-reverting is
enabled in the Dired buffer. Sometimes, you might get the impression

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Basic
@chapter Basic Editing Commands
@ -107,7 +107,7 @@ just like digits. Case is ignored.
of a character, using the minibuffer. If you enter a name, the
command provides completion (@pxref{Completion}). If you enter a
code-point, it should be as a hexadecimal number (the convention for
Unicode), or a number with a specified radix, e.g.@: @code{#o23072}
Unicode), or a number with a specified radix, e.g., @code{#o23072}
(octal); @xref{Integer Basics,,, elisp, The Emacs Lisp Reference
Manual}. The command then inserts the corresponding character into
the buffer. For example, both of the following insert the infinity
@ -385,7 +385,7 @@ On some text terminals, Emacs may not recognize the @key{DEL} key
properly. @xref{DEL Does Not Delete}, if you encounter this problem.
The @key{delete} (@code{delete-forward-char}) command deletes in the
``opposite direction'': it deletes the character after point, i.e. the
``opposite direction'': it deletes the character after point, i.e., the
character under the cursor. If point was at the end of a line, this
joins the following line onto this one. Like @kbd{@key{DEL}}, it
deletes the text in the region if the region is active (@pxref{Mark}).

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Buffers
@chapter Using Multiple Buffers
@ -44,8 +44,8 @@ variables}---variables that can have a different value in each buffer.
by the largest buffer position representable by @dfn{Emacs integers}.
This is because Emacs tracks buffer positions using that data type.
For typical 64-bit machines, this maximum buffer size is @math{2^61 -
2} bytes, or about 2 EiB. For typical 32-bit machines, the maximum is
usually @math{2^29 - 2} bytes, or about 512 MiB. Buffer sizes are
2} bytes, or about 2 EiB@. For typical 32-bit machines, the maximum is
usually @math{2^29 - 2} bytes, or about 512 MiB@. Buffer sizes are
also limited by the amount of memory in the system.
@menu
@ -614,7 +614,7 @@ names (all but one of them).
@vindex uniquify-buffer-name-style
Other methods work by adding parts of each file's directory to the
buffer name. To select one, load the library @file{uniquify} (e.g.
buffer name. To select one, load the library @file{uniquify} (e.g.,
using @code{(require 'uniquify)}), and customize the variable
@code{uniquify-buffer-name-style} (@pxref{Easy Customization}).

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Building
@chapter Compiling and Testing Programs
@ -261,7 +261,7 @@ or previous error message for a different source file.
@findex next-error-follow-minor-mode
You can type @kbd{C-c C-f} to toggle Next Error Follow mode. In
this minor mode, ordinary cursor motion in the compilation buffer
automatically updates the source buffer, i.e.@: moving the cursor over
automatically updates the source buffer, i.e., moving the cursor over
an error message causes the locus of that error to be displayed.
The features of Compilation mode are also available in a minor mode
@ -324,7 +324,7 @@ nohup @var{command}; sleep 1
@ifnottex
On the MS-DOS ``operating system'', asynchronous subprocesses are
not supported, so @kbd{M-x compile} runs the compilation command
synchronously (i.e.@: you must wait until the command finishes before
synchronously (i.e., you must wait until the command finishes before
you can do anything else in Emacs). @xref{MS-DOS}.
@end ifnottex
@ -589,7 +589,7 @@ to recompile and restart the program.
@findex gud-tooltip-mode
@vindex gud-tooltip-echo-area
GUD Tooltip mode is a global minor mode that adds tooltip support to
GUD. To toggle this mode, type @kbd{M-x gud-tooltip-mode}. It is
GUD@. To toggle this mode, type @kbd{M-x gud-tooltip-mode}. It is
disabled by default. If enabled, you can move the mouse cursor over a
variable, a function, or a macro (collectively called
@dfn{identifiers}) to show their values in tooltips
@ -625,7 +625,7 @@ Set a breakpoint on the source line that point is on.
@kbd{C-x @key{SPC}} (@code{gud-break}), when called in a source
buffer, sets a debugger breakpoint on the current source line. This
command is available only after starting GUD. If you call it in a
command is available only after starting GUD@. If you call it in a
buffer that is not associated with any debugger subprocess, it signals
a error.
@ -756,7 +756,7 @@ This key is available only in the GUD interaction buffer.
that makes sense.
Because @key{TAB} serves as a completion command, you can't use it to
enter a tab as input to the program you are debugging with GDB.
enter a tab as input to the program you are debugging with GDB@.
Instead, type @kbd{C-q @key{TAB}} to enter a tab.
@node GUD Customization
@ -774,7 +774,7 @@ Instead, type @kbd{C-q @key{TAB}} to enter a tab.
you are using DBX; @code{sdb-mode-hook}, if you are using SDB;
@code{xdb-mode-hook}, if you are using XDB; @code{perldb-mode-hook},
for Perl debugging mode; @code{pdb-mode-hook}, for PDB;
@code{jdb-mode-hook}, for JDB. @xref{Hooks}.
@code{jdb-mode-hook}, for JDB@. @xref{Hooks}.
The @code{gud-def} Lisp macro (@pxref{Defining Macros,,, elisp, the
Emacs Lisp Reference Manual}) provides a convenient way to define an

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*-
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c This is part of the Emacs manual. -*- coding: utf-8 -*-
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the
@ -103,7 +103,7 @@ knows about. These are: @code{holiday-general-holidays},
@code{holiday-bahai-holidays}, @code{holiday-christian-holidays},
@code{holiday-hebrew-holidays}, @code{holiday-islamic-holidays},
@code{holiday-oriental-holidays}, and @code{holiday-other-holidays}.
The names should be self-explanatory; e.g.@: @code{holiday-solar-holidays}
The names should be self-explanatory; e.g., @code{holiday-solar-holidays}
lists sun- and moon-related holidays.
You can customize these lists of holidays to your own needs, deleting or
@ -203,7 +203,7 @@ the month (1 specifies the first occurrence, 2 the second occurrence,
@minus{}1 the last occurrence, @minus{}2 the second-to-last occurrence, and
so on).
You can specify holidays that occur on fixed days of the Bahá'í,
You can specify holidays that occur on fixed days of the Bahá'í,
Chinese, Hebrew, Islamic, and Julian calendars too. For example,
@smallexample
@ -420,7 +420,7 @@ the fourth pattern.
@subsection Diary Entries Using non-Gregorian Calendars
As well as entries based on the standard Gregorian calendar, your
diary can have entries based on Bahá'í, Hebrew, or Islamic dates.
diary can have entries based on Bahá'í, Hebrew, or Islamic dates.
Recognition of such entries can be time-consuming, however, and since
most people don't use them, you must explicitly enable their use. If
you want the diary to recognize Hebrew-date diary entries, for example,
@ -440,7 +440,7 @@ you must do this:
@end smallexample
@noindent
Similarly, for Islamic and Bahá'í entries, add
Similarly, for Islamic and Bahá'í entries, add
@code{diary-islamic-list-entries} and @code{diary-islamic-mark-entries}, or
@code{diary-bahai-list-entries} and @code{diary-bahai-mark-entries}.
@ -449,7 +449,7 @@ Similarly, for Islamic and Bah
@vindex diary-islamic-entry-symbol
These diary entries have the same formats as Gregorian-date diary
entries; except that @code{diary-bahai-entry-symbol} (default @samp{B})
must precede a Bahá'í date, @code{diary-hebrew-entry-symbol} (default
must precede a Bahá'í date, @code{diary-hebrew-entry-symbol} (default
@samp{H}) a Hebrew date, and @code{diary-islamic-entry-symbol} (default
@samp{I}) an Islamic date. Moreover, non-Gregorian month names may not
be abbreviated (because the first three letters are often not unique).
@ -476,7 +476,7 @@ nonmarking if preceded by @code{diary-nonmarking-symbol} (default
Here is a table of commands used in the calendar to create diary
entries that match the selected date and other dates that are similar in
the Bahá'í, Hebrew, or Islamic calendars:
the Bahá'í, Hebrew, or Islamic calendars:
@table @kbd
@item i h d
@ -628,7 +628,7 @@ of the diary entries, or add items.
variables @code{diary-comment-start} and @code{diary-comment-end} to
strings that delimit comments. The fancy display does not print
comments. You might want to put meta-data for the use of other packages
(e.g.@: the appointment package,
(e.g., the appointment package,
@iftex
@pxref{Appointments,,,emacs, the Emacs Manual})
@end iftex
@ -851,7 +851,7 @@ Make a diary entry with today's equivalent Julian calendar date.
@item %%(diary-astro-day-number)
Make a diary entry with today's equivalent astronomical (Julian) day number.
@item %%(diary-bahai-date)
Make a diary entry with today's equivalent Bahá'í calendar date.
Make a diary entry with today's equivalent Bahá'í calendar date.
@item %%(diary-chinese-date)
Make a diary entry with today's equivalent Chinese calendar date.
@item %%(diary-coptic-date)

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*-
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c This is part of the Emacs manual. -*- coding: utf-8 -*-
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Calendar/Diary
@chapter The Calendar and the Diary
@ -372,7 +372,7 @@ Generate a one-month calendar (@code{cal-html-cursor-month}).
@item H y
Generate a calendar file for each month of a year, as well as an index
page (@code{cal-html-cursor-year}). By default, this command writes
files to a @var{yyyy} subdirectory - if this is altered some hyperlinks
files to a @var{yyyy} subdirectory---if this is altered some hyperlinks
between years will not work.
@end table
@ -522,7 +522,7 @@ holidays centered around a different month, use @kbd{C-u M-x
holidays}, which prompts for the month and year.
The holidays known to Emacs include United States holidays and the
major Bahá'í, Chinese, Christian, Islamic, and Jewish holidays; also the
major Bahá'í, Chinese, Christian, Islamic, and Jewish holidays; also the
solstices and equinoxes.
@findex list-holidays
@ -760,8 +760,8 @@ days are named by combining one of ten ``celestial stems'' with one of
twelve ``terrestrial branches'' for a total of sixty names that are
repeated in a cycle of sixty.
@cindex Bahá'í calendar
The Bahá'í calendar system is based on a solar cycle of 19 months with
@cindex Bahá'í calendar
The Bahá'í calendar system is based on a solar cycle of 19 months with
19 days each. The four remaining ``intercalary'' days are placed
between the 18th and 19th months.
@ -801,7 +801,7 @@ Display French Revolutionary date for selected day
(@code{calendar-french-print-date}).
@findex calendar-bahai-print-date
@item p b
Display Bahá'í date for selected day
Display Bahá'í date for selected day
(@code{calendar-bahai-print-date}).
@findex calendar-chinese-print-date
@item p C
@ -869,7 +869,7 @@ Move to a date specified in the Julian calendar
Move to a date specified with an astronomical (Julian) day number
(@code{calendar-astro-goto-day-number}).
@item g b
Move to a date specified in the Bahá'í calendar
Move to a date specified in the Bahá'í calendar
(@code{calendar-bahai-goto-date}).
@item g h
Move to a date specified in the Hebrew calendar
@ -1551,7 +1551,7 @@ diary file and iCalendar files, which are defined in ``RFC
2445---Internet Calendaring and Scheduling Core Object Specification
(iCalendar)'' (as well as the earlier vCalendar format).
@c Importing works for ``ordinary'' (i.e. non-recurring) events, but
@c Importing works for ``ordinary'' (i.e., non-recurring) events, but
@c (at present) may not work correctly (if at all) for recurring events.
@c Exporting of diary files into iCalendar files should work correctly
@c for most diary entries. This feature is a work in progress, so the

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Emacs Invocation
@appendix Command Line Arguments for Emacs Invocation
@ -567,16 +567,15 @@ terminal specified by @env{TERM}. This defaults to
These environment variables are used to initialize the variable
@code{temporary-file-directory}, which specifies a directory in which
to put temporary files (@pxref{Backup}). Emacs tries to use
@env{TMPDIR} first; if that is unset, it tries @env{TMP}, then
@env{TEMP}, and finally @file{/tmp}. But on MS-Windows and MS-DOS,
Emacs tries @env{TEMP}, then @env{TMPDIR}, then @env{TMP}, and finally
@file{c:/temp}.
@env{TMPDIR} first. If that is unset, Emacs normally falls back on
@file{/tmp}, but on MS-Windows and MS-DOS it instead falls back on
@env{TMP}, then @env{TEMP}, and finally @file{c:/temp}.
@item TZ
This specifies the current time zone and possibly also daylight
saving time information. On MS-DOS, if @env{TZ} is not set in the
environment when Emacs starts, Emacs defines a default value as
appropriate for the country code returned by DOS. On MS-Windows, Emacs
appropriate for the country code returned by DOS@. On MS-Windows, Emacs
does not use @env{TZ} at all.
@item USER
The user's login name. See also @env{LOGNAME}. On MS-DOS, this
@ -747,7 +746,7 @@ Use @var{font} as the default font.
When passing a font name to Emacs on the command line, you may need to
``quote'' it, by enclosing it in quotation marks, if it contains
characters that the shell treats specially (e.g.@: spaces). For
characters that the shell treats specially (e.g., spaces). For
example:
@smallexample
@ -839,7 +838,7 @@ otherwise use an appropriate standard mode for @var{num} colors.
Depending on your terminal's capabilities, Emacs might be able to turn
on a color mode for 8, 16, 88, or 256 as the value of @var{num}. If
there is no mode that supports @var{num} colors, Emacs acts as if
@var{num} were 0, i.e.@: it uses the terminal's default color support
@var{num} were 0, i.e., it uses the terminal's default color support
mode.
@end table
If @var{mode} is omitted, it defaults to @var{ansi8}.
@ -1070,7 +1069,7 @@ it.
By default, Emacs uses an icon containing the Emacs logo. On
desktop environments such as Gnome, this icon is also displayed in
other contexts, e.g.@: when switching into an Emacs frame. The
other contexts, e.g., when switching into an Emacs frame. The
@samp{-nbi} or @samp{--no-bitmap-icon} option tells Emacs to let the
window manager choose what sort of icon to use---usually just a small
rectangle containing the frame's title.

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Characters, Keys and Commands
@ -53,7 +53,7 @@ holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
to this as @kbd{C-a} for short. Similarly @kbd{Meta-a}, or @kbd{M-a}
for short, is entered by holding down the @key{Alt} key and pressing
@kbd{a}. Modifier keys can also be applied to non-alphanumerical
characters, e.g. @kbd{C-@key{F1}} or @kbd{M-@key{left}}.
characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{left}}.
@cindex @key{ESC} replacing @key{Meta} key
You can also type Meta characters using two-character sequences

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Customization
@chapter Customization
@ -555,7 +555,7 @@ or disabled as a unit. You can use Custom themes to switch easily
between various collections of settings, and to transfer such
collections from one computer to another.
A Custom theme is stored an Emacs Lisp source file. If the name of
A Custom theme is stored as an Emacs Lisp source file. If the name of
the Custom theme is @var{name}, the theme file is named
@file{@var{name}-theme.el}. @xref{Creating Custom Themes}, for the
format of a theme file and how to make one.
@ -610,10 +610,10 @@ always considered safe.
@vindex custom-enabled-themes
Setting or saving Custom themes actually works by customizing the
variable @code{custom-enabled-themes}. The value of this variable is
a list of Custom theme names (as Lisp symbols, e.g.@: @code{tango}).
a list of Custom theme names (as Lisp symbols, e.g., @code{tango}).
Instead of using the @file{*Custom Themes*} buffer to set
@code{custom-enabled-themes}, you can customize the variable using the
usual customization interface, e.g.@: with @kbd{M-x customize-option}.
usual customization interface, e.g., with @kbd{M-x customize-option}.
Note that Custom themes are not allowed to set
@code{custom-enabled-themes} themselves.
@ -1305,7 +1305,7 @@ files in that subdirectory.
@example
((nil . ((indent-tabs-mode . t)
(fill-column . 80)))
(c-mode . ((c-file-style . "BSD")))
(c-mode . ((c-file-style . "BSD")
(subdirs . nil)))
("src/imported"
. ((nil . ((change-log-default-name
@ -1648,7 +1648,7 @@ you can specify them in your initialization file by writing Lisp code.
@findex kbd
There are several ways to write a key binding using Lisp. The
simplest is to use the @code{kbd} macro, which converts a textual
simplest is to use the @code{kbd} function, which converts a textual
representation of a key sequence---similar to how we have written key
sequences in this manual---into a form that can be passed as an
argument to @code{global-set-key}. For example, here's how to bind
@ -1676,11 +1676,11 @@ and mouse events:
(global-set-key (kbd "<mouse-2>") 'mouse-save-then-kill)
@end example
Instead of using the @code{kbd} macro, you can use a Lisp string or
vector to specify the key sequence. Using a string is simpler, but
only works for @acronym{ASCII} characters and Meta-modified
@acronym{ASCII} characters. For example, here's how to bind @kbd{C-x
M-l} to @code{make-symbolic-link} (@pxref{Misc File Ops}):
Instead of using @code{kbd}, you can use a Lisp string or vector to
specify the key sequence. Using a string is simpler, but only works
for @acronym{ASCII} characters and Meta-modified @acronym{ASCII}
characters. For example, here's how to bind @kbd{C-x M-l} to
@code{make-symbolic-link} (@pxref{Misc File Ops}):
@example
(global-set-key "\C-x\M-l" 'make-symbolic-link)
@ -2329,7 +2329,7 @@ Here a full file name is used, so no searching is done.
@cindex loading Lisp libraries automatically
@cindex autoload Lisp libraries
Tell Emacs to find the definition for the function @code{myfunction}
by loading a Lisp library named @file{mypackage} (i.e.@: a file
by loading a Lisp library named @file{mypackage} (i.e., a file
@file{mypackage.elc} or @file{mypackage.el}):
@example
@ -2496,7 +2496,7 @@ editor customizations even if you are running as the super user.
More precisely, Emacs first determines which user's init file to use.
It gets your user name from the environment variables @env{LOGNAME} and
@env{USER}; if neither of those exists, it uses effective user-ID.
@env{USER}; if neither of those exists, it uses effective user-ID@.
If that user name matches the real user-ID, then Emacs uses @env{HOME};
otherwise, it looks up the home directory corresponding to that user
name in the system's data base of users.

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Dired
@chapter Dired, the Directory Editor
@ -968,7 +968,7 @@ is the second argument. The output of the @command{diff} program is
shown in a buffer using Diff mode (@pxref{Comparing Files}).
If the region is active, the default for the file read using the
minibuffer is the file at the mark (i.e.@: the ordinary Emacs mark,
minibuffer is the file at the mark (i.e., the ordinary Emacs mark,
not a Dired mark; @pxref{Setting Mark}). Otherwise, if the file at
point has a backup file (@pxref{Backup}), that is the default.

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Display
@ -249,14 +249,14 @@ variables @code{scroll-up-aggressively} and
position of point after scrolling. The value of
@code{scroll-up-aggressively} should be either @code{nil} (the
default), or a floating point number @var{f} between 0 and 1. The
latter means that when point goes below the bottom window edge (i.e.@:
latter means that when point goes below the bottom window edge (i.e.,
scrolling forward), Emacs scrolls the window so that point is @var{f}
parts of the window height from the bottom window edge. Thus, larger
@var{f} means more aggressive scrolling: more new text is brought into
view. The default value, @code{nil}, is equivalent to 0.5.
Likewise, @code{scroll-down-aggressively} is used when point goes
above the bottom window edge (i.e.@: scrolling backward). The value
above the bottom window edge (i.e., scrolling backward). The value
specifies how far point should be from the top margin of the window
after scrolling. Thus, as with @code{scroll-up-aggressively}, a
larger value is more aggressive.
@ -1089,7 +1089,7 @@ buffer text, so blank lines at the end of the buffer stand out because
they lack this image. To enable this feature, set the buffer-local
variable @code{indicate-empty-lines} to a non-@code{nil} value. You
can enable or disable this feature for all new buffers by setting the
default value of this variable, e.g.@: @code{(setq-default
default value of this variable, e.g., @code{(setq-default
indicate-empty-lines t)}.
@cindex Whitespace mode
@ -1258,7 +1258,7 @@ line looks like this:
Here @var{hh} and @var{mm} are the hour and minute, followed always by
@samp{am} or @samp{pm}. @var{l.ll} is the average number, collected
for the last few minutes, of processes in the whole system that were
either running or ready to run (i.e.@: were waiting for an available
either running or ready to run (i.e., were waiting for an available
processor). (Some fields may be missing if your operating system
cannot support them.) If you prefer time display in 24-hour format,
set the variable @code{display-time-24hr-format} to @code{t}.
@ -1369,7 +1369,7 @@ as octal escape sequences instead of caret escape sequences.
Some non-@acronym{ASCII} characters have the same appearance as an
@acronym{ASCII} space or hyphen (minus) character. Such characters
can cause problems if they are entered into a buffer without your
realization, e.g.@: by yanking; for instance, source code compilers
realization, e.g., by yanking; for instance, source code compilers
typically do not treat non-@acronym{ASCII} spaces as whitespace
characters. To deal with this problem, Emacs displays such characters
specially: it displays @code{U+00A0} (no-break space) with the

View file

@ -1,4 +1,3 @@
@c -*-texinfo-*-
@c The GNU Free Documentation License.
@center Version 1.3, 3 November 2008
@ -6,7 +5,7 @@
@c hence no sectioning command or @node.
@display
Copyright @copyright{} 2000, 2001, 2002, 2007, 2008, 2009 Free Software Foundation, Inc.
Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
@uref{http://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies
@ -93,16 +92,16 @@ An image format is not Transparent if used for any substantial amount
of text. A copy that is not ``Transparent'' is called ``Opaque''.
Examples of suitable formats for Transparent copies include plain
@sc{ascii} without markup, Texinfo input format, La@TeX{} input
format, @acronym{SGML} or @acronym{XML} using a publicly available
@acronym{DTD}, and standard-conforming simple @acronym{HTML},
PostScript or @acronym{PDF} designed for human modification. Examples
of transparent image formats include @acronym{PNG}, @acronym{XCF} and
@acronym{JPG}. Opaque formats include proprietary formats that can be
read and edited only by proprietary word processors, @acronym{SGML} or
@acronym{XML} for which the @acronym{DTD} and/or processing tools are
not generally available, and the machine-generated @acronym{HTML},
PostScript or @acronym{PDF} produced by some word processors for
ASCII without markup, Texinfo input format, La@TeX{} input
format, SGML or XML using a publicly available
DTD, and standard-conforming simple HTML,
PostScript or PDF designed for human modification. Examples
of transparent image formats include PNG, XCF and
JPG@. Opaque formats include proprietary formats that can be
read and edited only by proprietary word processors, SGML or
XML for which the DTD and/or processing tools are
not generally available, and the machine-generated HTML,
PostScript or PDF produced by some word processors for
output purposes only.
The ``Title Page'' means, for a printed book, the title page itself,
@ -482,7 +481,7 @@ license notices just after the title page:
@end smallexample
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
replace the ``with@dots{}Texts.'' line with this:
replace the ``with@dots{}Texts.''@: line with this:
@smallexample
@group
@ -501,8 +500,6 @@ recommend releasing these examples in parallel under your choice of
free software license, such as the GNU General Public License,
to permit their use in free software.
@c Local Variables:
@c ispell-local-pdict: "ispell-dict"
@c End:

View file

@ -11,29 +11,22 @@
@copying
This manual describes specialized features of Emacs.
Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2004--2013 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU
Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
License'' in the Emacs manual.
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@documentencoding ISO-8859-1
@documentencoding UTF-8
@dircategory Emacs
@direntry
@ -60,7 +53,7 @@ license to the document, as described in section 6 of the license.
@menu
* Introduction:: What documentation belongs here?
@iftex
* Picture Mode:: Editing pictures made up of characters using
* Picture Mode:: Editing pictures made up of characters using
the quarter-plane screen model.
* Autorevert:: Auto Reverting non-file buffers.
@ -71,6 +64,7 @@ license to the document, as described in section 6 of the license.
* Fortran:: Fortran mode and its special features.
* MS-DOS:: Using Emacs on MS-DOS.
@end iftex
* GNU Free Documentation License:: The license for this documentation.
* Index::
@end menu
@ -131,6 +125,10 @@ the Emacs manual.
@lowersections
@end iftex
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Index
@unnumbered Index

View file

@ -1,4 +1,4 @@
\input texinfo @c -*- coding: iso-latin-1 -*-
\input texinfo @c -*- coding: utf-8 -*-
@setfilename ../../info/emacs
@settitle GNU Emacs Manual
@ -26,7 +26,7 @@ This is the @cite{GNU Emacs Manual},
@end ifnottex
updated for Emacs version @value{EMACSVER}.
Copyright @copyright{} 1985-1987, 1993-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1985--1987, 1993--2013 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -44,7 +44,7 @@ developing GNU and promoting software freedom.''
@end quotation
@end copying
@documentencoding ISO-8859-1
@documentencoding UTF-8
@dircategory Emacs
@direntry
@ -111,10 +111,21 @@ Cover art by Etienne Suvasa; cover design by Matt Lee.
@top The Emacs Editor
Emacs is the extensible, customizable, self-documenting real-time
display editor. This Info file describes how to edit with Emacs and
display editor. This manual describes how to edit with Emacs and
some of the ways to customize it; it corresponds to GNU Emacs version
@value{EMACSVER}.
@ifset WWW_GNU_ORG
@html
The homepage for GNU Emacs is at
<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
To view this manual in other formats, click
<a href="/software/emacs/manual/emacs.html">here</a>.<br>
You can also purchase a printed copy from the
<a href="http://shop.fsf.org/product/emacs-manual/">FSF store</a>.
@end html
@end ifset
@ifinfo
If you are reading this in Emacs, type @kbd{h} to read a basic
introduction to the Info documentation system.
@ -1323,13 +1334,13 @@ when you get it, not just free for the manufacturer.
If you find GNU Emacs useful, please @strong{send a donation} to the
Free Software Foundation to support our work. Donations to the Free
Software Foundation are tax deductible in the US. If you use GNU Emacs
Software Foundation are tax deductible in the US@. If you use GNU Emacs
at your workplace, please suggest that the company make a donation.
For more information on how you can help, see
@url{http://www.gnu.org/help/help.html}.
We also sell hardcopy versions of this manual and @cite{An
Introduction to Programming in Emacs Lisp}, by Robert J.@: Chassell.
Introduction to Programming in Emacs Lisp}, by Robert J. Chassell.
You can visit our online store at @url{http://shop.fsf.org/}.
The income from sales goes to support the foundation's purpose: the
development of new free software, and improvements to our existing
@ -1350,61 +1361,61 @@ USA
@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, Dmitry Antipov, Joe Arceneaux, Emil Åström,
Abrahamsson, Jay K. Adams, Alon Albert, Michael Albinus, Nagy
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,
Baumann, Steven L. Baur, Jay Belanger, Alexander L. Belikoff,
Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl
Berry, Anna M.@: Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan
Bockgård, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner,
Berry, Anna M. Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan
Bockgård, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner,
Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin
Broadey, Vincent Broman, Michael Brouwer, David M.@: Brown, Stefan Bruda,
Georges Brun-Cottan, Joe Buehler, Scott Byer, W@l{}odek Bzyl,
Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Stefan Bruda,
Georges Brun-Cottan, Joe Buehler, Scott Byer, Włodek Bzyl,
Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob
Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James
Clark, Mike Clarkson, Glynn Clements, Andrew Cohen, Daniel Colascione,
Edward O'Connor, Christoph Conrad, Ludovic Courtès, Andrew Csillag,
Edward O'Connor, Christoph Conrad, Ludovic Courtès, Andrew Csillag,
Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki
Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte, Gary Delp, Nachum
Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eri
Ding, Jan Djärv, Lawrence R.@: Dodd, Carsten Dominik, Scott Draves,
Ding, Jan Djärv, Lawrence R. Dodd, Carsten Dominik, Scott Draves,
Benjamin Drieu, Viktor Dukhovni, Jacques Duthen, Dmitry Dzhus, John
Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen
Eglen, Christian Egli, Torbjörn Einarsson, Tsugutomo Enami, David
Eglen, Christian Egli, Torbjörn Einarsson, Tsugutomo Enami, David
Engster, Hans Henrik Eriksen, Michael Ernst, Ata Etemadi, Frederick
Farnbach, Oscar Figueiredo, Fred Fish, Steve Fisk, Karl Fogel, Gary
Foster, Eric S.@: Fraga, Romain Francoise, Noah Friedman, Andreas
Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S.@:
Galbraith, Kevin Gallagher, Kevin Gallo, Juan León Lahoz García,
Foster, Eric S. Fraga, Romain Francoise, Noah Friedman, Andreas
Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S.
Galbraith, Kevin Gallagher, Fabián E. Gallina, Kevin Gallo, Juan León Lahoz García,
Howard Gayle, Daniel German, Stephen Gildea, Julien Gilles, David
Gillespie, Bob Glickstein, Deepak Goel, David De La Harpe Golden, Boris
Goldowsky, David Goodger, Chris Gray, Kevin Greiner, Michelangelo Grigni, Odd
Gripenstam, Kai Großjohann, Michael Gschwind, Bastien Guerry, Henry
Gripenstam, Kai Großjohann, Michael Gschwind, Bastien Guerry, Henry
Guillaume, Doug Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris
Hanson, Jesper Harder, Alexandru Harsanyi, K.@: Shane Hartman, John
Heidemann, Jon K.@: Hellan, Magnus Henoch, Markus Heritsch, Dirk
Hanson, Jesper Harder, Alexandru Harsanyi, K. Shane Hartman, John
Heidemann, Jon K. Hellan, Magnus Henoch, Markus Heritsch, Dirk
Herrmann, Karl Heuer, Manabu Higashida, Konrad Hinsen, Anders Holst,
Jeffrey C.@: Honig, Tassilo Horn, Kurt Hornik, Tom Houlder, Joakim
Jeffrey C. Honig, Tassilo Horn, Kurt Hornik, Tom Houlder, Joakim
Hove, Denis Howe, Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue,
Philip Jackson, Martyn Jago, Pavel Janik, Paul Jarc, Ulf Jasper,
Thorsten Jolitz, Michael K.@: Johnson, Kyle Jones, Terry Jones, Simon
Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani,
Thorsten Jolitz, Michael K. Johnson, Kyle Jones, Terry Jones, Simon
Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani,
Brewster Kahle, Tokuya Kameshima, Lute Kamstra, Ivan Kanis, David
Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, Taro Kawagishi,
Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel
Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K.@: Kolodney, David
M.@: Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer,
Ryszard Kubiak, Igor Kuzmin, David Kågedal, Daniel LaLiberte, Karl
Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, Vinicius Jose
Klíč, Shuhei Kobayashi, Pavel Kobyakov, Larry K. Kolodney, David
M. Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer,
Ryszard Kubiak, Igor Kuzmin, David Kågedal, Daniel LaLiberte, Karl
Landstrom, Mario Lang, Aaron Larson, James R. Larus, Vinicius Jose
Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian
Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link,
Juri Linkov, Francis Litterio, Sergey Litvinov, Emilio C.@: Lopes,
Martin Lorentzon, Dave Love, Eric Ludlam, Károly L@H{o}rentey, Sascha
Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie,
Christopher J.@: Madsen, Neil M.@: Mager, Ken Manheimer, Bill Mann,
Juri Linkov, Francis Litterio, Sergey Litvinov, Emilio C. Lopes,
Martin Lorentzon, Dave Love, Eric Ludlam, Károly Lőrentey, Sascha
Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie,
Christopher J. Madsen, Neil M. Mager, Ken Manheimer, Bill Mann,
Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin,
Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David
Megginson, Stefan Merten, Ben A.@: Mesander, Wayne Mesard, Brad
Megginson, Stefan Merten, Ben A. Mesander, Wayne Mesard, Brad
Miller, Lawrence Mitchell, Richard Mlynarik, Gerd Moellmann, Stefan
Monnier, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris,
Don Morrison, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum,
@ -1412,44 +1423,44 @@ Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen,
Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Niksic, Jeff Norden,
Andrew Norman, Kentaro Ohkouchi, Christian Ohler,
Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota,
Pieter E.@: J.@: Pareit, Ross Patterson, David Pearson, Juan Pechiar,
Jeff Peck, Damon Anton Permezel, Tom Perrine, William M.@: Perry, Per
Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L.@:
Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian
Plaunt, Alexander Pohoyda, David Ponce, Francesco A.@: Potorti,
Michael D.@: Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin
Ram, Eric S.@: Raymond, Paul Reilly, Edward M.@: Reingold, David
Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar,
Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per
Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L.
Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian
Plaunt, Alexander Pohoyda, David Ponce, Francesco A. Potorti,
Michael D. Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin
Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David
Reitter, Alex Rezinsky, Rob Riepel, Lara Rios, Adrian Robert, Nick
Roberts, Roland B.@: Roberts, John Robinson, Denis B.@: Roegel, Danny
Roberts, Roland B. Roberts, John Robinson, Denis B. Roegel, Danny
Roozendaal, Sebastian Rose, William Rosenblatt, Markus Rost, Guillermo
J.@: Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang
Rupprecht, Benjamin Rutt, Kevin Ryde, James B.@: Salem, Masahiko Sato,
J. Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang
Rupprecht, Benjamin Rutt, Kevin Ryde, James B. Salem, Masahiko Sato,
Timo Savola, Jorgen Schaefer, Holger Schauer, William Schelter, Ralph
Schleicher, Gregor Schmid, Michael Schmidt, Ronald S.@: Schnell,
Schleicher, Gregor Schmid, Michael Schmidt, Ronald S. Schnell,
Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Stefan Schoef,
Rainer Schoepf, Raymond Scholz, Eric Schulte, Andreas Schwab, Randal
Schwartz, Oliver Seidel, Manuel Serrano, Paul Sexton, Hovav Shacham,
Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Tibor
@v{S}imko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith,
David Smith, Paul D.@: Smith, Wilson Snyder, William Sommerfeld, Simon
Šimko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith,
David Smith, Paul D. Smith, Wilson Snyder, William Sommerfeld, Simon
South, Andre Spiegel, Michael Staats, Thomas Steffen, Ulf Stegemann,
Reiner Steib, Sam Steingold, Ake Stenhoff, Peter Stephenson, Ken
Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.@:
Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.
Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto
Takahashi, Steven Tamm, Luc Teirlinck, Jean-Philippe Theberge, Jens
T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Toru Tomabechi,
T. Berger Thielemann, Spencer Thomas, Jim Thompson, Toru Tomabechi,
David O'Toole, Markus Triska, Tom Tromey, Enami Tsugutomo, Eli
Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh Vaidheeswarran, Neil
W.@: Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey
W. Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey
Voelker, Johan Vromans, Inge Wallin, John Paul Wallington, Colin
Walters, Barry Warsaw, Christoph Wedler, Ilja Weis, Zhang Weize,
Morten Welinder, Joseph Brian Wells, Rodney Whitby, John Wiegley,
Sascha Wilde, Ed Wilkinson, Mike Williams, Roland Winkler, Bill
Wohler, Steven A.@: Wood, Dale R.@: Worley, Francis J.@: Wright, Felix
S.@: T.@: Wu, Tom Wurgler, Yamamoto Mitsuharu, Katsumi Yamaoka,
Wohler, Steven A. Wood, Dale R. Worley, Francis J. Wright, Felix
S. T. Wu, Tom Wurgler, Yamamoto Mitsuharu, Katsumi Yamaoka,
Masatake Yamato, Jonathan Yavner, Ryan Yeske, Ilya Zakharevich, Milan
Zamazal, Victor Zandy, Eli Zaretskii, Jamie Zawinski, Andrew Zhilin,
Shenghuo Zhu, Piotr Zielinski, Ian T.@: Zimmermann, Reto Zimmermann,
Shenghuo Zhu, Piotr Zielinski, Ian T. Zimmermann, Reto Zimmermann,
Neal Ziring, Teodor Zlatanov, and Detlev Zundel.
@end iftex

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the
@ -186,12 +186,12 @@ haven't made a choice. All differences start in the default-A state
which one alternative is ``preferred'' (see below).
When you select a difference, its state changes from default-A or
default-B to plain A or B. Thus, the selected difference never has
default-B to plain A or B@. Thus, the selected difference never has
state default-A or default-B, and these states are never displayed in
the mode line.
The command @kbd{d a} chooses default-A as the default state, and @kbd{d
b} chooses default-B. This chosen default applies to all differences
b} chooses default-B@. This chosen default applies to all differences
that you have never selected and for which no alternative is preferred.
If you are moving through the merge sequentially, the differences you
haven't selected are those following the selected one. Thus, while
@ -375,7 +375,7 @@ While this example shows C preprocessor conditionals delimiting the two
alternative versions, you can specify the strings to use by setting
the variable @code{emerge-combine-versions-template} to a string of your
choice. In the string, @samp{%a} says where to put version A, and
@samp{%b} says where to put version B. The default setting, which
@samp{%b} says where to put version B@. The default setting, which
produces the results shown above, looks like this:
@example

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Entering and Exiting Emacs

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Files
@chapter File Handling
@ -72,7 +72,7 @@ directory into the minibuffer as the initial contents. You can
inhibit this insertion by changing the variable
@code{insert-default-directory} to @code{nil} (@pxref{Minibuffer
File}). Regardless, Emacs always assumes that any relative file name
is relative to the default directory, e.g. entering a file name
is relative to the default directory, e.g., entering a file name
without a directory specifies a file in the default directory.
@findex cd
@ -734,10 +734,10 @@ file.
@cindex locking files
When you make the first modification in an Emacs buffer that is
visiting a file, Emacs records that the file is @dfn{locked} by you.
(It does this by creating a specially-named symbolic link in the same
directory.) Emacs removes the lock when you save the changes. The
idea is that the file is locked whenever an Emacs buffer visiting it
has unsaved changes.
(It does this by creating a specially-named symbolic link or regular
file with special contents in the same directory.) Emacs removes the
lock when you save the changes. The idea is that the file is locked
whenever an Emacs buffer visiting it has unsaved changes.
@vindex create-lockfiles
You can prevent the creation of lock files by setting the variable
@ -773,15 +773,15 @@ spurious, just use @kbd{p} to tell Emacs to go ahead anyway.
multiple names, Emacs does not prevent two users from editing it
simultaneously under different names.
A lock file cannot be written in some circumstances, e.g. if Emacs
lacks the system permissions or the system does not support symbolic
links. In these cases, Emacs can still detect the collision when you
try to save a file, by checking the file's last-modification date. If
the file has changed since the last time Emacs visited or saved it,
that implies that changes have been made in some other way, and will
be lost if Emacs proceeds with saving. Emacs then displays a warning
message and asks for confirmation before saving; answer @kbd{yes} to
save, and @kbd{no} or @kbd{C-g} cancel the save.
A lock file cannot be written in some circumstances, e.g., if Emacs
lacks the system permissions or cannot create lock files for some
other reason. In these cases, Emacs can still detect the collision
when you try to save a file, by checking the file's last-modification
date. If the file has changed since the last time Emacs visited or
saved it, that implies that changes have been made in some other way,
and will be lost if Emacs proceeds with saving. Emacs then displays a
warning message and asks for confirmation before saving; answer
@kbd{yes} to save, and @kbd{no} or @kbd{C-g} cancel the save.
If you are notified that simultaneous editing has already taken
place, one way to compare the buffer to its file is the @kbd{M-x
@ -1937,8 +1937,7 @@ or taller than the frame, the usual point motion keys (@kbd{C-f},
displayed. If the image can be animated, the command @kbd{RET}
(@code{image-toggle-animation}) starts or stops the animation.
Animation plays once, unless the option @code{image-animate-loop} is
non-@code{nil}. Currently, Emacs only supports animation in GIF
files.
non-@code{nil}.
@cindex ImageMagick support
@vindex imagemagick-enabled-types
@ -1948,7 +1947,7 @@ can use ImageMagick to render a wide variety of images. The variable
@code{imagemagick-enabled-types} lists the image types that Emacs may
render using ImageMagick; each element in the list should be an
internal ImageMagick name for an image type, as a symbol or an
equivalent string (e.g.@: @code{BMP} for @file{.bmp} images). To
equivalent string (e.g., @code{BMP} for @file{.bmp} images). To
enable ImageMagick for all possible image types, change
@code{imagemagick-enabled-types} to @code{t}. The variable
@code{imagemagick-types-inhibit} lists the image types which should

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Fixit
@chapter Commands for Fixing Typos

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the
@ -89,7 +89,7 @@ Move to the beginning of the next statement
@item C-c C-p
Move to the beginning of the previous statement
(@code{fortran-previous-statement}/@code{f90-previous-statement}).
If there is no previous statement (i.e. if called from the first
If there is no previous statement (i.e., if called from the first
statement in the buffer), move to the start of the buffer.
@kindex C-c C-e @r{(F90 mode)}

View file

@ -1,12 +1,12 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Frames
@chapter Frames and Graphical Displays
@cindex frames
When Emacs is started on a graphical display, e.g.@: on the X Window
When Emacs is started on a graphical display, e.g., on the X Window
System, it occupies a graphical system-level ``window''. In this
manual, we call this a @dfn{frame}, reserving the word ``window'' for
the part of the frame used for displaying a buffer. A frame initially
@ -77,8 +77,8 @@ for doing so on MS-DOS).
Move point to where you click (@code{mouse-set-point}).
@item Drag-Mouse-1
Activate the region around the text selected by dragging, and copy it
to the kill ring (@code{mouse-set-region}).
Activate the region around the text selected by dragging, and put the
text in the primary selection (@code{mouse-set-region}).
@item Mouse-2
Move point to where you click, and insert the contents of the primary
@ -246,8 +246,8 @@ Select the text you drag across, in the form of whole lines.
@vindex mouse-highlight
Some Emacs buffers include @dfn{buttons}, or @dfn{hyperlinks}:
pieces of text that perform some action (e.g.@: following a reference)
when activated (e.g.@: by clicking on them). Usually, a button's text
pieces of text that perform some action (e.g., following a reference)
when activated (e.g., by clicking on them). Usually, a button's text
is visually highlighted: it is underlined, or a box is drawn around
it. If you move the mouse over a button, the shape of the mouse
cursor changes and the button lights up. If you change the variable
@ -631,7 +631,7 @@ Monospace Bold Italic 12
@cindex X Logical Font Description
The third way to specify a font is to use an @dfn{XLFD} (@dfn{X
Logical Font Description}). This is the traditional method for
specifying fonts under X. Each XLFD consists of fourteen words or
specifying fonts under X@. Each XLFD consists of fourteen words or
numbers, separated by dashes, like this:
@example
@ -644,7 +644,7 @@ characters (including none), and @samp{?} matches any single
character. However, matching is implementation-dependent, and can be
inaccurate when wildcards match dashes in a long name. For reliable
results, supply all 14 dashes and use wildcards only within a field.
Case is insignificant in an XLFD. The syntax for an XLFD is as
Case is insignificant in an XLFD@. The syntax for an XLFD is as
follows:
@example
@ -659,7 +659,7 @@ The entries have the following meanings:
@item maker
The name of the font manufacturer.
@item family
The name of the font family (e.g.@: @samp{courier}).
The name of the font family (e.g., @samp{courier}).
@item weight
The font weight---normally either @samp{bold}, @samp{medium} or
@samp{light}. Some font names support other values.
@ -1067,7 +1067,7 @@ attributes of the tooltip text are specified by the @code{tooltip}
face, and by X resources (@pxref{X Resources}).
@dfn{GUD tooltips} are special tooltips that show the values of
variables when debugging a program with GUD. @xref{Debugger
variables when debugging a program with GUD@. @xref{Debugger
Operation}.
@node Mouse Avoidance

View file

@ -1,12 +1,12 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Glossary
@unnumbered Glossary
@table @asis
@anchor{Glossary - Abbrev}
@anchor{Glossary---Abbrev}
@item Abbrev
An abbrev is a text string that expands into a different text string
when present in the buffer. For example, you might define a few letters
@ -14,7 +14,7 @@ as an abbrev for a long phrase that you want to insert frequently.
@xref{Abbrevs}.
@item Aborting
Aborting means getting out of a recursive edit (q.v.@:). The
Aborting means getting out of a recursive edit (q.v.). The
commands @kbd{C-]} and @kbd{M-x top-level} are used for this.
@xref{Quitting}.
@ -29,7 +29,7 @@ key labeled @key{ALT} that is really a @key{META} key.) @xref{User
Input, Alt}.
@item Argument
@xref{Glossary - Numeric Argument}.
@xref{Glossary---Numeric Argument}.
@item @acronym{ASCII} character
An @acronym{ASCII} character is either an @acronym{ASCII} control
@ -62,8 +62,8 @@ function from those libraries. This is called `autoloading'.
@item Backtrace
A backtrace is a trace of a series of function calls showing how a
program arrived at a certain point. It is used mainly for finding and
correcting bugs (q.v.@:). Emacs can display a backtrace when it signals
an error or when you type @kbd{C-g} (@pxref{Glossary - Quitting}).
correcting bugs (q.v.). Emacs can display a backtrace when it signals
an error or when you type @kbd{C-g} (@pxref{Glossary---Quitting}).
@xref{Checklist}.
@item Backup File
@ -79,18 +79,18 @@ Automatic balancing works by blinking or highlighting the delimiter
that matches the one you just inserted, or inserting the matching
delimiter for you (@pxref{Matching,,Matching Parens}).
@anchor{Glossary - Balanced Expression}
@anchor{Glossary---Balanced Expression}
@item Balanced Expressions
A balanced expression is a syntactically recognizable expression, such
as a symbol, number, string constant, block, or parenthesized expression
in C. @xref{Expressions,Balanced Expressions}.
in C@. @xref{Expressions,Balanced Expressions}.
@item Balloon Help
@xref{Glossary - Tooltips}.
@xref{Glossary---Tooltips}.
@item Base Buffer
A base buffer is a buffer whose text is shared by an indirect buffer
(q.v.@:).
(q.v.).
@item Bidirectional Text
Some human languages, such as English, are written from left to right.
@ -99,16 +99,16 @@ supports both of these forms, as well as any mixture of them---this
is `bidirectional text'. @xref{Bidirectional Editing}.
@item Bind
To bind a key sequence means to give it a binding (q.v.@:).
To bind a key sequence means to give it a binding (q.v.).
@xref{Rebinding}.
@anchor{Glossary - Binding}
@anchor{Glossary---Binding}
@item Binding
A key sequence gets its meaning in Emacs by having a binding, which is a
command (q.v.@:), a Lisp function that is run when you type that
command (q.v.), a Lisp function that is run when you type that
sequence. @xref{Commands,Binding}. Customization often involves
rebinding a character to a different command function. The bindings of
all key sequences are recorded in the keymaps (q.v.@:). @xref{Keymaps}.
all key sequences are recorded in the keymaps (q.v.). @xref{Keymaps}.
@item Blank Lines
Blank lines are lines that contain only whitespace. Emacs has several
@ -126,13 +126,13 @@ external border, outside of everything including the menu bar, plus an
internal border that surrounds the text windows, their scroll bars
and fringes, and separates them from the menu bar and tool bar. You
can customize both borders with options and resources (@pxref{Borders
X}). Borders are not the same as fringes (q.v.@:).
X}). Borders are not the same as fringes (q.v.).
@item Buffer
The buffer is the basic editing unit; one buffer corresponds to one text
being edited. You normally have several buffers, but at any time you are
editing only one, the `current buffer', though several can be visible
when you are using multiple windows or frames (q.v.@:). Most buffers
when you are using multiple windows or frames (q.v.). Most buffers
are visiting (q.v.@:) some file. @xref{Buffers}.
@item Buffer Selection History
@ -151,12 +151,12 @@ A button down event is the kind of input event (q.v.@:) generated
right away when you press down on a mouse button. @xref{Mouse Buttons}.
@item By Default
@xref{Glossary - Default}.
@xref{Glossary---Default}.
@item Byte Compilation
@xref{Glossary - Compilation}.
@xref{Glossary---Compilation}.
@anchor{Glossary - C-}
@anchor{Glossary---C-}
@item @kbd{C-}
@kbd{C-} in the name of a character is an abbreviation for Control.
@xref{User Input,C-}.
@ -181,7 +181,7 @@ Emacs supports a number of character sets, each of which represents a
particular alphabet or script. @xref{International}.
@item Character Terminal
@xref{Glossary - Text Terminal}.
@xref{Glossary---Text Terminal}.
@item Click Event
A click event is the kind of input event (q.v.@:) generated when you
@ -189,12 +189,12 @@ press a mouse button and release it without moving the mouse.
@xref{Mouse Buttons}.
@item Client
@xref{Glossary - Server}.
@xref{Glossary---Server}.
@item Clipboard
A clipboard is a buffer provided by the window system for transferring
text between applications. On the X Window System, the clipboard is
provided in addition to the primary selection (q.v.@:); on MS-Windows and Mac,
provided in addition to the primary selection (q.v.); on MS-Windows and Mac,
the clipboard is used @emph{instead} of the primary selection.
@xref{Clipboard}.
@ -206,12 +206,12 @@ text to or from a variety of coding systems when reading or writing it.
@item Command
A command is a Lisp function specially defined to be able to serve as a
key binding in Emacs. When you type a key sequence (q.v.@:), its
key binding in Emacs. When you type a key sequence (q.v.), its
binding (q.v.@:) is looked up in the relevant keymaps (q.v.@:) to find
the command to run. @xref{Commands}.
@item Command History
@xref{Glossary - Minibuffer History}.
@xref{Glossary---Minibuffer History}.
@item Command Name
A command name is the name of a Lisp symbol that is a command
@ -229,7 +229,7 @@ Common Lisp is a dialect of Lisp (q.v.@:) much larger and more powerful
than Emacs Lisp. Emacs provides a subset of Common Lisp in the CL
package. @xref{Top, Common Lisp, Overview, cl, Common Lisp Extensions}.
@anchor{Glossary - Compilation}
@anchor{Glossary---Compilation}
@item Compilation
Compilation is the process of creating an executable program from source
code. Emacs has commands for compiling files of Emacs Lisp code
@ -241,7 +241,7 @@ Reference Manual}) and programs in C and other languages
A complete key is a key sequence that fully specifies one action to be
performed by Emacs. For example, @kbd{X} and @kbd{C-f} and @kbd{C-x m}
are complete keys. Complete keys derive their meanings from being bound
(q.v.@:) to commands (q.v.@:). Thus, @kbd{X} is conventionally bound to
(q.v.@:) to commands (q.v.). Thus, @kbd{X} is conventionally bound to
a command to insert @samp{X} in the buffer; @kbd{C-x m} is
conventionally bound to a command to begin composing a mail message.
@xref{Keys}.
@ -254,14 +254,14 @@ is known; for example, on command names, buffer names, and
file names. Completion usually occurs when @key{TAB}, @key{SPC} or
@key{RET} is typed. @xref{Completion}.@refill
@anchor{Glossary - Continuation Line}
@anchor{Glossary---Continuation Line}
@item Continuation Line
When a line of text is longer than the width of the window, it
normally (but see @ref{Glossary - Truncation}) takes up more than one
normally (but see @ref{Glossary---Truncation}) takes up more than one
screen line when displayed. We say that the text line is continued, and all
screen lines used for it after the first are called continuation
lines. @xref{Continuation Lines}. A related Emacs feature is
`filling' (q.v.@:).
`filling' (q.v.).
@item Control Character
A control character is a character that you type by holding down the
@ -282,7 +282,7 @@ GNU General Public License. @xref{Copying}.
@item @key{CTRL}
The @key{CTRL} or ``control'' key is what you hold down
in order to enter a control character (q.v.). @xref{Glossary - C-}.
in order to enter a control character (q.v.). @xref{Glossary---C-}.
@item Current Buffer
The current buffer in Emacs is the Emacs buffer on which most editing
@ -317,9 +317,9 @@ or by rebinding key sequences (@pxref{Keymaps}).
@cindex cut and paste
@item Cut and Paste
@xref{Glossary - Killing}, and @ref{Glossary - Yanking}.
@xref{Glossary---Killing}, and @ref{Glossary---Yanking}.
@anchor{Glossary - Daemon}
@anchor{Glossary---Daemon}
@item Daemon
A daemon is a standard term for a system-level process that runs in the
background. Daemons are often started when the system first starts up.
@ -333,7 +333,7 @@ do not specify one. When the minibuffer is used to read an argument,
the default argument is used if you just type @key{RET}.
@xref{Minibuffer}.
@anchor{Glossary - Default}
@anchor{Glossary---Default}
@item Default
A default is the value that is used for a certain purpose when
you do not explicitly specify a value to use.
@ -358,9 +358,9 @@ key or the @key{BACKSPACE} key, whichever one is easy to type.
@item Deletion
Deletion means erasing text without copying it into the kill ring
(q.v.@:). The alternative is killing (q.v.@:). @xref{Killing,Deletion}.
(q.v.). The alternative is killing (q.v.). @xref{Killing,Deletion}.
@anchor{Glossary - Deletion of Files}
@anchor{Glossary---Deletion of Files}
@item Deletion of Files
Deleting a file means erasing it from the file system.
(Note that some systems use the concept of a ``trash can'', or ``recycle
@ -384,7 +384,7 @@ File directories are named collections in the file system, within which
you can place individual files or subdirectories. They are sometimes
referred to as ``folders''. @xref{Directories}.
@anchor{Glossary - Directory Local Variable}
@anchor{Glossary---Directory Local Variable}
@item Directory Local Variable
A directory local variable is a local variable (q.v.@:) that applies
to all the files within a certain directory. @xref{Directory
@ -401,7 +401,7 @@ confirmation. The usual reason for disabling a command is that it is
confusing for beginning users. @xref{Disabling}.
@item Down Event
Short for `button down event' (q.v.@:).
Short for `button down event' (q.v.).
@item Drag Event
A drag event is the kind of input event (q.v.@:) generated when you
@ -431,16 +431,16 @@ them.
@item Electric
We say that a character is electric if it is normally self-inserting
(q.v.@:), but the current major mode (q.v.@:) redefines it to do something
(q.v.), but the current major mode (q.v.@:) redefines it to do something
else as well. For example, some programming language major modes define
particular delimiter characters to reindent the line, or insert one or
more newlines in addition to self-insertion.
@anchor{Glossary - End Of Line}
@anchor{Glossary---End Of Line}
@item End Of Line
End of line is a character or a sequence of characters that indicate
the end of a text line. On GNU and Unix systems, this is a newline
(q.v.@:), but other systems have other conventions. @xref{Coding
(q.v.), but other systems have other conventions. @xref{Coding
Systems,end-of-line}. Emacs can recognize several end-of-line
conventions in files and convert between them.
@ -452,13 +452,13 @@ variables in the environment it passes to programs it invokes.
@xref{Environment}.
@item EOL
@xref{Glossary - End Of Line}.
@xref{Glossary---End Of Line}.
@item Error
An error occurs when an Emacs command cannot execute in the current
circumstances. When an error occurs, execution of the command stops
(unless the command has been programmed to do otherwise) and Emacs
reports the error by displaying an error message (q.v.@:).
reports the error by displaying an error message (q.v.).
@c Not helpful?
@c Type-ahead is discarded. Then Emacs is ready to read another
@c editing command.
@ -477,7 +477,7 @@ typed), you press the @key{ESC} key as you would press a letter key, and
it applies to the next character you type.
@item Expression
@xref{Glossary - Balanced Expression}.
@xref{Glossary---Balanced Expression}.
@item Expunging
Expunging an Rmail, Gnus newsgroup, or Dired buffer is an operation
@ -494,10 +494,10 @@ order to display that text as specified by the face attributes.
@item File Local Variable
A file local variable is a local variable (q.v.@:) specified in a
given file. @xref{File Variables}, and @ref{Glossary - Directory
given file. @xref{File Variables}, and @ref{Glossary---Directory
Local Variable}.
@anchor{Glossary - File Locking}
@anchor{Glossary---File Locking}
@item File Locking
Emacs uses file locking to notice when two different users
start to edit one file at the same time. @xref{Interlocking}.
@ -510,11 +510,11 @@ directory, but an absolute file name refers to the same file regardless
of which directory is current. On GNU and Unix systems, an absolute
file name starts with a slash (the root directory) or with @samp{~/} or
@samp{~@var{user}/} (a home directory). On MS-Windows/MS-DOS, an
absolute file name can also start with a drive letter and a colon, e.g.
absolute file name can also start with a drive letter and a colon, e.g.,
@samp{@var{d}:}.
Some people use the term ``pathname'' for file names, but we do not;
we use the word ``path'' only in the term ``search path'' (q.v.@:).
we use the word ``path'' only in the term ``search path'' (q.v.).
@item File-Name Component
A file-name component names a file directly within a particular
@ -530,14 +530,14 @@ The fill prefix is a string that should be expected at the beginning
of each line when filling is done. It is not regarded as part of the
text to be filled. @xref{Filling}.
@anchor{Glossary - Filling}
@anchor{Glossary---Filling}
@item Filling
Filling text means adjusting the position of line-breaks to shift text
between consecutive lines, so that all the lines are approximately the
same length. @xref{Filling}. Some other editors call this feature
``line wrapping''.
@anchor{Glossary - Font Lock}
@anchor{Glossary---Font Lock}
@item Font Lock
Font Lock is a mode that highlights parts of buffer text in different
faces, according to the syntax. Some other editors refer to this as
@ -551,41 +551,41 @@ make it easy to change several fonts at once by specifying the name of a
fontset, rather than changing each font separately. @xref{Fontsets}.
@item Formfeed Character
@xref{Glossary - Page}.
@xref{Glossary---Page}.
@item Frame
A frame is a rectangular cluster of Emacs windows. Emacs starts out
with one frame, but you can create more. You can subdivide each frame
into Emacs windows (q.v.@:). When you are using a window system
(q.v.@:), more than one frame can be visible at the same time.
into Emacs windows (q.v.). When you are using a window system
(q.v.), more than one frame can be visible at the same time.
@xref{Frames}. Some other editors use the term ``window'' for this,
but in Emacs a window means something else.
@item Free Software
Free software is software that gives you the freedom to share, study
and modify it. Emacs is free software, part of the GNU project
(q.v.@:), and distributed under a copyleft (q.v.@:) license called the
(q.v.), and distributed under a copyleft (q.v.@:) license called the
GNU General Public License. @xref{Copying}.
@anchor{Glossary - Free Software Foundation}
@anchor{Glossary---Free Software Foundation}
@item Free Software Foundation
The Free Software Foundation (FSF) is a charitable foundation
dedicated to promoting the development of free software (q.v.@:).
dedicated to promoting the development of free software (q.v.).
For more information, see @uref{http://fsf.org/, the FSF website}.
@item Fringe
On a graphical display (q.v.@:), there's a narrow portion of the frame
On a graphical display (q.v.), there's a narrow portion of the frame
(q.v.@:) between the text area and the window's border. These
``fringes'' are used to display symbols that provide information about
the buffer text (@pxref{Fringes}). Emacs displays the fringe using a
special face (q.v.@:) called @code{fringe}. @xref{Faces,fringe}.
@item FSF
@xref{Glossary - Free Software Foundation}.
@xref{Glossary---Free Software Foundation}.
@item FTP
FTP is an acronym for File Transfer Protocol. This is one standard
method for retrieving remote files (q.v.@:).
method for retrieving remote files (q.v.).
@item Function Key
A function key is a key on the keyboard that sends input but does not
@ -593,7 +593,7 @@ correspond to any character. @xref{Function Keys}.
@item Global
Global means ``independent of the current environment; in effect
throughout Emacs''. It is the opposite of local (q.v.@:). Particular
throughout Emacs''. It is the opposite of local (q.v.). Particular
examples of the use of `global' appear below.
@item Global Abbrev
@ -604,15 +604,15 @@ modes that do not have local (q.v.@:) definitions for the same abbrev.
@item Global Keymap
The global keymap (q.v.@:) contains key bindings that are in effect
everywhere, except when overridden by local key bindings in a major
mode's local keymap (q.v.@:). @xref{Keymaps}.
mode's local keymap (q.v.). @xref{Keymaps}.
@item Global Mark Ring
The global mark ring records the series of buffers you have recently
set a mark (q.v.@:) in. In many cases you can use this to backtrack
through buffers you have been editing, or in which you have found
tags (@pxref{Glossary - Tags Table}). @xref{Global Mark Ring}.
tags (@pxref{Glossary---Tags Table}). @xref{Global Mark Ring}.
@anchor{Glossary - Global Substitution}
@anchor{Glossary---Global Substitution}
@item Global Substitution
Global substitution means replacing each occurrence of one string by
another string throughout a large amount of text. @xref{Replace}.
@ -624,7 +624,7 @@ that do not have their own local (q.v.@:) values for the variable.
@item GNU
GNU is a recursive acronym for GNU's Not Unix, and it refers to a
Unix-compatible operating system which is free software (q.v.@:).
Unix-compatible operating system which is free software (q.v.).
@xref{Manifesto}. GNU is normally used with Linux as the kernel since
Linux works better than the GNU kernel. For more information, see
@uref{http://www.gnu.org/, the GNU website}.
@ -639,7 +639,7 @@ that character (in ordinary editing modes). @xref{Inserting Text}.
@item Graphical Display
A graphical display is one that can display images and multiple fonts.
Usually it also has a window system (q.v.@:).
Usually it also has a window system (q.v.).
@item Highlighting
Highlighting text means displaying it with a different foreground and/or
@ -648,7 +648,7 @@ buffer.
Emacs uses highlighting in several ways. It highlights the region
whenever it is active (@pxref{Mark}). Incremental search also
highlights matches (@pxref{Incremental Search}). @xref{Glossary - Font Lock}.
highlights matches (@pxref{Incremental Search}). @xref{Glossary---Font Lock}.
@item Hardcopy
Hardcopy means printed output. Emacs has various commands for
@ -664,7 +664,7 @@ Help echo is a short message displayed in the echo area (q.v.@:) when
the mouse pointer is located on portions of display that require some
explanations. Emacs displays help echo for menu items, parts of the
mode line, tool-bar buttons, etc. On graphical displays, the messages
can be displayed as tooltips (q.v.@:). @xref{Tooltips}.
can be displayed as tooltips (q.v.). @xref{Tooltips}.
@item Home Directory
Your home directory contains your personal files. On a multi-user GNU
@ -697,7 +697,7 @@ Rmail transfers mail from inboxes to Rmail files in which the
mail is then stored permanently or until explicitly deleted.
@xref{Rmail Inbox}.
@anchor{Glossary - Incremental Search}
@anchor{Glossary---Incremental Search}
@item Incremental Search
Emacs provides an incremental search facility, whereby Emacs begins
searching for a string as soon as you type the first character.
@ -712,7 +712,7 @@ commands to adjust indentation.
@item Indirect Buffer
An indirect buffer is a buffer that shares the text of another buffer,
called its base buffer (q.v.@:). @xref{Indirect Buffers}.
called its base buffer (q.v.). @xref{Indirect Buffers}.
@item Info
Info is the hypertext format used by the GNU project for writing
@ -726,24 +726,24 @@ frames. @xref{User Input}.
@item Input Method
An input method is a system for entering non-@acronym{ASCII} text characters by
typing sequences of @acronym{ASCII} characters (q.v.@:). @xref{Input Methods}.
typing sequences of @acronym{ASCII} characters (q.v.). @xref{Input Methods}.
@item Insertion
Insertion means adding text into the buffer, either from the keyboard
or from some other place in Emacs.
@item Interlocking
@xref{Glossary - File Locking}.
@xref{Glossary---File Locking}.
@item Isearch
@xref{Glossary - Incremental Search}.
@xref{Glossary---Incremental Search}.
@item Justification
Justification means adding extra spaces within lines of text in order
to adjust the position of the text edges. @xref{Fill Commands}.
@item Key Binding
@xref{Glossary - Binding}.
@xref{Glossary---Binding}.
@item Keyboard Macro
Keyboard macros are a way of defining new Emacs commands from
@ -756,13 +756,13 @@ play them back as many times as you like.
@item Keyboard Shortcut
A keyboard shortcut is a key sequence (q.v.@:) that invokes a
command. What some programs call ``assigning a keyboard shortcut'',
Emacs calls ``binding a key sequence''. @xref{Glossary - Binding}.
Emacs calls ``binding a key sequence''. @xref{Glossary---Binding}.
@item Key Sequence
A key sequence (key, for short) is a sequence of input events (q.v.@:)
that are meaningful as a single unit. If the key sequence is enough to
specify one action, it is a complete key (q.v.@:); if it is not enough,
it is a prefix key (q.v.@:). @xref{Keys}.
specify one action, it is a complete key (q.v.); if it is not enough,
it is a prefix key (q.v.). @xref{Keys}.
@item Keymap
The keymap is the data structure that records the bindings (q.v.@:) of
@ -776,16 +776,16 @@ codes that come from the terminal into the character codes that make up
key sequences.
@item Kill Ring
The kill ring is where all text you have killed (@pxref{Glossary - Killing})
The kill ring is where all text you have killed (@pxref{Glossary---Killing})
recently is saved. You can reinsert any of the killed text still in
the ring; this is called yanking (q.v.@:). @xref{Yanking}.
the ring; this is called yanking (q.v.). @xref{Yanking}.
@anchor{Glossary - Killing}
@anchor{Glossary---Killing}
@item Killing
Killing means erasing text and saving it on the kill ring so it can be
yanked (q.v.@:) later. Some other systems call this ``cutting''.
Most Emacs commands that erase text perform killing, as opposed to
deletion (q.v.@:). @xref{Killing}.
deletion (q.v.). @xref{Killing}.
@item Killing a Job
Killing a job (such as, an invocation of Emacs) means making it cease
@ -794,7 +794,7 @@ to exist. Any data within it, if not saved in a file, is lost.
@item Language Environment
Your choice of language environment specifies defaults for the input
method (q.v.@:) and coding system (q.v.@:). @xref{Language
method (q.v.@:) and coding system (q.v.). @xref{Language
Environments}. These defaults are relevant if you edit
non-@acronym{ASCII} text (@pxref{International}).
@ -802,7 +802,7 @@ non-@acronym{ASCII} text (@pxref{International}).
@c Lexical Binding
@item Line Wrapping
@xref{Glossary - Filling}.
@xref{Glossary---Filling}.
@item Lisp
Lisp is a programming language. Most of Emacs is written in a dialect
@ -821,7 +821,7 @@ lists. @xref{Moving by Parens}.
Local means ``in effect only in a particular context''; the relevant
kind of context is a particular function execution, a particular
buffer, or a particular major mode. It is the opposite of `global'
(q.v.@:). Specific uses of `local' in Emacs terminology appear below.
(q.v.). Specific uses of `local' in Emacs terminology appear below.
@item Local Abbrev
A local abbrev definition is effective only if a particular major mode
@ -844,14 +844,14 @@ one of the modifier keys that can accompany any character.
@item @kbd{M-C-}
@kbd{M-C-} in the name of a character is an abbreviation for
Control-Meta; it means the same thing as `@kbd{C-M-}' (q.v.@:).
Control-Meta; it means the same thing as `@kbd{C-M-}' (q.v.).
@item @kbd{M-x}
@kbd{M-x} is the key sequence that is used to call an Emacs command by
name. This is how you run commands that are not bound to key sequences.
@xref{M-x,M-x,Running Commands by Name}.
@anchor{Glossary - Mail}
@anchor{Glossary---Mail}
@item Mail
Mail means messages sent from one user to another through the computer
system, to be read at the recipient's convenience. Emacs has commands for
@ -875,14 +875,14 @@ fringe) and the window edge.
@item Mark
The mark points to a position in the text. It specifies one end of the
region (q.v.@:), point being the other end. Many commands operate on
region (q.v.), point being the other end. Many commands operate on
all the text from point to the mark. Each buffer has its own mark.
@xref{Mark}.
@item Mark Ring
The mark ring is used to hold several recent previous locations of the
mark, in case you want to move back to them. Each buffer has its
own mark ring; in addition, there is a single global mark ring (q.v.@:).
own mark ring; in addition, there is a single global mark ring (q.v.).
@xref{Mark Ring}.
@item Menu Bar
@ -891,7 +891,7 @@ words you can click on with the mouse to bring up menus, or you can use
a keyboard interface to navigate it. @xref{Menu Bars}.
@item Message
@xref{Glossary - Mail}.
@xref{Glossary---Mail}.
@item Meta
Meta is the name of a modifier bit which you can use in a command
@ -911,10 +911,10 @@ A Meta character is one whose character code includes the Meta bit.
@item Minibuffer
The minibuffer is the window that appears when necessary inside the
echo area (q.v.@:), used for reading arguments to commands.
echo area (q.v.), used for reading arguments to commands.
@xref{Minibuffer}.
@anchor{Glossary - Minibuffer History}
@anchor{Glossary---Minibuffer History}
@item Minibuffer History
The minibuffer history records the text you have specified in the past
for minibuffer arguments, so you can conveniently use the same text
@ -923,8 +923,8 @@ again. @xref{Minibuffer History}.
@item Minor Mode
A minor mode is an optional feature of Emacs, which can be switched on
or off independently of all other features. Each minor mode has a
command to turn it on or off. Some minor modes are global (q.v.@:),
and some are local (q.v.@:). @xref{Minor Modes}.
command to turn it on or off. Some minor modes are global (q.v.),
and some are local (q.v.). @xref{Minor Modes}.
@item Minor Mode Keymap
A minor mode keymap is a keymap that belongs to a minor mode and is
@ -933,7 +933,7 @@ over the buffer's local keymap, just as the local keymap takes
precedence over the global keymap. @xref{Keymaps}.
@item Mode Line
The mode line is the line at the bottom of each window (q.v.@:), giving
The mode line is the line at the bottom of each window (q.v.), giving
status information on the buffer displayed in that window. @xref{Mode
Line}.
@ -949,7 +949,7 @@ yanking (q.v.@:) it. @xref{Killing}.
@item MULE
MULE refers to the Emacs features for editing multilingual
non-@acronym{ASCII} text using multibyte characters (q.v.@:).
non-@acronym{ASCII} text using multibyte characters (q.v.).
@xref{International}.
@item Multibyte Character
@ -959,7 +959,7 @@ since the number of non-@acronym{ASCII} characters is much more than 256.
@xref{International Chars, International Characters}.
@item Named Mark
A named mark is a register (q.v.@:), in its role of recording a
A named mark is a register (q.v.), in its role of recording a
location in text so that you can move point to that location.
@xref{Registers}.
@ -972,7 +972,7 @@ all. @xref{Narrowing}.
@item Newline
Control-J characters in the buffer terminate lines of text and are
therefore also called newlines. @xref{Glossary - End Of Line}.
therefore also called newlines. @xref{Glossary---End Of Line}.
@cindex nil
@cindex t
@ -980,7 +980,7 @@ therefore also called newlines. @xref{Glossary - End Of Line}.
@code{nil} is a value usually interpreted as a logical ``false''. Its
opposite is @code{t}, interpreted as ``true''.
@anchor{Glossary - Numeric Argument}
@anchor{Glossary---Numeric Argument}
@item Numeric Argument
A numeric argument is a number, specified before a command, to change
the effect of the command. Often the numeric argument serves as a
@ -996,7 +996,7 @@ A package is a collection of Lisp code that you download and
automatically install from within Emacs. Packages provide a
convenient way to add new features. @xref{Packages}.
@anchor{Glossary - Page}
@anchor{Glossary---Page}
@item Page
A page is a unit of text, delimited by formfeed characters (@acronym{ASCII}
control-L, code 014) at the beginning of a line. Some Emacs
@ -1020,7 +1020,7 @@ character. The terminal's cursor (q.v.@:) indicates the location of
point. @xref{Point}.
@item Prefix Argument
@xref{Glossary - Numeric Argument}.
@xref{Glossary---Numeric Argument}.
@item Prefix Key
A prefix key is a key sequence (q.v.@:) whose sole function is to
@ -1037,7 +1037,7 @@ specify a different file name. @xref{Rmail}.
@end ignore
@item Primary Selection
The primary selection is one particular X selection (q.v.@:); it is the
The primary selection is one particular X selection (q.v.); it is the
selection that most X applications use for transferring text to and from
other applications.
@ -1047,7 +1047,7 @@ uses the primary selection when appropriate. @xref{Killing}.
@item Prompt
A prompt is text used to ask you for input. Displaying a prompt
is called prompting. Emacs prompts always appear in the echo area
(q.v.@:). One kind of prompting happens when the minibuffer is used to
(q.v.). One kind of prompting happens when the minibuffer is used to
read an argument (@pxref{Minibuffer}); the echoing that happens when
you pause in the middle of typing a multi-character key sequence is also
a kind of prompting (@pxref{Echo Area}).
@ -1056,7 +1056,7 @@ a kind of prompting (@pxref{Echo Area}).
Query-replace is an interactive string replacement feature provided by
Emacs. @xref{Query Replace}.
@anchor{Glossary - Quitting}
@anchor{Glossary---Quitting}
@item Quitting
Quitting means canceling a partially typed command or a running
command, using @kbd{C-g} (or @kbd{C-@key{BREAK}} on MS-DOS). @xref{Quitting}.
@ -1101,18 +1101,18 @@ correspond to changes that have been made in the text being edited.
@xref{Screen,Redisplay}.
@item Regexp
@xref{Glossary - Regular Expression}.
@xref{Glossary---Regular Expression}.
@item Region
The region is the text between point (q.v.@:) and the mark (q.v.@:).
The region is the text between point (q.v.@:) and the mark (q.v.).
Many commands operate on the text of the region. @xref{Mark,Region}.
@item Register
Registers are named slots in which text, buffer positions, or
rectangles can be saved for later use. @xref{Registers}. A related
Emacs feature is `bookmarks' (q.v.@:).
Emacs feature is `bookmarks' (q.v.).
@anchor{Glossary - Regular Expression}
@anchor{Glossary---Regular Expression}
@item Regular Expression
A regular expression is a pattern that can match various text strings;
for example, @samp{a[0-9]+} matches @samp{a} followed by one or more
@ -1126,21 +1126,21 @@ you have a supported method to gain access to those files.
@xref{Remote Files}.
@item Repeat Count
@xref{Glossary - Numeric Argument}.
@xref{Glossary---Numeric Argument}.
@item Replacement
@xref{Glossary - Global Substitution}.
@xref{Glossary---Global Substitution}.
@item Restriction
A buffer's restriction is the amount of text, at the beginning or the
end of the buffer, that is temporarily inaccessible. Giving a buffer a
nonzero amount of restriction is called narrowing (q.v.@:); removing
a restriction is called widening (q.v.@:). @xref{Narrowing}.
nonzero amount of restriction is called narrowing (q.v.); removing
a restriction is called widening (q.v.). @xref{Narrowing}.
@item @key{RET}
@key{RET} is a character that in Emacs runs the command to insert a
newline into the text. It is also used to terminate most arguments
read in the minibuffer (q.v.@:). @xref{User Input,Return}.
read in the minibuffer (q.v.). @xref{User Input,Return}.
@item Reverting
Reverting means returning to the original state. Emacs lets you
@ -1180,7 +1180,7 @@ files for certain purposes. For example, the variable @code{load-path}
holds a search path for finding Lisp library files. @xref{Lisp Libraries}.
@item Secondary Selection
The secondary selection is one particular X selection (q.v.@:); some X
The secondary selection is one particular X selection (q.v.); some X
applications can use it for transferring text to and from other
applications. Emacs has special mouse commands for transferring text
using the secondary selection. @xref{Secondary Selection}.
@ -1203,7 +1203,7 @@ selections whose values are text. A program can also read the
selections that other programs have set up. This is the principal way
of transferring text between window applications. Emacs has commands to
work with the primary (q.v.@:) selection and the secondary (q.v.@:)
selection, and also with the clipboard (q.v.@:).
selection, and also with the clipboard (q.v.).
@item Self-Documentation
Self-documentation is the feature of Emacs that can tell you what any
@ -1220,12 +1220,12 @@ are self-inserting in Emacs, except in certain special major modes.
Emacs has commands for moving by or killing by sentences.
@xref{Sentences}.
@anchor{Glossary - Server}
@anchor{Glossary---Server}
@item Server
Within Emacs, you can start a `server' process, which listens for
connections from `clients'. This offers a faster alternative to
starting several Emacs instances. @xref{Emacs Server}, and
@ref{Glossary - Daemon}.
@ref{Glossary---Daemon}.
@c This is only covered in the lispref, not the user manual.
@ignore
@ -1277,10 +1277,10 @@ inside the string; however, backslash sequences as in C, such as
allowed as well.
@item String Substitution
@xref{Glossary - Global Substitution}.
@xref{Glossary---Global Substitution}.
@item Syntax Highlighting
@xref{Glossary - Font Lock}.
@xref{Glossary---Font Lock}.
@item Syntax Table
The syntax table tells Emacs which characters are part of a word,
@ -1297,14 +1297,14 @@ have. To make a character Super, type it while holding down the
@item Suspending
Suspending Emacs means stopping it temporarily and returning control
to its parent process, which is usually a shell. Unlike killing a job
(q.v.@:), you can later resume the suspended Emacs job without losing
(q.v.), you can later resume the suspended Emacs job without losing
your buffers, unsaved edits, undo history, etc. @xref{Exiting}.
@item @key{TAB}
@key{TAB} is the tab character. In Emacs it is typically used for
indentation or completion.
@anchor{Glossary - Tags Table}
@anchor{Glossary---Tags Table}
@item Tags Table
A tags table is a file that serves as an index to the function
definitions in one or more other files. @xref{Tags}.
@ -1329,7 +1329,7 @@ Data consisting of written human language (as opposed to programs),
or following the stylistic conventions of human language.
@end itemize
@anchor{Glossary - Text Terminal}
@anchor{Glossary---Text Terminal}
@item Text Terminal
A text terminal, or character terminal, is a display that is limited
to displaying text in character units. Such a terminal cannot control
@ -1344,15 +1344,15 @@ they also specify formatting information. @xref{Editing Format Info}.
@item Theme
A theme is a set of customizations (q.v.@:) that give Emacs a
particular appearance or behavior. For example, you might use a theme
for your favorite set of faces (q.v.@:).
for your favorite set of faces (q.v.).
@item Tool Bar
The tool bar is a line (sometimes multiple lines) of icons at the top
of an Emacs frame. Clicking on one of these icons executes a command.
You can think of this as a graphical relative of the menu bar (q.v.@:).
You can think of this as a graphical relative of the menu bar (q.v.).
@xref{Tool Bars}.
@anchor{Glossary - Tooltips}
@anchor{Glossary---Tooltips}
@item Tooltips
Tooltips are small windows displaying a help echo (q.v.@:) text, which
explains parts of the display, lists useful options available via mouse
@ -1362,8 +1362,8 @@ clicks, etc. @xref{Tooltips}.
Top level is the normal state of Emacs, in which you are editing the
text of the file you have visited. You are at top level whenever you
are not in a recursive editing level (q.v.@:) or the minibuffer
(q.v.@:), and not in the middle of a command. You can get back to top
level by aborting (q.v.@:) and quitting (q.v.@:). @xref{Quitting}.
(q.v.), and not in the middle of a command. You can get back to top
level by aborting (q.v.@:) and quitting (q.v.). @xref{Quitting}.
@c FIXME? Transient Mark Mode
@ -1374,17 +1374,17 @@ two adjacent characters, words, balanced expressions (q.v.@:) or lines
(@pxref{Transpose}).
@item Trash Can
@xref{Glossary - Deletion of Files}.
@xref{Glossary---Deletion of Files}.
@anchor{Glossary - Truncation}
@anchor{Glossary---Truncation}
@item Truncation
Truncating text lines in the display means leaving out any text on a
line that does not fit within the right margin of the window
displaying it. @xref{Continuation Lines,Truncation}, and
@ref{Glossary - Continuation Line}.
@ref{Glossary---Continuation Line}.
@item TTY
@xref{Glossary - Text Terminal}.
@xref{Glossary---Text Terminal}.
@item Undoing
Undoing means making your previous editing go in reverse, bringing
@ -1395,7 +1395,7 @@ back the text that existed earlier in the editing session.
Unix is a class of multi-user computer operating systems with a long
history. There are several implementations today. The GNU project
(q.v.@:) aims to develop a complete Unix-like operating system that
is free software (q.v.@:).
is free software (q.v.).
@item User Option
A user option is a face (q.v.@:) or a variable (q.v.@:) that exists so
@ -1413,7 +1413,7 @@ information on variables.
@item Version Control
Version control systems keep track of multiple versions of a source file.
They provide a more powerful alternative to keeping backup files (q.v.@:).
They provide a more powerful alternative to keeping backup files (q.v.).
@xref{Version Control}.
@item Visiting
@ -1426,7 +1426,7 @@ tab, newline, and backspace).
@item Widening
Widening is removing any restriction (q.v.@:) on the current buffer;
it is the opposite of narrowing (q.v.@:). @xref{Narrowing}.
it is the opposite of narrowing (q.v.). @xref{Narrowing}.
@item Window
Emacs divides a frame (q.v.@:) into one or more windows, each of which
@ -1438,20 +1438,20 @@ other editors use the term ``window'' for what we call a `frame'
@item Window System
A window system is software that operates on a graphical display
(q.v.@:), to subdivide the screen so that multiple applications can
(q.v.), to subdivide the screen so that multiple applications can
have their] own windows at the same time. All modern operating systems
include a window system.
@item Word Abbrev
@xref{Glossary - Abbrev}.
@xref{Glossary---Abbrev}.
@item Word Search
Word search is searching for a sequence of words, considering the
punctuation between them as insignificant. @xref{Word Search}.
@anchor{Glossary - Yanking}
@anchor{Glossary---Yanking}
@item Yanking
Yanking means reinserting text previously killed (q.v.@:). It can be
Yanking means reinserting text previously killed (q.v.). It can be
used to undo a mistaken kill, or for copying or moving text. Some
other systems call this ``pasting''. @xref{Yanking}.
@end table

View file

@ -1,5 +1,5 @@
@c Copyright (C) 1985-1987, 1993, 1995, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993, 1995, 2001-2013 Free Software
@c Foundation, Inc.
@c
@c Permission is granted to anyone to make or distribute verbatim copies
@c of this document, in any medium, provided that the copyright notice and
@ -34,7 +34,7 @@ our web site, @uref{http://www.gnu.org}. For software tasks and other
ways to contribute, see @uref{http://www.gnu.org/help}.
@end quotation
@unnumberedsec What's GNU? Gnu's Not Unix!
@unnumberedsec What's GNU@? Gnu's Not Unix!
GNU, which stands for Gnu's Not Unix, is the name for the complete
Unix-compatible software system which I am writing so that I can give it
@ -151,7 +151,7 @@ systems, approved for use in a residential area, and not in need of
sophisticated cooling or power.
I have found very many programmers eager to contribute part-time work for
GNU. For most projects, such part-time distributed work would be very hard
GNU@. For most projects, such part-time distributed work would be very hard
to coordinate; the independently-written parts would not work together.
But for the particular task of replacing Unix, this problem is absent. A
complete Unix system contains hundreds of utility programs, each of which
@ -262,7 +262,7 @@ and you must charge for the program to support that.''
@end quotation
There are various forms of free or very cheap publicity that can be used to
inform numbers of computer users about something like GNU. But it may be
inform numbers of computer users about something like GNU@. But it may be
true that one can reach more microcomputer users with advertising. If this
is really so, a business which advertises the service of copying and
mailing GNU for a fee ought to be successful enough to pay for its
@ -271,7 +271,7 @@ advertising pay for it.
On the other hand, if many people get GNU from their friends, and such
companies don't succeed, this will show that advertising was not really
necessary to spread GNU. Why is it that free market advocates don't
necessary to spread GNU@. Why is it that free market advocates don't
want to let the free market decide this?@footnote{The Free Software
Foundation raises most of its funds from a distribution service,
although it is a charity rather than a company. If @emph{no one}

View file

@ -2,7 +2,7 @@
@center Version 3, 29 June 2007
@c This file is intended to be included within another document,
@c hence no sectioning command or @node.
@c hence no sectioning command or @node.
@display
Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
@ -222,7 +222,7 @@ terms of section 4, provided that you also meet all of these
conditions:
@enumerate a
@item
@item
The work must carry prominent notices stating that you modified it,
and giving a relevant date.
@ -623,12 +623,12 @@ later version.
@item Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
APPLICABLE LAW@. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
A PARTICULAR PURPOSE@. THE ENTIRE RISK AS TO THE QUALITY AND
PERFORMANCE OF THE PROGRAM IS WITH YOU@. SHOULD THE PROGRAM PROVE
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
CORRECTION.
@ -670,7 +670,7 @@ state the exclusion of warranty; and each file should have at least
the ``copyright'' line and a pointer to where the full notice is found.
@smallexample
@var{one line to give the program's name and a brief idea of what it does.}
@var{one line to give the program's name and a brief idea of what it does.}
Copyright (C) @var{year} @var{name of author}
This program is free software: you can redistribute it and/or modify
@ -680,7 +680,7 @@ your option) any later version.
This program 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
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
@ -693,7 +693,7 @@ If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
@smallexample
@var{program} Copyright (C) @var{year} @var{name of author}
@var{program} Copyright (C) @var{year} @var{name of author}
This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
This is free software, and you are welcome to redistribute it
under certain conditions; type @samp{show c} for details.

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Help
@chapter Help
@ -295,11 +295,16 @@ search for noninteractive functions too.
Search for functions and variables. Both interactive functions
(commands) and noninteractive functions can be found by this.
@item M-x apropos-variable
@findex apropos-variable
@item M-x apropos-user-option
@findex apropos-user-option
Search for user-customizable variables. With a prefix argument,
search for non-customizable variables too.
@item M-x apropos-variable
@findex apropos-variable
Search for variables. With a prefix argument, search for
customizable variables only.
@item M-x apropos-value
@findex apropos-value
Search for variables whose values match the specified pattern. With a

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Indentation
@chapter Indentation
@ -134,7 +134,7 @@ leftward).
This command can be used to remove all indentation from the lines in
the region, by invoking it with a large negative argument,
e.g. @kbd{C-u -1000 C-x @key{TAB}}.
e.g., @kbd{C-u -1000 C-x @key{TAB}}.
@end table
@node Tab Stops

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Killing
@ -34,7 +34,7 @@ killing many different types of syntactic units.
@cindex deletion
Most commands which erase text from the buffer save it in the kill
ring. These are known as @dfn{kill} commands, and their names
normally contain the word @samp{kill} (e.g. @code{kill-line}). The
normally contain the word @samp{kill} (e.g., @code{kill-line}). The
kill ring stores several recent kills, not just the last one, so
killing is a very safe operation: you don't have to worry much about
losing text that you previously killed. The kill ring is shared by
@ -123,7 +123,7 @@ point, regardless of the number of spaces that existed previously
(even if there were none before). With a numeric argument @var{n}, it
leaves @var{n} spaces before point if @var{n} is positive; if @var{n}
is negative, it deletes newlines in addition to spaces and tabs,
leaving a single space before point.
leaving @var{-n} spaces before point.
@kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines
after the current line. If the current line is blank, it deletes all
@ -284,7 +284,7 @@ position, if you wish, with @kbd{C-u C-@key{SPC}} (@pxref{Mark Ring}).
With a plain prefix argument (@kbd{C-u C-y}), the command instead
leaves the cursor in front of the inserted text, and sets the mark at
the end. Using any other prefix argument specifies an earlier kill;
e.g. @kbd{C-u 4 C-y} reinserts the fourth most recent kill.
e.g., @kbd{C-u 4 C-y} reinserts the fourth most recent kill.
@xref{Earlier Kills}.
On graphical displays, @kbd{C-y} first checks if another application
@ -535,13 +535,13 @@ or ``copy'' commands.
Under X, whenever the region is active (@pxref{Mark}), the text in
the region is saved in the primary selection. This applies regardless
of whether the region was made by dragging or clicking the mouse
(@pxref{Mouse Commands}), or by keyboard commands (e.g. by typing
(@pxref{Mouse Commands}), or by keyboard commands (e.g., by typing
@kbd{C-@key{SPC}} and moving point; @pxref{Setting Mark}).
@vindex select-active-regions
If you change the variable @code{select-active-regions} to
@code{only}, Emacs saves only temporarily active regions to the
primary selection, i.e. those made with the mouse or with shift
primary selection, i.e., those made with the mouse or with shift
selection (@pxref{Shift Selection}). If you change
@code{select-active-regions} to @code{nil}, Emacs avoids saving active
regions to the primary selection entirely.
@ -841,8 +841,8 @@ has no effect for @kbd{C-x} and @kbd{C-c} (@pxref{Using Region}).
To enter an Emacs command like @kbd{C-x C-f} while the mark is
active, use one of the following methods: either hold @kbd{Shift}
together with the prefix key, e.g. @kbd{S-C-x C-f}, or quickly type
the prefix key twice, e.g. @kbd{C-x C-x C-f}.
together with the prefix key, e.g., @kbd{S-C-x C-f}, or quickly type
the prefix key twice, e.g., @kbd{C-x C-x C-f}.
To disable the overriding of standard Emacs binding by CUA mode,
while retaining the other features of CUA mode described below, set
@ -862,7 +862,7 @@ of each line in the rectangle (on the same side as the cursor).
With CUA you can easily copy text and rectangles into and out of
registers by providing a one-digit numeric prefix to the kill, copy,
and yank commands, e.g. @kbd{C-1 C-c} copies the region into register
and yank commands, e.g., @kbd{C-1 C-c} copies the region into register
@code{1}, and @kbd{C-2 C-v} yanks the contents of register @code{2}.
@cindex global mark
@ -875,7 +875,7 @@ position.
For example, to copy words from various buffers into a word list in
a given buffer, set the global mark in the target buffer, then
navigate to each of the words you want in the list, mark it (e.g. with
navigate to each of the words you want in the list, mark it (e.g., with
@kbd{S-M-f}), copy it to the list with @kbd{C-c} or @kbd{M-w}, and
insert a newline after the word in the target list by pressing
@key{RET}.

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Keyboard Macros
@chapter Keyboard Macros

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node M-x
@chapter Running Commands by Name

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2000-2012 Free Software Foundation, Inc.
@c Copyright (C) 2000-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mac OS / GNUstep
@appendix Emacs and Mac OS / GNUstep

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Maintaining
@chapter Maintaining Large Programs
@ -31,7 +31,7 @@ versions of a source file, storing information such as the creation
time of each version, who made it, and a description of what was
changed.
The Emacs version control interface is called @dfn{VC}. VC commands
The Emacs version control interface is called @dfn{VC}@. VC commands
work with several different version control systems; currently, it
supports GNU Arch, Bazaar, CVS, Git, Mercurial, Monotone, RCS,
SCCS/CSSC, and Subversion. Of these, the GNU project distributes CVS,
@ -73,8 +73,8 @@ provides a uniform interface for common operations in many version
control operations.
Some uncommon or intricate version control operations, such as
altering repository settings, are not supported in VC. You should
perform such tasks outside Emacs, e.g.@: via the command line.
altering repository settings, are not supported in VC@. You should
perform such tasks outside Emacs, e.g., via the command line.
This section provides a general overview of version control, and
describes the version control systems that VC supports. You can skip
@ -128,13 +128,13 @@ which it refers to as @dfn{back ends}:
@item
SCCS was the first version control system ever built, and was long ago
superseded by more advanced ones. VC compensates for certain features
missing in SCCS (e.g.@: tag names for releases) by implementing them
missing in SCCS (e.g., tag names for releases) by implementing them
itself. Other VC features, such as multiple branches, are simply
unavailable. Since SCCS is non-free, we recommend avoiding it.
@cindex CSSC
@item
CSSC is a free replacement for SCCS. You should use CSSC only if, for
CSSC is a free replacement for SCCS@. You should use CSSC only if, for
some reason, you cannot use a more recent and better-designed version
control system.
@ -455,7 +455,7 @@ and don't persist across sessions.
@node VC With A Merging VCS
@subsubsection Basic Version Control with Merging
On a merging-based version control system (i.e.@: most modern ones;
On a merging-based version control system (i.e., most modern ones;
@pxref{VCS Merging}), @kbd{C-x v v} does the following:
@itemize @bullet
@ -467,7 +467,7 @@ files and ``modified'' files; @pxref{Registering}.)
@item
If none of the files in the VC fileset are registered with a version
control system, register the VC fileset, i.e.@: place it under version
control system, register the VC fileset, i.e., place it under version
control. @xref{Registering}. If Emacs cannot find a system to
register under, it prompts for a repository type, creates a new
repository, and registers the VC fileset with it.
@ -568,13 +568,13 @@ and Emacs fails to detect the correct one.
Otherwise, if using CVS or RCS, you can specify a revision ID.
If the fileset is modified (or locked), this makes Emacs commit with
that revision ID. You can create a new branch by supplying an
that revision ID@. You can create a new branch by supplying an
appropriate revision ID (@pxref{Branches}).
If the fileset is unmodified (and unlocked), this checks the specified
revision into the working tree. You can also specify a revision on
another branch by giving its revision or branch ID (@pxref{Switching
Branches}). An empty argument (i.e.@: @kbd{C-u C-x v v @key{RET}})
Branches}). An empty argument (i.e., @kbd{C-u C-x v v @key{RET}})
checks out the latest (``head'') revision on the current branch.
This signals an error on a decentralized version control system.
@ -759,7 +759,7 @@ comparison again, generating a new diff.
prompts for two revision IDs (@pxref{VCS Concepts}), and displays a
diff between those versions of the fileset. This will not work
reliably for multi-file VC filesets, if the version control system is
file-based rather than changeset-based (e.g.@: CVS), since then
file-based rather than changeset-based (e.g., CVS), since then
revision IDs for different files would not be related in any
meaningful way.
@ -783,7 +783,7 @@ Ediff session. @xref{Top,, Ediff, ediff, The Ediff Manual}.
@findex vc-root-diff
@kindex C-x v D
@kbd{C-x v D} (@code{vc-root-diff}) is similar to @kbd{C-x v =}, but
it displays the changes in the entire current working tree (i.e.@: the
it displays the changes in the entire current working tree (i.e., the
working tree containing the current VC fileset). If you invoke this
command from a Dired buffer, it applies to the working tree containing
the directory.
@ -795,7 +795,7 @@ from the first non-@code{nil} value amongst the variables
@code{vc-@var{backend}-diff-switches}, @code{vc-diff-switches}, and
@code{diff-switches} (@pxref{Comparing Files}), in that order. Here,
@var{backend} stands for the relevant version control system,
e.g.@: @code{bzr} for Bazaar. Since @code{nil} means to check the
e.g., @code{bzr} for Bazaar. Since @code{nil} means to check the
next variable in the sequence, either of the first two may use the
value @code{t} to mean no switches at all. Most of the
@code{vc-@var{backend}-diff-switches} variables default to @code{nil},
@ -835,12 +835,12 @@ view diffs, or view log entries:
@table @kbd
@item p
Annotate the previous revision, i.e.@: the revision before the one
Annotate the previous revision, i.e., the revision before the one
currently annotated. A numeric prefix argument is a repeat count, so
@kbd{C-u 10 p} would take you back 10 revisions.
@item n
Annotate the next revision, i.e.@: the revision after the one
Annotate the next revision, i.e., the revision after the one
currently annotated. A numeric prefix argument is a repeat count.
@item j
@ -986,7 +986,7 @@ earlier revision. This shows the changes to all files made in that
revision.
@item @key{RET}
In a compact-style log buffer (e.g.@: the one created by @kbd{C-x v
In a compact-style log buffer (e.g., the one created by @kbd{C-x v
L}), toggle between showing and hiding the full log entry for the
revision at point.
@end table
@ -1064,8 +1064,8 @@ the version control system which the VC Directory buffer should use.
@pindex cvs
@cindex CVS directory mode
In addition to the VC Directory buffer, Emacs has a similar facility
called PCL-CVS which is specialized for CVS. @xref{Top, , About
PCL-CVS, pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}.
called PCL-CVS which is specialized for CVS@. @xref{Top, , About
PCL-CVS, pcl-cvs, PCL-CVS---The Emacs Front-End to CVS}.
@end ifnottex
@menu
@ -1080,7 +1080,7 @@ PCL-CVS, pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}.
and their version control statuses. It lists files in the current
directory (the one specified when you called @kbd{C-x v d}) and its
subdirectories, but only those with a ``noteworthy'' status. Files
that are up-to-date (i.e.@: the same as in the repository) are
that are up-to-date (i.e., the same as in the repository) are
omitted. If all the files in a subdirectory are up-to-date, the
subdirectory is not listed either. As an exception, if a file has
become up-to-date as a direct result of a VC command, it is listed.
@ -1131,7 +1131,7 @@ updates. If you change the variable @code{vc-stay-local} or
@code{vc-cvs-stay-local} (for CVS) to @code{nil} (@pxref{CVS
Options}), then Emacs avoids contacting a remote repository when
generating the VC Directory buffer (it will still contact it when
necessary, e.g.@: when doing a commit). This may be desirable if you
necessary, e.g., when doing a commit). This may be desirable if you
are working offline or the network is slow.
@end ifnottex
@ -1307,7 +1307,7 @@ revision 1.2 has revision IDs 1.2.1.1, 1.2.1.2, @dots{}, the second
branch created from revision 1.2 has revision IDs 1.2.2.1, 1.2.2.2,
@dots{}, and so forth. You can also specify the @dfn{branch ID},
which is a branch revision ID omitting its final component
(e.g.@: 1.2.1), to switch to the latest revision on that branch.
(e.g., 1.2.1), to switch to the latest revision on that branch.
On a locking-based system, switching to a different branch also
unlocks (write-protects) the working tree.
@ -1589,7 +1589,7 @@ source files.
To produce a tags table, you run the @command{etags} shell command
on a document or the source code file. The @samp{etags} program
writes the tags to a @dfn{tags table file}, or @dfn{tags file} in
short. The conventional name for a tags file is @file{TAGS}.
short. The conventional name for a tags file is @file{TAGS}@.
@xref{Create Tags Table}.
Emacs provides many commands for searching and replacing using the
@ -1676,9 +1676,11 @@ specifies (using Bourne shell syntax) that the commands
@item
In Lisp code, any function defined with @code{defun}, any variable
defined with @code{defvar} or @code{defconst}, and in general the first
argument of any expression that starts with @samp{(def} in column zero is
a tag.
defined with @code{defvar} or @code{defconst}, and in general the
first argument of any expression that starts with @samp{(def} in
column zero is a tag. As an exception, expressions of the form
@code{(defvar @var{foo})} are treated as declarations, and are only
tagged if the @samp{--declarations} option is given.
@item
In Scheme code, tags include anything defined with @code{def} or with a
@ -1696,9 +1698,9 @@ tags. Use the @samp{--packages-only} option to create tags for
packages only.
In Ada, the same name can be used for different kinds of entity
(e.g.@:, for a procedure and for a function). Also, for things like
packages, procedures and functions, there is the spec (i.e.@: the
interface) and the body (i.e.@: the implementation). To make it
(e.g., for a procedure and for a function). Also, for things like
packages, procedures and functions, there is the spec (i.e., the
interface) and the body (i.e., the implementation). To make it
easier to pick the definition you want, Ada tag name have suffixes
indicating the type of entity:
@ -1766,11 +1768,11 @@ the file.
@item
In Perl code, the tags are the packages, subroutines and variables
defined by the @code{package}, @code{sub}, @code{my} and @code{local}
keywords. Use @samp{--globals} if you want to tag global variables.
Tags for subroutines are named @samp{@var{package}::@var{sub}}. The
name for subroutines defined in the default package is
@samp{main::@var{sub}}.
defined by the @code{package}, @code{sub}, @code{use constant},
@code{my}, and @code{local} keywords. Use @samp{--globals} if you
want to tag global variables. Tags for subroutines are named
@samp{@var{package}::@var{sub}}. The name for subroutines defined in
the default package is @samp{main::@var{sub}}.
@item
In PHP code, tags are functions, classes and defines. Vars are tags

View file

@ -1,6 +1,6 @@
#### -*- Makefile -*- for the Emacs Manual
# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# Copyright (C) 2003-2013 Free Software Foundation, Inc.
# This file is part of GNU Emacs.

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Mark
@chapter The Mark and the Region
@ -131,7 +131,7 @@ detailed description of these mouse commands.
@cindex shift-selection
Finally, you can set the mark by holding down the shift key while
typing certain cursor motion commands (such as @kbd{S-@key{right}},
@kbd{S-C-f}, @kbd{S-C-n}, etc.) This is called @dfn{shift-selection}.
@kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}.
It sets the mark at point before moving point, but only if there is no
active mark set via shift-selection. The mark set by mouse commands
and by shift-selection behaves slightly differently from the usual

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Minibuffer
@chapter The Minibuffer

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Miscellaneous Commands
@ -53,7 +53,7 @@ commands. The three most commonly-used Gnus buffers are the
@dfn{group buffer}, the @dfn{summary buffer} and the @dfn{article
buffer}.
The @dfn{group buffer} contains a list of article sources (e.g.@:
The @dfn{group buffer} contains a list of article sources (e.g.,
newsgroups and email inboxes), which are collectively referred to as
@dfn{groups}. This is the first buffer Gnus displays when it starts
up. It normally displays only the groups to which you subscribe and
@ -166,7 +166,7 @@ List zombie groups.
@cindex unsubscribe groups
@item u
Toggle the subscription status of the group on the current line
(i.e.@: turn a subscribed group into an unsubscribed group, or vice
(i.e., turn a subscribed group into an unsubscribed group, or vice
versa). Invoking this on a killed or zombie group turns it into an
unsubscribed group.
@ -518,7 +518,7 @@ output is long).
type @kbd{M-! gunzip foo.gz @key{RET}}. That shell command normally
creates the file @file{foo} and produces no terminal output.
A numeric argument to @code{shell-command}, e.g.@: @kbd{M-1 M-!},
A numeric argument to @code{shell-command}, e.g., @kbd{M-1 M-!},
causes it to insert terminal output into the current buffer instead of
a separate buffer. It puts point before the output, and sets the mark
after the output. For instance, @kbd{M-1 M-! gunzip < foo.gz
@ -599,7 +599,7 @@ the buffer and type the input, terminated by @key{RET}.
While the subshell is waiting or running a command, you can switch
windows or buffers and perform other editing in Emacs. Emacs inserts
the output from the subshell into the Shell buffer whenever it has
time to process it (e.g.@: while waiting for keyboard input).
time to process it (e.g., while waiting for keyboard input).
@cindex @code{comint-highlight-input} face
@cindex @code{comint-highlight-prompt} face
@ -610,7 +610,7 @@ easier to distinguish input lines from the shell output.
@xref{Faces}.
To make multiple subshells, invoke @kbd{M-x shell} with a prefix
argument (e.g. @kbd{C-u M-x shell}). Then the command will read a
argument (e.g., @kbd{C-u M-x shell}). Then the command will read a
buffer name, and create (or reuse) a subshell in that buffer. You can
also rename the @file{*shell*} buffer using @kbd{M-x rename-uniquely},
then create a new @file{*shell*} buffer using plain @kbd{M-x shell}.
@ -645,7 +645,7 @@ Coding}.
@cindex @env{EMACS} environment variable
Emacs sets the environment variable @env{INSIDE_EMACS} in the
subshell to @samp{@var{version},comint}, where @var{version} is the
Emacs version (e.g.@: @samp{24.1}). Programs can check this variable
Emacs version (e.g., @samp{24.1}). Programs can check this variable
to determine whether they are running inside an Emacs subshell. (It
also sets the @env{EMACS} environment variable to @code{t}, if that
environment variable is not already defined. However, this
@ -1307,7 +1307,7 @@ mode-line. Type @key{SPC} to display the next screenful of output, or
@cindex Rlogin
You can login to a remote computer, using whatever commands you
would from a regular terminal (e.g.@: using the @code{telnet} or
would from a regular terminal (e.g., using the @code{telnet} or
@code{rlogin} commands), from a Term window.
A program that asks you for a password will normally suppress
@ -1531,7 +1531,7 @@ precedence.
Create a new graphical @dfn{client frame}, instead of using an
existing Emacs frame. See below for the special behavior of @kbd{C-x
C-c} in a client frame. If Emacs cannot create a new graphical frame
(e.g.@: if it cannot connect to the X server), it tries to create a
(e.g., if it cannot connect to the X server), it tries to create a
text terminal client frame, as though you had supplied the @samp{-t}
option instead.
@ -1630,7 +1630,7 @@ frame. If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal})
in a client frame, that command does not kill the Emacs session as it
normally does (@pxref{Exiting}). Instead, Emacs deletes the client
frame; furthermore, if the client frame has an @command{emacsclient}
waiting to regain control (i.e.@: if you did not supply the @samp{-n}
waiting to regain control (i.e., if you did not supply the @samp{-n}
option), Emacs deletes all other frames of the same client, and marks
the client's server buffers as finished, as though you had typed
@kbd{C-x #} in all of them. If it so happens that there are no
@ -1689,7 +1689,7 @@ for printing by calling the @command{lpr} program. To change the
printer program, customize the variable @code{lpr-command}. To
specify extra switches to give the printer program, customize the list
variable @code{lpr-switches}. Its value should be a list of option
strings, each of which should start with @samp{-} (e.g.@: the option
strings, each of which should start with @samp{-} (e.g., the option
string @code{"-w80"} specifies a line width of 80 columns). The
default is the empty list, @code{nil}.
@ -2180,7 +2180,7 @@ commands to perform arbitrary editing while in the middle of another
Emacs command. For example, when you type @kbd{C-r} inside of a
@code{query-replace}, you enter a recursive edit in which you can change
the current buffer. On exiting from the recursive edit, you go back to
the @code{query-replace}.
the @code{query-replace}. @xref{Query Replace}.
@kindex C-M-c
@findex exit-recursive-edit
@ -2404,7 +2404,7 @@ done by calling @code{browse-url} as a subroutine
It can be useful to add @code{goto-address-mode} to mode hooks and
hooks for displaying an incoming message
(e.g.@: @code{rmail-show-message-hook} for Rmail, and
(e.g., @code{rmail-show-message-hook} for Rmail, and
@code{mh-show-mode-hook} for MH-E). This is not needed for Gnus,
which has a similar feature of its own.
@ -2487,7 +2487,7 @@ find the one you select (@code{ffap-menu}).
@findex animate-birthday-present
@cindex animate
The @code{animate} package makes text dance (e.g. @kbd{M-x
The @code{animate} package makes text dance (e.g., @kbd{M-x
animate-birthday-present}).
@findex blackbox

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Modes
@chapter Major and Minor Modes
@ -69,7 +69,7 @@ command to select that mode (e.g., @kbd{M-x lisp-mode} enters Lisp mode).
@vindex major-mode
The value of the buffer-local variable @code{major-mode} is a symbol
with the same name as the major mode command (e.g. @code{lisp-mode}).
with the same name as the major mode command (e.g., @code{lisp-mode}).
This variable is set automatically; you should not change it yourself.
The default value of @code{major-mode} determines the major mode to
@ -110,7 +110,7 @@ list of its key bindings, type @code{C-h m} (@code{describe-mode}).
Every major mode, apart from Fundamental mode, defines a @dfn{mode
hook}, a customizable list of Lisp functions to run each time the mode
is enabled in a buffer. @xref{Hooks}, for more information about
hooks. Each mode hook is named after its major mode, e.g. Fortran
hooks. Each mode hook is named after its major mode, e.g., Fortran
mode has @code{fortran-mode-hook}. Furthermore, all text-based major
modes run @code{text-mode-hook}, and all programming language modes
run @code{prog-mode-hook}, prior to running their own mode hooks.

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c Copyright (C) 2004-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the
@ -52,7 +52,7 @@ about Emacs's special handling of text files under MS-DOS (and Windows).
@kindex BS @r{(MS-DOS)}
The key that is called @key{DEL} in Emacs (because that's how it is
designated on most workstations) is known as @key{BS} (backspace) on a
PC. That is why the PC-specific terminal initialization remaps the
PC@. That is why the PC-specific terminal initialization remaps the
@key{BS} key to act as @key{DEL}; the @key{DELETE} key is remapped to act
as @kbd{C-d} for the same reasons.
@ -233,7 +233,7 @@ The MS-DOS terminal doesn't support a vertical-bar cursor,
so the bar cursor is horizontal, and the @code{@var{width}} parameter,
if specified by the frame parameters, actually determines its height.
For this reason, the @code{bar} and @code{hbar} cursor types produce
the same effect on MS-DOS. As an extension, the bar cursor
the same effect on MS-DOS@. As an extension, the bar cursor
specification can include the starting scan line of the cursor as well
as its width, like this:
@ -320,7 +320,7 @@ converts them to underscores @samp{_}; thus your default init file
@ifnottex
(@pxref{Init File})
@end ifnottex
is called @file{_emacs} on MS-DOS. Excess characters before or after
is called @file{_emacs} on MS-DOS@. Excess characters before or after
the period are generally ignored by MS-DOS itself; thus, if you visit
the file @file{LongFileName.EvenLongerExtension}, you will silently
get @file{longfile.eve}, but Emacs will still display the long file
@ -552,7 +552,7 @@ when invoked with the @samp{-nw} option.
asynchronous subprocesses are not available. In particular, Shell
mode and its variants do not work. Most Emacs features that use
asynchronous subprocesses also don't work on MS-DOS, including
Shell mode and GUD. When in doubt, try and see; commands that
Shell mode and GUD@. When in doubt, try and see; commands that
don't work output an error message saying that asynchronous processes
aren't supported.
@ -600,7 +600,7 @@ it, because MS-DOS provides no general way to terminate a process.
Pressing @kbd{C-c} or @kbd{C-@key{BREAK}} might sometimes help in these
cases.
Accessing files on other machines is not supported on MS-DOS. Other
Accessing files on other machines is not supported on MS-DOS@. Other
network-oriented commands such as sending mail, Web browsing, remote
login, etc., don't work either, unless network access is built into
MS-DOS with some network redirector.

View file

@ -1,6 +1,6 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Microsoft Windows
@appendix Emacs and Microsoft Windows/MS-DOS
@ -218,29 +218,6 @@ set conversion, only end-of-line conversion. Essentially, it directs
Emacs to create new files with the Unix-style convention of using
newline at the end of a line. @xref{Coding Systems}.
@vindex file-name-buffer-file-type-alist
@cindex binary files, on MS-DOS/MS-Windows
Some kinds of files should not be converted at all, because their
contents are not really text. Therefore, Emacs on MS-Windows distinguishes
certain files as @dfn{binary files}. (This distinction is not part of
MS-Windows; it is made by Emacs only.) Binary files include executable
programs, compressed archives, etc. Emacs uses the file name to decide
whether to treat a file as binary: the variable
@code{file-name-buffer-file-type-alist} defines the file-name patterns
that indicate binary files. If a file name matches one of the patterns
for binary files (those whose associations are of the type
@code{(@var{pattern} . t)}, Emacs reads and writes that file using the
@code{no-conversion} coding system (@pxref{Coding Systems}) which turns
off @emph{all} coding-system conversions, not only the EOL conversion.
@code{file-name-buffer-file-type-alist} also includes file-name patterns
for files which are known to be Windows-style text files with
carriage-return linefeed EOL format, such as @file{CONFIG.SYS}; Emacs
always writes those files with Windows-style EOLs.
If a file that belongs to an untranslated file system matches one of
the file-name patterns in @code{file-name-buffer-file-type-alist}, the
EOL conversion is determined by @code{file-name-buffer-file-type-alist}.
@node Windows Files
@section File Names on MS-Windows
@cindex file names on MS-Windows
@ -334,7 +311,7 @@ names that are associated with (a.k.a.@: @dfn{links to}) the file's
data; this is only useful on NTFS volumes. @code{uid} means display
the numerical identifier of the user who owns the file. @code{gid}
means display the numerical identifier of the file owner's group. The
default value is @code{(links uid gid)} i.e.@: all the 3 optional
default value is @code{(links uid gid)} i.e., all the 3 optional
attributes are displayed.
@vindex ls-lisp-emulation
@ -354,12 +331,12 @@ Emulate @sc{gnu} systems; this is the default. This sets
Emulate Unix systems. Like @code{GNU}, but sets
@code{ls-lisp-verbosity} to @code{(links uid)}.
@item MacOS
Emulate MacOS. Sets @code{ls-lisp-ignore-case} to @code{t}, and
Emulate MacOS@. Sets @code{ls-lisp-ignore-case} to @code{t}, and
@code{ls-lisp-dirs-first} and @code{ls-lisp-verbosity} to @code{nil}.
@item MS-Windows
Emulate MS-Windows. Sets @code{ls-lisp-ignore-case} and
@code{ls-lisp-dirs-first} to @code{t}, and @code{ls-lisp-verbosity} to
@code{(links)} on Windows NT/2K/XP/2K3 and to @code{nil} on Windows 9X.
@code{(links)} on Windows NT/2K/XP/2K3 and to @code{nil} on Windows 9X@.
Note that the default emulation is @emph{not} @code{MS-Windows}, even
on Windows, since many users of Emacs on those platforms prefer the
@sc{gnu} defaults.
@ -422,7 +399,7 @@ Settings\@var{username}\Application Data} on Windows 2000/XP/2K3,
@file{C:\Users\@var{username}\AppData\Roaming} on Windows
Vista/7/2008, and either @file{C:\WINDOWS\Application Data} or
@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on Windows
9X/ME. If this directory does not exist or cannot be accessed, Emacs
9X/ME@. If this directory does not exist or cannot be accessed, Emacs
falls back to @file{C:\} as the default value of @code{HOME}.
You can override this default value of @code{HOME} by explicitly
@ -690,7 +667,7 @@ If you can go to the first subprocess, and tell it to exit, the second
subprocess should continue normally. However, if the second subprocess
is synchronous, Emacs itself will be hung until the first subprocess
finishes. If it will not finish without user input, then you have no
choice but to reboot if you are running on Windows 9X. If you are
choice but to reboot if you are running on Windows 9X@. If you are
running on Windows NT/2K/XP, you can use a process viewer application to kill
the appropriate instance of NTVDM instead (this will terminate both DOS
subprocesses).
@ -714,7 +691,7 @@ character based on the type of the program.
customized commands that run MS-Windows applications registered to
handle a certain standard Windows operation for a specific type of
document or file. This function is a wrapper around the Windows
@code{ShellExecute} API. See the MS-Windows API documentation for
@code{ShellExecute} API@. See the MS-Windows API documentation for
more details.
@end ifnottex

View file

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc.
@c Copyright (C) 1997, 1999-2013 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node International
@chapter International Character Set Support
@ -994,7 +994,7 @@ decoding. (You can still use an unsuitable coding system if you enter
its name at the prompt.)
@c It seems that select-message-coding-system does this.
@c Both sendmail.el and smptmail.el call it; i.e. smtpmail.el still
@c Both sendmail.el and smptmail.el call it; i.e., smtpmail.el still
@c obeys sendmail-coding-system.
@vindex sendmail-coding-system
When you send a mail message (@pxref{Sending Mail}),
@ -1039,7 +1039,7 @@ decoding it using coding system @var{right} instead.
@findex set-buffer-file-coding-system
The command @kbd{C-x @key{RET} f}
(@code{set-buffer-file-coding-system}) sets the file coding system for
the current buffer (i.e.@: the coding system to use when saving or
the current buffer (i.e., the coding system to use when saving or
reverting the file). You specify which coding system using the
minibuffer. You can also invoke this command by clicking with
@kbd{Mouse-3} on the coding system indicator in the mode line
@ -1323,7 +1323,7 @@ scripts.@footnote{If you run Emacs on X, you may need to inform the X
server about the location of the newly installed fonts with commands
such as:
@c FIXME? I feel like this may be out of date.
@c Eg the intlfonts tarfile is ~ 10 years old.
@c E.g., the intlfonts tarfile is ~ 10 years old.
@example
xset fp+ /usr/local/share/emacs/fonts
@ -1569,7 +1569,7 @@ no font appear as a hollow box.
If you use Latin-1 characters but your terminal can't display
Latin-1, you can arrange to display mnemonic @acronym{ASCII} sequences
instead, e.g.@: @samp{"o} for o-umlaut. Load the library
instead, e.g., @samp{"o} for o-umlaut. Load the library
@file{iso-ascii} to do this.
@vindex latin1-display
@ -1591,7 +1591,7 @@ the range 0240 to 0377 octal (160 to 255 decimal) to handle the
accented letters and punctuation needed by various European languages
(and some non-European ones). Note that Emacs considers bytes with
codes in this range as raw bytes, not as characters, even in a unibyte
buffer, i.e.@: if you disable multibyte characters. However, Emacs
buffer, i.e., if you disable multibyte characters. However, Emacs
can still handle these character codes as if they belonged to
@emph{one} of the single-byte character sets at a time. To specify
@emph{which} of these codes to use, invoke @kbd{M-x
@ -1767,7 +1767,7 @@ directionality when they are displayed. The default value is
Each paragraph of bidirectional text can have its own @dfn{base
direction}, either right-to-left or left-to-right. (Paragraph
@c paragraph-separate etc have no influence on this?
boundaries are empty lines, i.e.@: lines consisting entirely of
boundaries are empty lines, i.e., lines consisting entirely of
whitespace characters.) Text in left-to-right paragraphs begins on
the screen at the left margin of the window and is truncated or
continued when it reaches the right margin. By contrast, text in

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