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

manual upstream merge

Browse source
This commit is contained in:
Joakim Verona 2014-06-23 09:41:17 +02:00
commit c4916d541b
343 changed files with 60729 additions and 8413 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

152
ChangeLog
View file

@ -1,3 +1,153 @@
2014-06-21 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac: Warn about --enable-link-time-optimization's issues
in --help message (Bug#17806).
Port to GCC 4.9.0 with link time optimization (Bug#17806).
* configure.ac (CFLAGS): With link time optimization,
use -ffat-lto-objects if supported; otherwise Emacs won't
build with GCC 4.9.0.
2014-06-20 Paul Eggert <eggert@cs.ucla.edu>
Diagnose failures due to colons in directory names (Bug#17278).
* Makefile.in (epaths-force): Don't allow ':' in directories whose
names go into a colon-separated path.
* configure.ac: Fail if submake fails.
2014-06-17 Paul Eggert <eggert@cs.ucla.edu>
Omit redundant extern decls.
Most of this patch is from Dmitry Antipov, in:
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00263.html
* configure.ac (WERROR_CFLAGS): Add -Wredundant-decls.
Merge from gnulib, incorporating:
2014-06-17 acl: port to gcc -Wredundant-decls
2014-06-01 gnulib-common.m4: Fix typo in _GL_UNUSED_LABEL.
* lib/acl.h, m4/gnulib-common.m4: Update from gnulib.
2014-06-15 Glenn Morris <rgm@gnu.org>
* Makefile.in: Use `make -C' rather than `cd && make' throughout.
* Makefile.in: Parallelize clean rules using GNU make features.
(submake_template): New definition.
(mostlyclean_dirs, clean_dirs, distclean_dirs, maintainer_clean_dirs):
New variables.
(mostlyclean, clean, distclean, bootstrap-clean, maintainer-clean)
(extraclean): Define using each subdirectory as a prequisite.
* lib/Makefile.am (bootstrap-clean): New.
2014-06-15 Paul Eggert <eggert@cs.ucla.edu>
Port part of the AIX fix to Solaris (Bug#17598).
* configure.ac (_REENTRANT): Define on Solaris if HAVE_PTHREAD.
This ports part of the recent AIX fixes to Solaris. It is needed
for the same reason that _THREAD_SAFE is needed on AIX, e.g., to
make sure that each thread has its own 'errno'.
2014-06-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-11 Paul Eggert <eggert@cs.ucla.edu>
Use a shell function in configure.ac to cut down on code duplication.
* configure.ac (emacs_check_gnu_make): New shell function.
Use it to avoid duplication when checking for GNU Make.
It's OK for 'configure' to use shell functions these days,
as long as we follow the advice in the 'Shell Functions'
section of the Autoconf manual.
2014-06-11 Glenn Morris <rgm@gnu.org>
* configure.ac: Require at least version 3.81 of GNU make.
2014-06-10 Paul Eggert <eggert@cs.ucla.edu>
Rely on AC_CANONICAL_HOST to detect whether we're using mingw.
See the thread containing:
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00206.html
* configure.ac (AC_CANONICAL_HOST): Invoke this as early as we
can, which is just after AM_INIT_AUTOMAKE. Then check for mingw
just after that.
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL):
New, set by configure. Use throughout where appropriate.
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
* configure.ac (INFO_EXT, INFO_OPTS): Remove output variables.
2014-06-08 Paul Eggert <eggert@cs.ucla.edu>
Port better to AIX (Bug#17598).
* configure.ac (with_xpm_set): New shell var.
(_THREAD_SAFE): Define on AIX if HAVE_PTHREAD.
(with_xpm): Default to 'no' on AIX.
(LIBXPM): Append -lXpm if -lXaw is also used, as the latter
requires the former on AIX.
2014-06-05 Paul Eggert <eggert@cs.ucla.edu>
Try harder to find GNU Make when configuring.
* configure.ac (AC_PROG_MAKE_SET): Define a dummy.
(MAKE): Set it to GNU Make, if one can be found.
Search PATH for 'make', 'gmake', 'gnumake'.
This works better on platforms like AIX, where GNU Make
might be in /opt/freeware/bin/make, and reside
behind /usr/bin/make in the PATH.
2014-06-05 Dmitry Antipov <dmantipov@yandex.ru>
* configure.ac (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM.
* INSTALL: Mention SVG image support.
2014-06-05 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac: --without-all now implies --without-xft, --disable-acl.
* INSTALL: Remove apparently unmaintained documentation about what
--without-all exactly means.
2014-06-03 Eli Zaretskii <eliz@gnu.org>
* configure.ac (C_HEAP_SWITCH): Remove.
2014-06-02 Paul Eggert <eggert@cs.ucla.edu>
Fix port to 32-bit AIX with xlc (Bug#17598).
This doesn't fix Bug#17598, but it does fix a regression since Emacs
built with xlc until recently, and perhaps it'll help us fix Bug#17598.
* configure.ac (GC_SETJMP_WORKS): Define for AIX, too.
Merge from gnulib, incorporating:
2014-05-30 ftoastr: work around compiler bug in IBM xlc 12.1
* lib/ftoastr.c: Update from gnulib.
2014-06-01 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2014-06-02 acl: apply pure attribute to two functions
2014-06-01 gnulib-common.m4: add _GL_UNUSED_LABEL
2014-05-31 dup2, fcntl, fcntl-h: port to AIX 7.1
2014-05-30 ftoastr: work around compiler bug in IBM xlc 12.1
* lib/acl-internal.h, lib/fcntl.in.h, lib/ftoastr.h:
* m4/dup2.m4, m4/fcntl.m4, m4/gnulib-common.m4:
Update from gnulib.
2014-06-01 Juanma Barranquero <lekktu@gmail.com>
* configure.ac (C_HEAP_SWITCH): Raise HEAPSIZE value for 32-bit
builds on Windows.
2014-05-29 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (pthread_sigmask): Look in LIB_PTHREAD too (Bug#17561).
@ -23,7 +173,7 @@
2014-05-27 Fabrice Popineau <fabrice.popineau@gmail.com>
* configure.ac (C_HEAP_SWITCH) define for different values of
* configure.ac (C_HEAP_SWITCH): Define for different values of
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.

19
INSTALL
View file

@ -169,6 +169,7 @@ X11 is being used.
X libjpeg for JPEG: http://www.ijg.org/
X libtiff for TIFF: http://www.remotesensing.org/libtiff/
X libgif for GIF: http://sourceforge.net/projects/giflib/
librsvg2 for SVG: http://wiki.gnome.org/action/show/Projects/LibRsvg
If you supply the appropriate --without-LIB option, 'configure' will
omit the corresponding library from Emacs, even if that makes for a
@ -293,6 +294,7 @@ or more of these options:
--without-tiff for TIFF image support
--without-gif for GIF image support
--without-png for PNG image support
--without-rsvg for SVG image support
Use --without-toolkit-scroll-bars to disable Motif or Xaw3d scroll bars.
@ -304,22 +306,17 @@ systems which support that.
Use --without-sound to disable sound support.
Use --without-all if you want to build a small executable with the minimal
dependencies on external libraries, at the cost of disabling most of the
features that are normally enabled by default. Using --without-all is
equivalent to --without-sound --without-dbus --without-libotf
--without-selinux --without-xft --without-gsettings --without-gnutls
--without-rsvg --without-xml2 --without-gconf --without-imagemagick
--without-m17n-flt --without-jpeg --without-tiff --without-gif
--without-png --without-gpm --without-file-notification. Note that
--without-all leaves X support enabled, and using the GTK2 or GTK3
Use --without-all for a smaller executable with fewer dependencies on
external libraries, at the cost of disabling many features. Although
--without-all disables libraries not needed for ordinary Emacs
operation, it does enable X support, and using the GTK2 or GTK3
toolkit creates a lot of library dependencies. So if you want to
build a small executable with very basic X support, use --without-all
--with-x-toolkit=no. For the smallest possible executable without X,
use --without-all --without-x. If you want to build with just a few
features enabled, you can combine --without-all with --with-FEATURE.
For example, you can use --without-all --with-dbus to build with DBus
support and nothing more.
For example, you can use --without-all --without-x --with-dbus to
build with DBus support and nothing more.
Use --with-wide-int to implement Emacs values with the type 'long long',
even on hosts where a narrower type would do. With this option, on a

200
Makefile.in
View file

@ -76,10 +76,11 @@ QUIET_SUBMAKE = MAKELEVEL=0
cache_file = @cache_file@
CONFIGURE_FLAGS = --cache-file=$(cache_file)
CC=@CC@
CFLAGS=@CFLAGS@
LDFLAGS=@LDFLAGS@
CPPFLAGS=@CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
ACLOCAL = @ACLOCAL@
EXEEXT=@EXEEXT@
### These help us choose version- and architecture-specific directories
@ -146,8 +147,7 @@ man1dir=$(mandir)/man1
# Where to install and expect the info files describing Emacs.
infodir=@infodir@
# Info files not in the doc/misc directory (we get those via make echo-info).
INFO_EXT=@INFO_EXT@
INFO_NONMISC=emacs$(INFO_EXT) eintr$(INFO_EXT) elisp$(INFO_EXT)
INFO_NONMISC=emacs.info eintr.info elisp.info
# If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
HAVE_MAKEINFO=@HAVE_MAKEINFO@
@ -166,8 +166,6 @@ bitmapdir=@bitmapdir@
# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
srcdir=@srcdir@
abs_srcdir=@abs_srcdir@
# MinGW CPPFLAGS may use this.
abs_top_srcdir=@abs_top_srcdir@
# Where the manpage source files are kept.
mansrcdir=$(srcdir)/doc/man
@ -299,6 +297,14 @@ removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g'
# to just letting configure generate epaths.h from epaths.in in a
# similar way to how Makefile is made from Makefile.in.
epaths-force:
@for dir in '$(abs_srcdir)' '$(lispdir)' '$(archlibdir)'; do \
case $$dir in \
*:*) \
echo >&2 "Build or installation directory '$$dir'"; \
echo >&2 "cannot contain ':'."; \
exit 1;; \
esac; \
done
@(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \
locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \
buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \
@ -360,9 +366,7 @@ lisp: src
# These targets should be "${SUBDIR} without `src'".
lib lib-src lisp nt: Makefile
cd $@ && $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
$(MAKE) -C $@ all
# Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which
# is either set to bootstrap-emacs (in case bootstrap-emacs has not been
@ -385,14 +389,10 @@ src: Makefile
cd $@ || exit; \
boot=bootstrap-emacs$(EXEEXT); \
[ ! -x "$$boot" ] || boot=''; \
$(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \
VCSWITNESS="$$vcswitness"
$(MAKE) all BOOTSTRAPEMACS="$$boot" VCSWITNESS="$$vcswitness"
blessmail: Makefile src
cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \
MAKE='${MAKE}' archlibdir='$(archlibdir)'
$(MAKE) -C lib-src maybe-blessmail
# We used to have one rule per */Makefile.in, but that leads to race
# conditions with parallel makes, so let's assume that the time stamp on
@ -423,17 +423,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
$(srcdir)/configure: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoconf
cd ${srcdir} && ${AUTOCONF}
ACLOCAL_PATH = @ACLOCAL_PATH@
ACLOCAL_INPUTS = $(srcdir)/configure.ac $(srcdir)/m4/gnulib-comp.m4
$(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' aclocal -I m4
cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' $(ACLOCAL) -I m4
AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \
$(srcdir)/lib/gnulib.mk
$(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
cd $(srcdir) && automake --gnu -a -c lib/Makefile
cd $(srcdir) && $(AUTOMAKE) --gnu -a -c lib/Makefile
# Regenerate files that this makefile would have made, if this makefile
# had been built by Automake. The name 'am--refresh' is for
@ -446,9 +446,9 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@ # because stamp-h.in has changed (since building stamp-h.in
@ # refreshes config.in as well), but if config.in is missing
@ # then we really need to do something more.
[ -r "$@" ] || ( cd ${srcdir} && autoheader )
[ -r "$@" ] || ( cd ${srcdir} && ${AUTOHEADER} )
$(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoheader
cd ${srcdir} && ${AUTOHEADER}
rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in
@ -485,11 +485,7 @@ write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \
### Lisp files and DOC file to work properly.
install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
cd lib-src && \
$(MAKE) install $(MFLAGS) prefix="${prefix}" \
exec_prefix="${exec_prefix}" bindir="${bindir}" \
libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
INSTALL_STRIP=${INSTALL_STRIP}
$(MAKE) -C lib-src install
if test "${ns_self_contained}" = "no"; then \
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \
@ -507,12 +503,7 @@ install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
### in nt/, and its Posix do-nothing shadow.
install-:
install-nt:
cd $(NTDIR) && \
$(MAKE) install $(MFLAGS) prefix="${prefix}" \
exec_prefix="${exec_prefix}" bindir="${bindir}" \
libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
datadir="${datadir}" \
INSTALL_STRIP=${INSTALL_STRIP}
$(MAKE) -C $(NTDIR) install
## In the share directory, we are deleting:
## applications (with emacs.desktop, also found in etc/)
@ -658,7 +649,7 @@ install-info: info
[ -f "$(DESTDIR)${infodir}/dir" ] || \
[ ! -f ${srcdir}/info/dir ] || \
${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir"; \
info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
info_misc=`$(QUIET_SUBMAKE) $(MAKE) -s -C doc/misc echo-info`; \
cd ${srcdir}/info ; \
for elt in ${INFO_NONMISC} $${info_misc}; do \
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@ -725,19 +716,14 @@ install-etc:
### Build Emacs and install it, stripping binaries while installing them.
install-strip:
$(MAKE) $(MFLAGS) INSTALL_STRIP=-s install
$(MAKE) INSTALL_STRIP=-s install
### Delete all the installed files that the `install' target would
### create (but not the noninstalled files such as `make all' would create).
###
### Don't delete the lisp and etc directories if they're in the source tree.
uninstall: uninstall-$(NTDIR) uninstall-doc
cd lib-src && \
$(MAKE) $(MFLAGS) uninstall \
prefix="${prefix}" exec_prefix="${exec_prefix}" \
bindir="${bindir}" libexecdir="${libexecdir}" \
archlibdir="${archlibdir}"
$(MAKE) -C lib-src uninstall
-unset CDPATH; \
for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \
if [ -d "$${dir}" ]; then \
@ -754,7 +740,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
done
-rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
thisdir=`/bin/pwd`; \
(info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
(info_misc=`$(QUIET_SUBMAKE) $(MAKE) -s -C doc/misc echo-info`; \
if cd "$(DESTDIR)${infodir}"; then \
for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd "$${thisdir}"; \
@ -786,32 +772,33 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
### in nt/, and its Posix do-nothing shadow.
uninstall-:
uninstall-nt:
cd $(NTDIR) && \
$(MAKE) $(MFLAGS) uninstall \
prefix="${prefix}" exec_prefix="${exec_prefix}" \
bindir="${bindir}" libexecdir="${libexecdir}" \
archlibdir="${archlibdir}"
$(MAKE) -C $(NTDIR) uninstall
# ==================== Cleaning up and miscellanea ====================
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean
## Eg:
## src_clean:
## make -C src clean
define submake_template
.PHONY: $(1)_$(2)
$(1)_$(2):
$$(MAKE) -C $(1) $(2)
endef
### `mostlyclean'
### Like `clean', but may refrain from deleting a few files that people
### normally don't want to recompile. For example, the `mostlyclean'
### target for GCC does not delete `libgcc.a', because recompiling it
### is rarely necessary and takes a lot of time.
mostlyclean:
cd src && $(MAKE) $(MFLAGS) mostlyclean
cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean
cd lwlib && $(MAKE) $(MFLAGS) mostlyclean
cd lib && $(MAKE) $(MFLAGS) mostlyclean
cd lib-src && $(MAKE) $(MFLAGS) mostlyclean
cd nt && $(MAKE) $(MFLAGS) mostlyclean
-cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean
-cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean
-cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean
-cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean
mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/emacs doc/misc \
doc/lispref doc/lispintro
$(foreach dir,$(mostlyclean_dirs),$(eval $(call submake_template,$(dir),mostlyclean)))
mostlyclean: $(mostlyclean_dirs:=_mostlyclean)
### `clean'
### Delete all files from the current directory that are normally
@ -821,24 +808,18 @@ mostlyclean:
### with them.
###
### Delete `.dvi' files here if they are not part of the distribution.
clean:
clean_dirs = $(mostlyclean_dirs) nextstep
$(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean)))
clean: $(clean_dirs:=_clean)
-rm -f etc/emacs.tmpdesktop
cd src && $(MAKE) $(MFLAGS) clean
cd oldXMenu && $(MAKE) $(MFLAGS) clean
cd lwlib && $(MAKE) $(MFLAGS) clean
cd lib && $(MAKE) $(MFLAGS) clean
cd lib-src && $(MAKE) $(MFLAGS) clean
cd nt && $(MAKE) $(MFLAGS) clean
-cd doc/emacs && $(MAKE) $(MFLAGS) clean
-cd doc/misc && $(MAKE) $(MFLAGS) clean
-cd doc/lispref && $(MAKE) $(MFLAGS) clean
-cd doc/lispintro && $(MAKE) $(MFLAGS) clean
cd nextstep && $(MAKE) $(MFLAGS) clean
### `bootclean'
### Delete all files that need to be remade for a clean bootstrap.
top_bootclean=\
rm -f config.cache config.log
### `distclean'
### Delete all files from the current directory that are created by
### configuring or building the program. If you have unpacked the
@ -848,44 +829,25 @@ top_bootclean=\
top_distclean=\
${top_bootclean}; \
rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
distclean:
cd src && $(MAKE) $(MFLAGS) distclean
cd oldXMenu && $(MAKE) $(MFLAGS) distclean
cd lwlib && $(MAKE) $(MFLAGS) distclean
cd lib && $(MAKE) $(MFLAGS) distclean
cd lib-src && $(MAKE) $(MFLAGS) distclean
cd nt && $(MAKE) $(MFLAGS) distclean
cd doc/emacs && $(MAKE) $(MFLAGS) distclean
cd doc/misc && $(MAKE) $(MFLAGS) distclean
cd doc/lispref && $(MAKE) $(MFLAGS) distclean
cd doc/lispintro && $(MAKE) $(MFLAGS) distclean
cd leim && $(MAKE) $(MFLAGS) distclean
cd lisp && $(MAKE) $(MFLAGS) distclean
cd nextstep && $(MAKE) $(MFLAGS) distclean
distclean_dirs = $(clean_dirs) leim lisp
$(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),distclean)))
distclean: $(distclean_dirs:=_distclean)
for dir in test/automated admin/grammars admin/unidata; do \
[ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) distclean); \
[ ! -d $$dir ] || $(MAKE) -C $$dir distclean; \
done
${top_distclean}
### `bootstrap-clean'
### Delete everything that can be reconstructed by `make' and that
### needs to be deleted in order to force a bootstrap from a clean state.
bootstrap-clean:
cd src && $(MAKE) $(MFLAGS) bootstrap-clean
cd oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean
cd lwlib && $(MAKE) $(MFLAGS) maintainer-clean
cd lib && $(MAKE) $(MFLAGS) maintainer-clean
cd lib-src && $(MAKE) $(MFLAGS) maintainer-clean
cd nt && $(MAKE) $(MFLAGS) maintainer-clean
-cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean
-cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean
-cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean
-cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean
cd leim && $(MAKE) $(MFLAGS) bootstrap-clean
cd lisp && $(MAKE) $(MFLAGS) bootstrap-clean
cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean
$(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean)))
bootstrap-clean: $(distclean_dirs:=_bootstrap-clean)
for dir in test/automated admin/grammars admin/unidata; do \
[ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) bootstrap-clean); \
[ ! -d $$dir ] || $(MAKE) -C $$dir bootstrap-clean; \
done
[ ! -f config.log ] || mv -f config.log config.log~
rm -rf ${srcdir}/info
@ -905,12 +867,14 @@ bootstrap-clean:
top_maintainer_clean=\
${top_distclean}; \
rm -fr autom4te.cache
maintainer-clean: bootstrap-clean
cd src && $(MAKE) $(MFLAGS) maintainer-clean
cd leim && $(MAKE) $(MFLAGS) maintainer-clean
cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
maintainer_clean_dirs = src leim lisp
$(foreach dir,$(maintainer_clean_dirs),$(eval $(call submake_template,$(dir),maintainer-clean)))
maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean)
for dir in test/automated admin/grammars admin/unidata; do \
[ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) maintainer-clean); \
[ ! -d $$dir ] || $(MAKE) -C $$dir maintainer-clean; \
done
${top_maintainer_clean}
@ -918,8 +882,12 @@ maintainer-clean: bootstrap-clean
### says GCC supports it, and that's where the configuration part of
### the coding standards seem to come from. It's like distclean, but
### it deletes backup and autosave files too.
extraclean:
for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done
### Note that we abuse this in some subdirectories (eg leim),
### to delete some generated files that are slow to rebuild.
$(foreach dir,$(SUBDIR),$(eval $(call submake_template,$(dir),extraclean)))
## FIXME this is busted because most of these do not have extraclean rules.
extraclean: $(SUBDIR:=_extraclean)
${top_maintainer_clean}
-rm -f config-tmp-*
-rm -f *~ \#*
@ -928,14 +896,14 @@ extraclean:
# even when the build directory and source dir are different.
.PHONY: TAGS tags
TAGS tags: lib lib-src src
cd src; $(MAKE) $(MFLAGS) tags
$(MAKE) -C src tags
check: all
@if test ! -d test/automated; then \
echo "You do not seem to have the test/ directory."; \
echo "Maybe you are using a release tarfile, rather than a repository checkout."; \
else \
cd test/automated && $(MAKE) $(MFLAGS) check; \
$(MAKE) -C test/automated check; \
fi
dist:
@ -949,7 +917,7 @@ PSS = lispref-ps lispintro-ps emacs-ps misc-ps
DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
$(DOCS):
t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2
t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$1 $$2
.PHONY: $(DOCS) docs pdf ps
.PHONY: info dvi dist check html info-real info-dir check-info
@ -998,7 +966,7 @@ INSTALL_DOC = $(INSTALL_DVI) $(INSTALL_HTML) $(INSTALL_PDF) $(INSTALL_PS)
## Install non .info forms of the documentation.
## TODO add etc/refcards.
$(INSTALL_DOC):
t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $(MFLAGS) $$1-$$3
t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$2 $$1-$$3
.PHONY: $(INSTALL_DOC) install-doc
.PHONY: install-dvi install-html install-pdf install-ps
@ -1021,7 +989,7 @@ UNINSTALL_PS = uninstall-emacs-ps uninstall-lispref-ps \
UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF) $(UNINSTALL_PS)
$(UNINSTALL_DOC):
t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $(MFLAGS) $$1-$$3
t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$2 $$1-$$3
.PHONY: $(UNINSTALL_DOC) uninstall-doc
.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
@ -1048,7 +1016,7 @@ info:
@if test "$(HAVE_MAKEINFO)" = "no"; then \
echo "Configured --without-makeinfo, not building manuals" ; \
else \
$(MAKE) $(MFLAGS) info-real info-dir; \
$(MAKE) info-real info-dir; \
fi
## build-aux/make-info-dir expects only certain dircategories.
@ -1088,8 +1056,8 @@ check-info: info
# * Do the actual build.
bootstrap: bootstrap-clean
cd $(srcdir) && ./autogen.sh
$(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile
$(MAKE) $(MFLAGS) all
$(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile
$(MAKE) all
.PHONY: check-declare
@ -1098,4 +1066,4 @@ check-declare:
echo "You must build Emacs to use this command"; \
exit 1; \
fi
cd lisp && $(MAKE) $(MFLAGS) $@
$(MAKE) -C lisp $@

30
admin/ChangeLog
View file

@ -1,3 +1,33 @@
2014-06-21 Glenn Morris <rgm@gnu.org>
* unidata/BidiMirroring.txt: Update to 7.0.0 (only comment changes).
* unidata/UnicodeData.txt: Update to 7.0.0.
* unidata/IVD_Sequences.txt: Update to 2014-05-16 version.
2014-06-21 Stephen Berman <Stephen.Berman@gmx.net>
* notes/elpa: Use "git" instead of "bzr" in the name of machine to
clone the repository from.
2014-06-13 Glenn Morris <rgm@gnu.org>
* unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-02 Paul Eggert <eggert@cs.ucla.edu>
Include sources used to create macuvs.h.
* unidata/IVD_Sequences.txt: New file.
* unidata/Makefile.in (${top_srcdir}/src/macuvs.h): New rule.
(all): Build it.
(extraclean): Remove it.
* unidata/README: Mention BidiMirroring.txt and IVD_Sequences.txt.
* unidata/copyright.html: Update to current version from Unicode
Consortium.
* unidata/uvs.el: Rename from ../mac/uvs.el.
(uvs-print-table-ivd): Output a header in the form that
unidata-gen.el generates.
2014-05-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* mac/uvs.el: New file from Mac port. Generates src/macuvs.h.

8
admin/FOR-RELEASE
View file

@ -2,13 +2,19 @@ Tasks needed before the next release.
* TO BE DONE SHORTLY BEFORE RELEASE
** Either update, test, and support the old w32 build method, or remove it.
** Make sure the necessary sources and scripts for any generated files
are included in the source tarfile. (They don't need to be installed,
so eg admin/ is fine.)
** Manuals
Check for node names using problematic characters:
find doc -name '*.texi' -exec grep '^@node[^,]*[:.()]' {} +
Sadly makeinfo does not warn about such characters.
Check for major new features added since the last release (e.g. new
lisp files), and add the relevant authors to the Acknowledgments in
doc/emacs/ack.texi and emacs.texi.
Check cross-references between the manuals (eg from emacs to elisp)
are correct. You can use something like the following in the info
directory in the Emacs build tree:

4
admin/notes/elpa
View file

@ -3,9 +3,9 @@ NOTES ON THE EMACS PACKAGE ARCHIVE
The GNU Emacs package archive, at elpa.gnu.org, is managed using a Git
repository named "elpa", hosted on Savannah. To check it out:
git clone git://bzr.sv.gnu.org/emacs/elpa
git clone git://git.sv.gnu.org/emacs/elpa
cd elpa
git remote set-url --push origin git+ssh://bzr.sv.gnu.org/srv/git/emacs/elpa
git remote set-url --push origin git+ssh://git.sv.gnu.org/srv/git/emacs/elpa
[create task branch for edits, etc.]
Changes to this branch propagate to elpa.gnu.org via a "deployment" script run

12
admin/unidata/BidiMirroring.txt
View file

@ -1,19 +1,19 @@
# BidiMirroring-6.3.0.txt
# Date: 2013-02-12, 08:20:00 GMT [KW, LI]
# BidiMirroring-7.0.0.txt
# Date: 2013-12-17, 00:00:00 GMT [KW, LI]
#
# Bidi_Mirroring_Glyph Property
#
# This file is an informative contributory data file in the
# Unicode Character Database.
#
# Copyright (c) 1991-2013 Unicode, Inc.
# Copyright (c) 1991-2014 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#
# This data file lists characters that have the Bidi_Mirrored=Yes property
# value, for which there is another Unicode character that typically has a glyph
# that is the mirror image of the original character's glyph.
#
# The repertoire covered by the file is Unicode 6.3.0.
# The repertoire covered by the file is Unicode 7.0.0.
#
# The file contains a list of lines with mappings from one code point
# to another one for character-based mirroring.
@ -37,12 +37,12 @@
# that means that no other character exists whose glyph is suitable
# for character-based mirroring.
#
# For information on bidi mirroring, see UAX #9: Bidirectional Algorithm,
# For information on bidi mirroring, see UAX #9: Unicode Bidirectional Algorithm,
# at http://www.unicode.org/unicode/reports/tr9/
#
# This file was originally created by Markus Scherer.
# Extended for Unicode 3.2, 4.0, 4.1, 5.0, 5.1, 5.2, and 6.0 by Ken Whistler,
# and for Unicode 6.1, 6.2, and 6.3 by Ken Whistler and Laurentiu Iancu.
# and for Unicode 6.1, 6.2, 6.3, and 7.0 by Ken Whistler and Laurentiu Iancu.
#
# ############################################################
#

38461
admin/unidata/IVD_Sequences.txt Normal file
View file

File diff suppressed because it is too large Load diff

10
admin/unidata/Makefile.in
View file

@ -33,7 +33,12 @@ emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
.PHONY: all compile install
all: ${DSTDIR}/charprop.el
all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el
${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt
${EMACS} -batch -l "${srcdir}/uvs.el" \
--eval '(uvs-print-table-ivd "${srcdir}/IVD_Sequences.txt" "Adobe-Japan1")' \
> $@
.el.elc:
${emacs} -f batch-byte-compile $<
@ -47,7 +52,7 @@ compile: ${srcdir}/unidata-gen.elc
## uni-*.el files just because .elc is missing.
## Same for UnicodeData.txt v unidata.txt.
${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt
${MAKE} ${MFLAGS} compile unidata.txt EMACS="${EMACS}"
${MAKE} compile unidata.txt EMACS="${EMACS}"
-if [ -f "$@" ]; then \
cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
fi
@ -82,6 +87,7 @@ maintainer-clean: distclean
## change and it slows down bootstrap (a tiny bit).
## Cf leim/ja-dic (which is much slower).
extraclean:
rm -f ${top_srcdir}/src/macuvs.h
if test -f ${DSTDIR}/charprop.el; then \
(cd ${DSTDIR} && rm -f `sed -n 's/^;; FILE: //p' < charprop.el`); \
rm -f ${DSTDIR}/charprop.el; \

22
admin/unidata/README
View file

@ -1,4 +1,18 @@
The file `UnicodeData.txt' in this directory is a copy of
<http://www.unicode.org/Public/UNIDATA/UnicodeData.txt> on 2012.04.07,
and is a part of the Unicode Character Database governed by the "UCD
Terms of Use" shown in the file `copyright.html'.
Some files in this directory are taken from the Unicode Character
Database and the Unicode Ideographic Variation Database. These files
are governed by the Unicode Terms of Use contained in the file
copyright.html.
The names, URLs, and dates for these files are as follows.
BidiMirroring.txt
http://www.unicode.org/Public/UNIDATA/BidiMirroring.txt
2013-12-17
IVD_Sequences.txt
http://www.unicode.org/ivd/data/2014-05-16/IVD_Sequences.txt
2014-05-16
UnicodeData.txt
http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
2014-03-10

2854
admin/unidata/UnicodeData.txt
View file

File diff suppressed because it is too large Load diff

101
admin/unidata/copyright.html
View file

@ -5,37 +5,32 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<meta name="VI60_defaultClientScript" content="JavaScript">
<meta name="GENERATOR" content="Microsoft FrontPage 12.0">
<meta name="keywords" content="Unicode Standard, copyright">
<meta name="ProgId" content="FrontPage.Editor.Document">
<title>Unicode Terms of Use</title>
<link rel="stylesheet" type="text/css"
href="http://www.unicode.org/webscripts/standard_styles.css">
</head>
<style type="text/css">
pre {
FONT-FAMILY: Arial, Geneva, sans-serif;
}
</style>
</head>
<body text="#330000">
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
<td colspan="2">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="icon"><a href="http://www.unicode.org/"><img border="0"
@ -136,7 +131,7 @@ <h1>Unicode Terms of Use</h1>
<ol type="A">
<li><u><a name="1"></a>Unicode Copyright.</u>
<ol>
<li>Copyright © 1991-2013 Unicode, Inc. All rights reserved.</li>
<li>Copyright © 1991-2014 Unicode, Inc. All rights reserved.</li>
<li>Certain documents and files on this website contain a legend
indicating that &quot;Modification is permitted.&quot; Any person is
hereby authorized, without fee, to modify such documents and
@ -249,40 +244,72 @@ <h1>Unicode Terms of Use</h1>
</ol>
</blockquote>
<hr width="95%">
<blockquote>
<h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br>
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</h3>
<blockquote>
<p>Unicode Data Files include all data files under the directories
<a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>,
<a href="http://www.unicode.org/reports/">http://www.unicode.org/reports/</a>,
and
<a title="http://www.unicode.org/cldr/data/" onClick="return top.js.OpenExtLink(window,event,this)" target="_blank" href="http://www.unicode.org/cldr/data/">
http://www.unicode.org/cldr/data/</a>. Unicode Data Files do not include PDF online code charts under the directory <a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>. Software includes any source code
published in the Unicode Standard or under the directories <a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>,
<a href="http://www.unicode.org/reports/">http://www.unicode.org/reports/</a>,
and
<a title="http://www.unicode.org/cldr/data/" onClick="return top.js.OpenExtLink(window,event,this)" target="_blank" href="http://www.unicode.org/cldr/data/">
<p>Unicode Data Files include all data files under the directories
<a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>, <a href="http://www.unicode.org/reports/">http://www.unicode.org/reports/</a>, and <a title="http://www.unicode.org/cldr/data/" onClick="return top.js.OpenExtLink(window,event,this)" target="_blank" href="http://www.unicode.org/cldr/data/">
http://www.unicode.org/cldr/data/</a>.
Unicode Data Files do not include PDF online code charts under the
directory <a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>.
Software includes any source code published in the Unicode Standard
or under the directories <a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>,
<a href="http://www.unicode.org/reports/">http://www.unicode.org/reports/</a>, and <a title="http://www.unicode.org/cldr/data/" onClick="return top.js.OpenExtLink(window,event,this)" target="_blank" href="http://www.unicode.org/cldr/data/">
http://www.unicode.org/cldr/data/</a>.</p>
<p>NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.</p>
<p>COPYRIGHT AND PERMISSION NOTICE</p>
<p>NOTICE TO USER: Carefully read the following legal agreement.
BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
TERMS AND CONDITIONS OF THIS AGREEMENT.
IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
THE DATA FILES OR SOFTWARE.</p>
<p>Copyright © 1991-2013 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in
<a href="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a>.</p>
<div align="center">
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and
any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear
with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.</p>
<table class="simple"><tr><td>
<pre>COPYRIGHT AND PERMISSION NOTICE
<p>THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THE DATA FILES OR SOFTWARE.</p>
Copyright © 1991-2014 Unicode, Inc. All rights reserved.
Distributed under the Terms of Use in
<a href="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a>.
<p>Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.</p>
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Unicode data files and any associated documentation
(the "Data Files") or Unicode software and any associated documentation
(the "Software") to deal in the Data Files or Software
without restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, and/or sell copies of
the Data Files or Software, and to permit persons to whom the Data Files
or Software are furnished to do so, provided that
(a) this copyright and permission notice appear with all copies
of the Data Files or Software,
(b) this copyright and permission notice appear in associated
documentation, and
(c) there is clear notice in each modified Data File or in the Software
as well as in the documentation associated with the Data File(s) or
Software that the data or software has been modified.
<hr width="80%">
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT OF THIRD PARTY RIGHTS.
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
<p>Unicode and the Unicode logo are trademarks of Unicode, Inc. in the United States and other countries. All third party trademarks referenced herein are the property of their respective owners.</p>
Except as contained in this notice, the name of a copyright holder
shall not be used in advertising or otherwise to promote the sale,
use or other dealings in these Data Files or Software without prior
written authorization of the copyright holder.</pre>
</td></tr></table>
</div>
</blockquote>

1
admin/mac/uvs.el → admin/unidata/uvs.el
View file

@ -200,6 +200,7 @@ corresponding number."
(insert-file-contents filename)
(setq uvs-alist (uvs-alist-from-ivd collection-id
sequence-id-to-glyph-func)))))
(princ "/* Automatically generated by uvs.el. */\n")
(princ
(format "static const unsigned char mac_uvs_table_%s_bytes[] =\n {\n"
(replace-regexp-in-string "[^_[:alnum:]]" "_"

186
configure.ac
View file

@ -25,22 +25,6 @@ AC_PREREQ(2.65)
dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
AC_INIT(GNU Emacs, 24.4.50, bug-gnu-emacs@gnu.org)
dnl We get MINGW64 with MSYS2
if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64"
then
. $srcdir/nt/mingw-cfg.site
case $srcdir in
/* | ?:*)
# srcdir is an absolute path. In this case, force the format
# "/c/foo/bar", to simplify later conversions to native Windows
# format ("c:/foo/bar")
srcdir=`cd "${srcdir}" && pwd -W`
srcdir="/${srcdir:0:1}${srcdir:2}"
;;
esac
fi
dnl Set emacs_config_options to the options of 'configure', quoted for the shell,
dnl and then quoted again for a C string. Separate options with spaces.
dnl Add some environment variables, if they were passed via the environment
@ -92,7 +76,7 @@ AC_CHECK_PROGS(XCRUN, [xcrun])
if test -n "$XCRUN"; then
if test -z "$MAKE"; then
dnl Call the variable MAKE_PROG, not MAKE, to avoid confusion with
dnl SET_MAKE and with the usual MAKE variable that 'make' itself uses.
dnl the usual MAKE variable that 'make' itself uses.
AC_CHECK_PROG([MAKE_PROG], [make], [yes])
if test -z "$MAKE_PROG"; then
MAKE="$XCRUN MAKE"
@ -102,9 +86,75 @@ if test -n "$XCRUN"; then
fi
fi
dnl GNU Make is required, so don't test for its individual features.
am_cv_make_support_nested_variables=yes
AC_DEFUN([AC_PROG_MAKE_SET],
[SET_MAKE=
AC_SUBST([SET_MAKE])])
dnl Check for GNU Make and possibly set MAKE before running AM_INIT_AUTOMAKE.
[emacs_check_gnu_make ()
{
emacs_makeout=`($1 --version) 2>/dev/null` &&
case $emacs_makeout in
'GNU Make '3.8[1-9]* | 'GNU Make '3.9[0-9]* | \
'GNU Make '3.[1-9][0-9][0-9]* | 'GNU Make '[4-9]* | 'GNU Make '[1-9][0-9]* )
ac_path_MAKE_found=:;;
esac
}]
AC_CACHE_CHECK([for GNU Make], [ac_cv_path_MAKE],
[ac_path_MAKE_found=false
if test -n "$MAKE"; then
emacs_check_gnu_make "$MAKE"
ac_cv_path_MAKE=$MAKE
else
emacs_tried_make=false
emacs_tried_gmake=false
emacs_tried_gnumake=false
AC_PATH_PROGS_FEATURE_CHECK([MAKE], [make gmake gnumake],
[[emacs_check_gnu_make "$ac_path_MAKE"
if $ac_path_MAKE_found; then
# Use the fully-qualified program name only if the basename
# would not resolve to it.
if eval \$emacs_tried_$ac_prog; then
ac_cv_path_MAKE=$ac_path_MAKE
else
ac_cv_path_MAKE=$ac_prog
fi
fi
eval emacs_tried_$ac_prog=:]])
fi])
$ac_path_MAKE_found || {
AC_MSG_ERROR([[Building Emacs requires GNU Make, at least version 3.81.
If you have it installed under another name, configure with 'MAKE=...'.
For example, run '$0 MAKE=gnu-make'.]])
}
MAKE=$ac_cv_path_MAKE
dnl Fairly arbitrary, older versions might work too.
AM_INIT_AUTOMAKE(1.11)
dnl Canonicalize the configuration name.
AC_CANONICAL_HOST
canonical=$host
configuration=${host_alias-${build_alias-$host}}
dnl We get MINGW64 with MSYS2.
case $canonical in
*-mingw*)
. $srcdir/nt/mingw-cfg.site
case $srcdir in
/* | ?:*)
# srcdir is an absolute path. In this case, force the format
# "/c/foo/bar", to simplify later conversions to native Windows
# format ("c:/foo/bar").
srcdir=`cd "${srcdir}" && pwd -W`
srcdir="/${srcdir:0:1}${srcdir:2}"
;;
esac;;
esac
dnl Support for --program-prefix, --program-suffix and
dnl --program-transform-name options
AC_ARG_PROGRAM
@ -246,6 +296,7 @@ fi
dnl _ON results in a '--without' option in the --help output, so
dnl the help text should refer to "don't compile", etc.
with_xpm_set=${with_xpm+set}
OPTION_DEFAULT_ON([xpm],[don't compile with XPM image support])
OPTION_DEFAULT_ON([jpeg],[don't compile with JPEG image support])
OPTION_DEFAULT_ON([tiff],[don't compile with TIFF image support])
@ -449,12 +500,6 @@ AC_ARG_ENABLE(gtk-deprecation-warnings,
[Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])],
[ac_enable_gtk_deprecation_warnings="${enableval}"],[])
### Canonicalize the configuration name.
AC_CANONICAL_HOST
canonical=$host
configuration=${host_alias-${build_alias-$host}}
dnl This used to use changequote, but, apart from `changequote is evil'
dnl per the autoconf manual, we can speed up autoconf somewhat by quoting
dnl the great gob of text. Thus it's not processed for possible expansion.
@ -661,18 +706,6 @@ Check `etc/MACHINES' for recognized configuration names.])
fi
AC_MSG_CHECKING([whether we are using GNU Make])
testval=`${MAKE-make} --version 2>/dev/null | grep 'GNU Make'`
if test "x$testval" != x; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
AC_MSG_ERROR([Building Emacs requires GNU make.
If you have it installed under another name, configure with 'MAKE=...'.
For example, run './configure MAKE=gmake'.])
fi
#### Choose a compiler.
dnl Don't bother to test for C89.
@ -851,6 +884,7 @@ else
for w in $ws; do
gl_WARN_ADD([$w])
done
gl_WARN_ADD([-Wredundant-decls]) # Prefer this, as we don't use Bison.
gl_WARN_ADD([-Wno-missing-field-initializers]) # We need this one
gl_WARN_ADD([-Wno-sign-compare]) # Too many warnings for now
gl_WARN_ADD([-Wno-type-limits]) # Too many warnings for now
@ -899,8 +933,11 @@ edit_cflags="
AC_ARG_ENABLE(link-time-optimization,
[AS_HELP_STRING([--enable-link-time-optimization],
[build emacs with link-time optimization.
This is supported for gcc since 4.5.0 and clang.
Note that clang support is experimental - see INSTALL])],
This requires GCC 4.5.0 or later, or clang.
(Note that clang support is experimental - see INSTALL.)
It also makes Emacs harder to debug, and when we tried it
with GCC 4.9.0 x86-64 it made Emacs slower, so it's not
recommended for typical use.])],
if test "${enableval}" != "no"; then
ac_lto_supported=no
if test $emacs_cv_clang = yes; then
@ -938,6 +975,13 @@ if test "${enableval}" != "no"; then
# command, so plugin name is appended to ARFLAGS.
ARFLAGS="cru --plugin $GOLD_PLUGIN"
RANLIB="$RANLIB --plugin $GOLD_PLUGIN"
else
dnl The following is needed for GCC 4.9.0. The GCC 4.9.0 release notes
dnl suggest that instead of -ffat-lto-objects we should use gcc-ar and
dnl gcc-ranlib in place of ar and ranlib, but gcc-ar makes /usr/bin/ar
dnl dump core on Fedora 20, so play it safe for now.
gl_COMPILER_OPTION_IF([-ffat-lto-objects],
[CFLAGS="$CFLAGS -ffat-lto-objects"])
fi
fi
fi)
@ -1085,12 +1129,6 @@ with the `--without-makeinfo' option to build without the manuals.] )
fi
AC_SUBST(HAVE_MAKEINFO)
dnl Just so that there is only a single place we need to edit.
INFO_EXT=.info
INFO_OPTS=--no-split
AC_SUBST(INFO_EXT)
AC_SUBST(INFO_OPTS)
if test $opsys = mingw32; then
DOCMISC_W32=efaq-w32
else
@ -1533,7 +1571,6 @@ dnl Check for endianness.
dnl AC_C_BIGENDIAN is done by gnulib.
dnl check for Make feature
dnl AC_PROG_MAKE_SET is done by Automake.
DEPFLAGS=
MKDEPDIR=":"
@ -2063,8 +2100,19 @@ if test "$ac_cv_header_pthread_h"; then
OLD_LIBS=$LIBS
AC_SEARCH_LIBS([$emacs_pthread_function], [pthread],
[AC_DEFINE([HAVE_PTHREAD], [1],
[Define to 1 if you have pthread (-lpthread).])])
if test "X$LIBS" != "X$OLD_LIBS"; then
[Define to 1 if you have pthread (-lpthread).])
# Some systems optimize for single-threaded programs by default, and
# need special flags to disable these optimizations. For example, the
# definition of 'errno' in <errno.h>.
case $opsys in
sol*)
AC_DEFINE([_REENTRANT], 1,
[Define to 1 if your system requires this in multithreaded code.]);;
aix4-2)
AC_DEFINE([_THREAD_SAFE], 1,
[Define to 1 if your system requires this in multithreaded code.]);;
esac])
if test "X$LIBS" != "X$OLD_LIBS"; then
eval LIB_PTHREAD=\$ac_cv_search_$emacs_pthread_function
fi
LIBS=$OLD_LIBS
@ -2855,14 +2903,17 @@ fi
### Start of font-backend (under X11) section.
if test "${HAVE_X11}" = "yes"; then
EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0],
[HAVE_FC=yes], [HAVE_FC=no])
## Use -lXft if available, unless `--with-xft=no'.
HAVE_XFT=maybe
if test "${HAVE_FC}" = "no" || test "x${with_x}" = "xno"; then
## Use -lXft if available, unless `--with-xft=no'.
HAVE_XFT=maybe
if test "x${with_x}" = "xno"; then
with_xft="no";
fi
if test "$with_xft" != no; then
EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
with_xft=$HAVE_FONTCONFIG
fi
if test "x${with_xft}" != "xno"; then
EMACS_CHECK_MODULES([XFT], [xft >= 0.13.0], [], [HAVE_XFT=no])
@ -2996,6 +3047,9 @@ no_return_alloc_pixels
fi
if test "${HAVE_X11}" = "yes"; then
dnl Avoid Xpm on AIX unless requested, as it crashes; see Bug#17598.
test "$opsys$with_xpm_set" = aix4-2 && with_xpm=no
if test "${with_xpm}" != "no"; then
AC_CHECK_HEADER(X11/xpm.h,
[AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11)])
@ -3019,6 +3073,9 @@ no_return_alloc_pixels
if test "${HAVE_XPM}" = "yes"; then
AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
LIBXPM=-lXpm
elif test "$opsys,$LUCID_LIBW" = aix4-2,-lXaw; then
dnl AIX -lXaw needs -lXpm linked too; see Bug#17598 Message#152.
LIBXPM=-lXpm
fi
fi
@ -4370,7 +4427,7 @@ if test x$GCC = xyes; then
else
case $opsys in
dnl irix: Tested on Irix 6.5. SCM worked on earlier versions.
dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
aix* | dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
AC_DEFINE(GC_SETJMP_WORKS, 1)
;;
esac
@ -4789,6 +4846,12 @@ AH_VERBATIM([FORTIFY_SOUR],
#endif
])
# If user asks to omit features, disable optional features that gnulib
# might otherwise enable.
if test "$with_features" = no && test "$enable_acl" != yes; then
enable_acl=no
fi
# Configure gnulib. Although this does not affect CFLAGS or LIBS permanently.
# it temporarily reverts them to their pre-pkg-config values,
# because gnulib needs to work with both src (which uses the
@ -4873,21 +4936,10 @@ LD_SWITCH_SYSTEM_TEMACS="$LDFLAGS_NOCOMBRELOC $LD_SWITCH_SYSTEM_TEMACS"
AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
## MinGW-specific compilation switch.
C_HEAP_SWITCH=
if test "${opsys}" = "mingw32"; then
## Preload heap size of temacs.exe in MB.
case "$canonical" in
x86_64-*-*) C_HEAP_SWITCH="-DHEAPSIZE=18" ;;
*) C_HEAP_SWITCH="-DHEAPSIZE=10" ;;
esac
fi
AC_SUBST(C_HEAP_SWITCH)
## 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(POLL_FOR_INPUT, 1, [Define if you poll periodically to detect C-g.])
WINDOW_SYSTEM_OBJ="fontset.o fringe.o image.o"
fi
@ -5121,7 +5173,7 @@ if test "${opsys}" = "mingw32"; then
${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32
else
${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force
fi
fi || AC_MSG_ERROR(['src/epaths.h' could not be made.])
], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"])
dnl NB we have to cheat and use the ac_... version because abs_top_srcdir
@ -5134,3 +5186,5 @@ fi
])
AC_OUTPUT
test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.])

67
doc/emacs/ChangeLog
View file

@ -1,3 +1,70 @@
2014-06-23 Glenn Morris <rgm@gnu.org>
* Makefile.in (%.texi): Disable implicit rules.
(mkinfodir): Remove.
(.dvi.ps): Replace with pattern rule.
(${buildinfodir}): New rule.
($(buildinfodir)/emacs.info): Use order-only prereq for output dir.
Use $<.
(emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf):
Use $<.
(%.ps): New rule.
2014-06-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (bootstrap-clean): New.
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
2014-06-08 Glenn Morris <rgm@gnu.org>
* entering.texi (Entering Emacs): Small fix re initial-buffer-choice.
* misc.texi (emacsclient Options): Copyedit.
* buffers.texi (Uniquify): Copyedits.
* files.texi (Visiting): Update for uniquify changes.
* dired.texi (Marks vs Flags):
* rmail.texi (Rmail Scrolling): Markup fixes re SPC.
* help.texi (Help, Misc Help): Copyedits.
* screen.texi (Menu Bar): Copyedits.
* msdog.texi (Windows Keyboard): F10 menus are now a general feature.
* frames.texi (Frame Commands): Copyedits re M-F10, F11.
* cmdargs.texi (Window Size X): Copyedits.
* ack.texi (Acknowledgments):
* emacs.texi (Acknowledgments): Updates.
2014-06-08 Glenn Morris <rgm@gnu.org>
* ack.texi (Acknowledgments):
* emacs.texi (Acknowledgments): Updates.
* programs.texi (Prettifying Symbols): Remove node.
(Misc for Programs): Mention more briefly here.
* emacs.texi (Top): Update menu.
* package.texi (Package Menu, Package Installation):
Mention signed packages.
(Package Installation): Mention package-pinned-packages.
2014-06-02 Glenn Morris <rgm@gnu.org>
* ack.texi (Acknowledgments): Remove some obsolete items.
* misc.texi [iftex]: Update chapter summary.
(Emulation): Remove section.
* macos.texi (Mac / GNUstep Customization): Mention ns custom group.
(Customization options specific to Mac OS / GNUstep): Remove section.
* abbrevs.texi (Expanding Abbrevs): Update re abbrev-expand-function.
2014-05-26 Eli Zaretskii <eliz@gnu.org>
* frames.texi (Fonts): Clarify which frames are affected by

48
doc/emacs/Makefile.in
View file

@ -54,12 +54,11 @@ GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
# --no-split is only needed because of MS-DOS.
# For a possible alternative, see
# http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html
INFO_OPTS=@INFO_OPTS@
INFO_OPTS= --no-split
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@ -143,46 +142,46 @@ EMACSSOURCES= \
${srcdir}/kmacro.texi \
$(EMACS_XTRA)
## The info/ directory exists in release tarfiles but not the repository.
mkinfodir = @${MKDIR_P} ${buildinfodir}
## Disable implicit rules.
%.texi: ;
.PHONY: info dvi html pdf ps
.SUFFIXES: .ps .dvi
.dvi.ps:
$(DVIPS) -o $@ $<
info: $(buildinfodir)/emacs$(INFO_EXT)
info: $(buildinfodir)/emacs.info
dvi: $(DVI_TARGETS)
html: $(HTML_TARGETS)
pdf: $(PDF_TARGETS)
ps: $(PS_TARGETS)
## The info/ directory exists in release tarfiles but not the repository.
${buildinfodir}:
${MKDIR_P} $@
# Note that all the Info targets build the Info files in srcdir.
# There is no provision for Info files to exist in the build directory.
# In a distribution of Emacs, the Info files should be up to date.
# Note: "<" is not portable in ordinary make rules.
$(buildinfodir)/emacs$(INFO_EXT): ${EMACSSOURCES}
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi
$(buildinfodir)/emacs.info: ${EMACSSOURCES} | ${buildinfodir}
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
emacs.dvi: ${EMACSSOURCES}
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
$(ENVADD) $(TEXI2DVI) $<
emacs.pdf: ${EMACSSOURCES}
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi
$(ENVADD) $(TEXI2PDF) $<
emacs.html: ${EMACSSOURCES}
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs.texi
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
emacs-xtra.dvi: $(EMACS_XTRA)
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
$(ENVADD) $(TEXI2DVI) $<
emacs-xtra.pdf: $(EMACS_XTRA)
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-xtra.texi
$(ENVADD) $(TEXI2PDF) $<
.PHONY: mostlyclean clean distclean maintainer-clean infoclean
%.ps: %.dvi
$(DVIPS) -o $@ $<
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
## Temp files.
mostlyclean:
@ -200,11 +199,11 @@ distclean: clean
## In the standalone tarfile, the clean rule runs this.
infoclean:
rm -f \
$(buildinfodir)/emacs$(INFO_EXT) \
$(buildinfodir)/emacs$(INFO_EXT)-[1-9] \
$(buildinfodir)/emacs$(INFO_EXT)-[1-9][0-9]
$(buildinfodir)/emacs.info \
$(buildinfodir)/emacs.info-[1-9] \
$(buildinfodir)/emacs.info-[1-9][0-9]
maintainer-clean: distclean infoclean
bootstrap-clean maintainer-clean: distclean infoclean
.PHONY: dist
@ -220,7 +219,6 @@ dist:
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \

5
doc/emacs/abbrevs.texi
View file

@ -206,8 +206,9 @@ to turn on Abbrev mode first. It may also be useful together with a
special set of abbrev definitions for making several global replacements at
once. This command is effective even if Abbrev mode is not enabled.
Expanding any abbrev runs @code{abbrev-expand-functions}, a special
hook. Functions in this special hook can make arbitrary changes to
The function @code{expand-abbrev} performs the expansion by calling
the function that @code{abbrev-expand-function} specifies. By
changing this function you can make arbitrary changes to
the abbrev expansion. @xref{Abbrev Expansion,,, elisp, The Emacs Lisp
Reference Manual}.

63
doc/emacs/ack.texi
View file

@ -15,7 +15,7 @@ We thank them for their generosity as well.
This list is intended to mention every contributor of a major package or
feature we currently distribute; if you know of someone we have omitted,
please report that as a manual bug. More comprehensive information is
please make a bug report. More comprehensive information is
available in the @file{ChangeLog} files, summarized in the file
@file{etc/AUTHORS} in the distribution.
@ -51,12 +51,12 @@ files.
@item
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;
and @file{secrets.el}, an interface to keyring daemons for
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}.
Avahi services; @file{secrets.el}, an interface to keyring daemons for
storing confidential data; and @file{filenotify.el} and the associated
low-level interface routines, for watching file status changes.
He and Kai Großjohann wrote the Tramp package, which provides
transparent remote file editing using ssh, ftp, and other network
protocols. He and Daniel Pittman wrote @file{tramp-cache.el}.
@item
Ralf Angeli wrote @file{scroll-lock.el}, a minor mode which keeps the
@ -88,7 +88,8 @@ moving the mouse in particular patterns.
@item
Juanma Barranquero wrote @file{emacs-lock.el} (based on the original
version by Tom Wurgler), which makes it harder to exit with valuable
buffers unsaved. He also made many other contributions to other
buffers unsaved; and @file{frameset.el}, for saving and restoring the
frame/window setup. He also made many other contributions to other
areas, including MS Windows support.
@item
@ -203,7 +204,9 @@ for Korean Hanja.
@item
Andrew Choi and Yamamoto Mitsuharu wrote the Carbon support, used
prior to Emacs 23 for Mac OS.
prior to Emacs 23 for Mac OS. Yamamoto Mitsuharu continued to
contribute to Mac OS support in the newer Nextstep port; and also
improved support for multi-monitor displays.
@item
Chong Yidong was the Emacs co-maintainer from Emacs 23 to 24.3. He made many
@ -346,10 +349,13 @@ mail messages; and @file{saveplace.el}, for preserving point's
location in files between editing sessions.
@item
Gary Foster wrote @file{crisp.el}, the emulation for CRiSP and Brief
editors; and @file{scroll-all.el}, a mode for scrolling several buffers
Gary Foster wrote @file{scroll-all.el}, a mode for scrolling several buffers
together.
@item
Romain Francoise contributed ACL (Access Control List) support,
for preserving extended file attributes on backup and copy.
@item
Noah Friedman wrote @file{rlogin.el}, an interface to Rlogin,
@file{type-break.el}, which reminds you to take periodic breaks from
@ -511,13 +517,14 @@ Emacs, including: @file{dns.el} for Domain Name Service lookups;
@file{time-date.el} for general date and time handling.
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.
and implemented libxml2 support. He also wrote @file{eww.el},
an Emacs Lisp web browser; and implemented native zlib decompression.
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,
Thomas Steffen, Reiner Steib, Didier Verna, Ilja Weis, Katsumi
Yamaoka, Teodor Zlatanov, and others (@pxref{Contributors,,,gnus, the
Thomas Steffen, Reiner Steib, Jan Tatarik, Didier Verna, Ilja Weis,
Katsumi Yamaoka, Teodor Zlatanov, and others (@pxref{Contributors,,,gnus, the
Gnus Manual}).
@item
@ -593,7 +600,7 @@ buffers.
@item
Michael Kifer wrote @code{ediff}, an interactive interface to the
@command{diff}, @command{patch}, and @command{merge} programs; and
Viper, another emulator of the VI editor.
Viper, an emulator of the VI editor.
@item
Richard King wrote the first version of @file{userlock.el} and
@ -696,6 +703,10 @@ searches; the code in @file{files-x.el} for handling file- and
directory-local variables; and the @code{info-finder} feature that
creates a virtual Info manual of package keywords.
@item
Leo Liu wrote @file{pcmpl-x.el}, providing completion for
miscellaneous external tools; and revamped support for Octave in Emacs 24.4.
@item
Károly Lőrentey wrote the ``multi-terminal'' code, which allows
Emacs to run on graphical and text terminals simultaneously.
@ -841,8 +852,8 @@ client for the ``Music Player Daemon''; @file{smie.el}, a generic
indentation engine; and @file{pcase.el}, implementing ML-style pattern
matching. In Emacs 24, he integrated the lexical binding code,
cleaned up the CL namespace (making it acceptable to use CL
functions at runtime), and added generalized variables to core Emacs
Lisp.
functions at runtime), added generalized variables to core Emacs
Lisp, and implemented a new lightweight advice mechanism.
@item
Morioka Tomohiko wrote several packages for MIME support in Gnus and
@ -871,9 +882,6 @@ a mode for editing makefiles.
Thien-Thi Nguyen and Dan Nicolaescu wrote @file{hideshow.el}, a minor
mode for selectively displaying blocks of text.
@item
Jurgen Nickelsen wrote @file{ws-mode.el}, providing WordStar emulation.
@item
Dan Nicolaescu added support for running Emacs as a daemon. He also
wrote @file{romanian.el}, support for editing Romanian text;
@ -1025,10 +1033,8 @@ Alex Rezinsky wrote @file{which-func.el}, a mode that shows the name
of the current function in the mode line.
@item
Rob Riepel wrote @file{tpu-edt.el} and its associated files, providing
an emulation of the VMS TPU text editor emulating the VMS EDT editor,
and @file{vt-control.el}, providing some control functions for the DEC
VT line of terminals.
Rob Riepel wrote @file{vt-control.el}, providing some control
functions for the DEC VT line of terminals.
@item
Nick Roberts wrote @file{t-mouse.el}, for mouse support in text
@ -1048,7 +1054,8 @@ Guillermo J. Rozas wrote @file{scheme.el}, a mode for editing Scheme and
DSSSL code.
@item
Martin Rudalics implemented improved display-buffer handling in Emacs 24.
Martin Rudalics implemented improved display-buffer handling in Emacs 24;
and implemented ``pixel-wise'' resizing of windows and frames.
@item
Ivar Rummelhoff wrote @file{winner.el}, which records recent window
@ -1070,9 +1077,6 @@ references in Info files.
James B. Salem and Brewster Kahle wrote @file{completion.el}, providing
dynamic word completion.
@item
Masahiko Sato wrote @file{vip.el}, an emulation of the VI editor.
@item
Holger Schauer wrote @file{fortune.el}, a package for using fortune in
message signatures.
@ -1399,7 +1403,8 @@ zone out in front of Emacs.
Eli Zaretskii made many standard Emacs features work on MS-DOS and
Microsoft Windows. He also wrote @file{tty-colors.el}, which
implements transparent mapping of X colors to tty colors; and
@file{rxvt.el}. He implemented support for bidirectional text.
@file{rxvt.el}. He implemented support for bidirectional text,
and also menus on text-mode terminals.
@item
Jamie Zawinski wrote much of the support for faces and X selections.

27
doc/emacs/buffers.texi
View file

@ -608,20 +608,16 @@ convenient to switch between buffers.
@cindex unique buffer names
@cindex directories in buffer names
When several buffers visit identically-named files, Emacs must give
the buffers distinct names. The default method
(@code{uniquify-buffer-name-style} set to
@code{post-forward-angle-brackets}) for making buffer names unique
adds @samp{<dir1>}, @samp{<dir2>}, etc.@: to the end of the buffer
names, where @file{dir1} and @file{dir2} are the minimal parts of the
leading directories needed to make the buffer name unique. For
example, if you have files @file{/foo/bar/mumble/name} and
@file{/baz/quux/mumble/name} visited, their buffers will be named
@samp{name<bar/mumble>} and @samp{name<quux/mumble>} correspondingly.
the buffers distinct names. The default method adds a suffix based on
the names of the directories that contain the files. For example, if
you visit files @file{/foo/bar/mumble/name} and
@file{/baz/quux/mumble/name} at the same time, their buffers will be
named @samp{name<bar/mumble>} and @samp{name<quux/mumble>}, respectively.
Emacs adds as many directory parts as are needed to make a unique name.
@vindex uniquify-buffer-name-style
There are several styles to make buffer names unique. To select
one, customize the variable @code{uniquify-buffer-name-style}
(@pxref{Easy Customization}).
You can choose from several different styles for constructing unique
buffer names, by customizing the option @code{uniquify-buffer-name-style}.
The @code{forward} naming method includes part of the file's
directory name at the beginning of the buffer name; using this method,
@ -631,8 +627,8 @@ buffers visiting the files @file{/u/rms/tmp/Makefile} and
In contrast, the @code{post-forward} naming method would call the
buffers @samp{Makefile|tmp} and @samp{Makefile|zaphod}. The default
method @code{post-forward-angle-brackets} is like @code{post-forward}
except that it prepends the unique path in angle brackets. The
method @code{post-forward-angle-brackets} is like @code{post-forward},
except that it encloses the unique path in angle brackets. The
@code{reverse} naming method would call them @samp{Makefile\tmp} and
@samp{Makefile\zaphod}. The nontrivial difference between
@code{post-forward} and @code{reverse} occurs when just one directory
@ -641,8 +637,7 @@ the directory names in reverse order, so that @file{/top/middle/file}
becomes @samp{file\middle\top}, while @code{post-forward} puts them in
forward order after the file name, as in @samp{file|top/middle}. If
@code{uniquify-buffer-name-style} is set to @code{nil}, the buffer
names simply get a @samp{<2>} etc. prepended. This used to be the
default behavior in Emacs versions up to 24.4.
names simply get @samp{<2>}, @samp{<3>}, etc. appended.
Which rule to follow for putting the directory names in the buffer
name is not very important if you are going to @emph{look} at the

13
doc/emacs/cmdargs.texi
View file

@ -901,30 +901,33 @@ the initial frame.
@itemx --fullscreen
@opindex --fullscreen
@cindex fullscreen, command-line argument
Specify that width and height shall be the size of the screen. Normally
no window manager decorations are shown.
Specify that width and height should be that of the screen. Normally
no window manager decorations are shown. (After starting Emacs,
you can toggle this state using @key{F11}, @code{toggle-frame-fullscreen}.)
@item -mm
@opindex -mm
@itemx --maximized
@opindex --maximized
@cindex maximized, command-line argument
Specify that the Emacs frame shall be maximized. This normally
Specify that the Emacs frame should be maximized. This normally
means that the frame has window manager decorations.
(After starting Emacs, you can toggle this state using @kbd{M-F10},
@code{toggle-frame-maximized}.)
@item -fh
@opindex -fh
@itemx --fullheight
@opindex --fullheight
@cindex fullheight, command-line argument
Specify that the height shall be the height of the screen.
Specify that the height should be the height of the screen.
@item -fw
@opindex -fw
@itemx --fullwidth
@opindex --fullwidth
@cindex fullwidth, command-line argument
Specify that the width shall be the width of the screen.
Specify that the width should be the width of the screen.
@end table
@noindent

2
doc/emacs/dired.texi
View file

@ -522,7 +522,7 @@ flags on all the files that have no marks, while unflagging all those
that already have @samp{D} flags:
@example
* c D t * c SPC D * c t SPC
* c D t * c @key{SPC} D * c t @key{SPC}
@end example
This assumes that no files were already marked with @samp{t}.

2
doc/emacs/emacs-xtra.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@comment %**start of header
@setfilename ../../info/emacs-xtra
@setfilename ../../info/emacs-xtra.info
@settitle Specialized Emacs Features
@c Merge all functions, variables, and keys into the concept index.
@syncodeindex fn cp

18
doc/emacs/emacs.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*- coding: utf-8 -*-
@setfilename ../../info/emacs
@setfilename ../../info/emacs.info
@settitle GNU Emacs Manual
@c The edition number appears in more than one place in this file
@ -201,7 +201,6 @@ Advanced Features
* Editing Binary Files:: Editing binary files with Hexl mode.
* Saving Emacs Sessions:: Saving Emacs state from one session to the next.
* Recursive Edit:: Performing edits while "within another command".
* Emulation:: Emulating some other editors with Emacs.
* Hyperlinking:: Following links in buffers.
* Amusements:: Various games and hacks.
* Packages:: Installing additional features.
@ -670,7 +669,6 @@ Editing Programs
* Symbol Completion:: Completion on symbol names of your program or language.
* MixedCase Words:: Dealing with identifiersLikeThis.
* Semantic:: Suite of editing tools based on source code parsing.
* Prettifying Symbols:: Display symbols as composed characters.
* Misc for Programs:: Other Emacs features useful for editing programs.
* C Modes:: Special commands of C, C++, Objective-C,
Java, IDL, Pike and AWK modes.
@ -1367,12 +1365,14 @@ USA
@node Acknowledgments
@unnumberedsec Acknowledgments
@c It's hard to update this fairly.
@c I wonder if it would be better to drop it in favor of AUTHORS?
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,
Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas
Baumann, Steven L. Baur, Jay Belanger, Alexander L. Belikoff,
Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl
Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Stephen Berman, Karl
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
@ -1392,13 +1392,13 @@ 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.
Fuchs, Shigeru Fukaya, Xue Fuqiao, 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
Guillaume, Doug Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris
Guillaume, Dmitry Gutov, 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
Herrmann, Karl Heuer, Manabu Higashida, Konrad Hinsen, Anders Holst,
@ -1416,14 +1416,14 @@ 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,
Juri Linkov, Francis Litterio, Sergey Litvinov, Leo Liu, 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
Miller, Lawrence Mitchell, Richard Mlynarik, Gerd Möllmann, Stefan
Miller, Lawrence Mitchell, Richard Mlynarik, Gerd Möllmann, Dani Moncayo, Stefan
Monnier, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris,
Don Morrison, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum,
Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen,
@ -1454,7 +1454,7 @@ 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.
Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto
Takahashi, Steven Tamm, Luc Teirlinck, Jean-Philippe Theberge, Jens
Takahashi, Steven Tamm, Jan Tatarik, Luc Teirlinck, Jean-Philippe Theberge, Jens
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

17
doc/emacs/entering.texi
View file

@ -76,12 +76,17 @@ information about @file{site-start.el}.}
You can also force Emacs to display a file or directory at startup
by setting the variable @code{initial-buffer-choice} to a string
naming that file or directory. The value of
@code{initial-buffer-choice} may also be a function which should
return a buffer which is then displayed. @code{initial-buffer-choice}
may also be @code{t} in which case the @file{*scratch*} buffer will be
shown. In any case, even if you specify one or more files on the
command line, Emacs opens but does not display them if
@code{initial-buffer-choice} is non-nil.
@code{initial-buffer-choice} may also be a function (of no arguments)
that should return a buffer which is then displayed.
@ignore
@c I do not think this should be mentioned. AFAICS it is just a dodge
@c around inhibit-startup-screen not being settable on a site-wide basis.
@code{initial-buffer-choice} may also be @code{t} in which case the
@file{*scratch*} buffer will be shown.
@end ignore
If @code{initial-buffer-choice} is non-@code{nil}, then if you specify
any files on the command line, Emacs still visits them, but does not
display them initially.
@node Exiting
@section Exiting Emacs

6
doc/emacs/files.texi
View file

@ -171,9 +171,9 @@ the mode line (@pxref{Mode Line}). Emacs normally constructs the
buffer name from the file name, omitting the directory name. For
example, a file named @file{/usr/rms/emacs.tex} is visited in a buffer
named @samp{emacs.tex}. If there is already a buffer with that name,
Emacs constructs a unique name; the normal method is to append
@samp{<2>}, @samp{<3>}, and so on, but you can select other methods.
@xref{Uniquify}.
Emacs constructs a unique name; the normal method is to add a suffix
based on the directory name (e.g., @samp{<rms>}, @samp{<tmp>},
and so on), but you can select other methods. @xref{Uniquify}.
@cindex creating files
To create a new file, just visit it using the same command, @kbd{C-x

8
doc/emacs/frames.texi
View file

@ -457,12 +457,16 @@ Delete all frames on the current terminal, except the selected one.
@item M-<F10>
@kindex M-<F10>
@findex toggle-frame-maximized
Toggle maximization state of the current frame.
Toggle the maximization state of the current frame. When a frame is
maximized, it fills the screen.
@item <F11>
@kindex <F11>
@findex toggle-frame-fullscreen
Toggle fullscreen mode of the current frame.
Toggle fullscreen mode for the current frame. (The difference
between ``fullscreen'' and ``maximized'' is normally that the former
hides window manager decorations, giving slightly more screen space to
Emacs itself.)
@end table
The @kbd{C-x 5 0} (@code{delete-frame}) command deletes the selected

20
doc/emacs/help.texi
View file

@ -55,12 +55,12 @@ This displays the available Emacs packages based on keywords.
@xref{Package Keywords}.
@end table
@kbd{C-h}, @key{F1}, or @kbd{?} means ``help'' in various other
contexts as well. For instance, you can type them after a prefix key
to view a list of the keys that can follow the prefix key. (A few
prefix keys don't support @kbd{C-h} or @kbd{?} in this way, because
they define other meanings for it, but they all support @key{F1} for
help.)
@kbd{C-h} or @key{F1} mean ``help'' in various other contexts as
well. For instance, you can type them after a prefix key to view a
list of the keys that can follow the prefix key. (You can also use
@kbd{?} in this context. A few prefix keys don't support @kbd{C-h}
or @kbd{?} in this way, because they define other meanings for those
inputs, but they all support @key{F1}.)
@menu
* Help Summary:: Brief list of all Help commands.
@ -556,10 +556,10 @@ Emacs Lisp Reference Manual}).
typing @kbd{C-h}, @kbd{?}, or @key{F1}
(@code{describe-prefix-bindings}) after the prefix key. (There are a
few prefix keys for which not all of these keys work---those that
provide their own bindings for one of them. One of these prefix keys
is @key{ESC} in combination with @kbd{C-h}, because @kbd{@key{ESC} C-h} is
actually @kbd{C-M-h}, which marks a defun. However, @kbd{@key{ESC} @key{F1}}
and @kbd{@key{ESC} ?} work fine.)
provide their own bindings for that key. One of these prefix keys
is @key{ESC}, because @kbd{@key{ESC} C-h} is actually @kbd{C-M-h},
which marks a defun. However, @kbd{@key{ESC} @key{F1}} and
@kbd{@key{ESC} ?} work fine.)
@node Help Files
@section Help Files

23
doc/emacs/macos.texi
View file

@ -90,9 +90,10 @@ of setting PATH is recommended on Mac OS X 10.5 and later, using the
@node Mac / GNUstep Customization
@section Mac / GNUstep Customization
Emacs can be customized in several ways in addition to the standard
customization buffers and the Options menu.
There are a few customization options that are specific to the
Nextstep port. For example, they affect things such as the modifier
keys and the fullscreen behavior. To see all such options, use
@kbd{M-x customize-group @key{RET} ns @key{RET}}.
@subsection Font and Color Panels
@ -116,16 +117,14 @@ close the altered one.
Useful in this context is the listing of all faces obtained by
@kbd{M-x list-faces-display}.
@subsection Customization options specific to Mac OS / GNUstep
@cindex Core Text, on Mac OS X
In Mac OS X 10.5 and later, Emacs uses a Core Text based font backend
by default. If you prefer the older font style, enter the following
at the command-line before starting Emacs:
The following customization options are specific to the Nextstep port.
@table @code
@item ns-auto-hide-menu-bar
Non-nil means the menu-bar is hidden by default, but appears if you
move the mouse pointer over it. (Requires Mac OS X 10.6 or later.)
@end table
@example
% defaults write org.gnu.Emacs FontBackend ns
@end example
@node Mac / GNUstep Events

37
doc/emacs/misc.texi
View file

@ -1,18 +1,17 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
@c Foundation, Inc.
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Miscellaneous Commands
This chapter contains several brief topics that do not fit anywhere
else: viewing ``document files'', reading Usenet news, running shell
commands and shell subprocesses, using a single shared Emacs for
utilities that expect to run an editor as a subprocess, printing
hardcopy, sorting text, narrowing display to part of the buffer,
editing binary files, saving an Emacs session for later resumption,
following hyperlinks, browsing images, emulating other editors, and
various diversions and amusements.
else: reading Usenet news, viewing PDFs and other such documents, web
browsing, running shell commands and shell subprocesses, using a
single shared Emacs for utilities that expect to run an editor as a
subprocess, printing, sorting text, editing binary files, saving an
Emacs session for later resumption, recursive editing level, following
hyperlinks, and various diversions and amusements.
@end iftex
@ -1561,9 +1560,9 @@ option, like the @samp{-t} option, creates a new frame in the server's
current text terminal. @xref{Windows Startup}.
If you omit a filename argument while supplying the @samp{-c} option,
the new frame displays the @file{*scratch*} buffer by default. This
behavior can be customized using the variable
@code{initial-buffer-choice} (@pxref{Entering Emacs}).
the new frame displays the @file{*scratch*} buffer by default. You
can customize this behavior with the variable @code{initial-buffer-choice}
(@pxref{Entering Emacs}).
@item -F @var{alist}
@itemx --frame-parameters=@var{alist}
@ -2269,17 +2268,17 @@ new major mode which provides a command to switch back. These
approaches give you more flexibility to go back to unfinished tasks in
the order you choose.
@ignore
@c Apart from edt and viper, this is all obsolete.
@c (Can't believe we were saying ``most other editors'' into 2014!)
@c There seems no point having a node just for those, which both have
@c their own manuals.
@node Emulation
@section Emulation
@cindex emulating other editors
@cindex other editors
@cindex EDT
@cindex vi
@cindex PC key bindings
@cindex scrolling all windows
@cindex PC selection
@cindex Motif key bindings
@cindex Macintosh key bindings
@cindex WordStar
GNU Emacs can be programmed to emulate (more or less) most other
@ -2319,7 +2318,7 @@ buffers or major modes while in EDT emulation.
@item vi (Berkeley editor)
@findex viper-mode
Viper is the newest emulator for vi. It implements several levels of
Viper is an emulator for vi. It implements several levels of
emulation; level 1 is closest to vi itself, while level 5 departs
somewhat from strict emulation to take advantage of the capabilities of
Emacs. To invoke Viper, type @kbd{M-x viper-mode}; it will guide you
@ -2360,6 +2359,8 @@ not use it.
@kbd{M-x wordstar-mode} provides a major mode with WordStar-like
key bindings.
@end table
@end ignore
@node Hyperlinking
@section Hyperlinking and Navigation Features

7
doc/emacs/msdog.texi
View file

@ -458,13 +458,6 @@ before Microsoft was founded.) Examples of conflicts include
You can redefine some of them with meanings more like the MS-Windows
meanings by enabling CUA Mode (@pxref{CUA Bindings}).
@kindex F10 @r{(MS-Windows)}
@cindex menu bar access using keyboard @r{(MS-Windows)}
The @key{F10} key on Windows activates the menu bar in a way that
makes it possible to use the menus without a mouse. In this mode, the
arrow keys traverse the menus, @key{RET} selects a highlighted menu
item, and @key{ESC} closes the menu.
@iftex
@inforef{Windows Keyboard, , emacs}, for information about additional
Windows-specific variables in this category.

47
doc/emacs/package.texi
View file

@ -59,8 +59,9 @@ The package's version number (e.g., @samp{11.86}).
@item
The package's status---normally one of @samp{available} (can be
downloaded from the package archive), @samp{installed}, or
@samp{built-in} (included in Emacs by default).
downloaded from the package archive), @samp{installed},
@samp{unsigned} (installed, but not signed; @pxref{Package Signing}),
or @samp{built-in} (included in Emacs by default).
The status can also be @samp{new}. This is equivalent to
@samp{available}, except that it means the package became newly
@ -167,6 +168,48 @@ directory name of the package archive. You can alter this list if you
wish to use third party package archives---but do so at your own risk,
and use only third parties that you think you can trust!
@anchor{Package Signing}
@cindex package security
@cindex package signing
The maintainers of package archives can increase the trust that you
can have in their packages by @dfn{signing} them. They generate a
private/public pair of cryptographic keys, and use the private key to
create a @dfn{signature file} for each package. With the public key, you
can use the signature files to verify who created the package, and
that it has not been modified. A valid signature is not a cast-iron
guarantee that a package is not malicious, so you should still
exercise caution. Package archives should provide instructions
on how you can obtain their public key. One way is to download the
key from a server such as @url{http://pgp.mit.edu/}.
Use @kbd{M-x package-import-keyring} to import the key into Emacs.
Emacs stores package keys in the @file{gnupg} subdirectory
of @code{package-user-dir}.
@c Uncomment this if it becomes true.
@ignore
The public key for the GNU package archive is distributed with Emacs,
in the @file{etc/package-keyring.gpg}. Emacs uses it automatically.
@end ignore
@vindex package-check-signature
@vindex package-unsigned-archives
If the user option @code{package-check-signature} is non-@code{nil},
Emacs attempts to verify signatures when you install packages. If the
option has the value @code{allow-unsigned}, you can still install a
package that is not signed. If you use some archives that do not sign
their packages, you can add them to the list @code{package-unsigned-archives}.
For more information on cryptographic keys and signing,
@pxref{Top,, Top, gnupg, The GNU Privacy Guard Manual}.
Emacs comes with an interface to GNU Privacy Guard,
@pxref{Top,, EasyPG, epa, Emacs EasyPG Assistant Manual}.
@vindex package-pinned-packages
If you have more than one package archive enabled, and some of them
offer different versions of the same package, you may find the option
@code{package-pinned-packages} useful. You can add package/archive
pairs to this list, to ensure that the specified package is only ever
downloaded from the specified archive.
Once a package is downloaded and installed, it is @dfn{loaded} into
the current Emacs session. Loading a package is not quite the same as
loading a Lisp library (@pxref{Lisp Libraries}); its effect varies

43
doc/emacs/programs.texi
View file

@ -38,7 +38,6 @@ Highlight program syntax (@pxref{Font Lock}).
* Symbol Completion:: Completion on symbol names of your program or language.
* MixedCase Words:: Dealing with identifiersLikeThis.
* Semantic:: Suite of editing tools based on source code parsing.
* Prettifying Symbols:: Display symbols as composed characters.
* Misc for Programs:: Other Emacs features useful for editing programs.
* C Modes:: Special commands of C, C++, Objective-C, Java,
IDL, Pike and AWK modes.
@ -1434,37 +1433,6 @@ is idle.
@xref{Top, Semantic,, semantic, Semantic}, for details.
@end ifnottex
@node Prettifying Symbols
@section Prettifying Symbols
@cindex prettifying symbols
@cindex symbol, prettifying
@code{prettify-symbols-mode} and @code{global-prettify-symbols-mode}
are two minor modes (@pxref{Minor Modes}) that can display specified
symbols as composed characters. For instance, in Emacs Lisp mode
(@pxref{Lisp Eval}), this mode will replace the string ``lambda'' with
the Greek lambda character.
@findex prettify-symbols-mode
@vindex prettify-symbols-alist
When Prettify Symbols mode and Font Lock mode (@pxref{Font Lock}) are
enabled, symbols are prettified (displayed as composed characters)
according to the rules in @code{prettify-symbols-alist}, which are
locally defined by major modes (@pxref{Major Modes}) supporting
prettifying. To add further customizations for a given major mode,
you can modify @code{prettify-symbols-alist}. For example:
@example
(add-hook 'emacs-lisp-mode-hook
(lambda ()
(push '("<=" . ?≤) prettify-symbols-alist)))
@end example
@findex global-prettify-symbols-mode
You can enable this mode locally in desired buffers, or use
@code{global-prettify-symbols-mode} to enable it for all modes that
support it.
@node Misc for Programs
@section Other Features Useful for Editing Programs
@ -1512,6 +1480,17 @@ with the Foldout package (@pxref{Foldout}).
@xref{Top,,Autotyping, autotype, Autotyping}.
@end ifinfo
@findex prettify-symbols-mode
Prettify Symbols mode is a buffer-local minor mode that replaces
certain strings with more ``attractive'' versions for display
purposes. For example, in Emacs Lisp mode, it replaces the string
``lambda'' with the Greek lambda character. You may wish to use this
in non-programming modes as well. You can customize the mode by
adding more entries to @code{prettify-symbols-alist}. There is also a
global version, @code{global-prettify-symbols-mode}, which enables the
mode in all buffers that support it.
@node C Modes
@section C and Related Modes
@cindex C mode

6
doc/emacs/rmail.texi
View file

@ -114,7 +114,7 @@ Scroll to end of message (@code{rmail-end-of-message}).
@kindex S-SPC @r{(Rmail)}
Since the most common thing to do while reading a message is to
scroll through it by screenfuls, Rmail makes @key{SPC} and @key{DEL}
(or @key{S-SPC}) do the same as @kbd{C-v} (@code{scroll-up-command})
(or @kbd{S-@key{SPC}}) do the same as @kbd{C-v} (@code{scroll-up-command})
and @kbd{M-v} (@code{scroll-down-command}) respectively.
@kindex . @r{(Rmail)}
@ -753,7 +753,7 @@ in replies, using the variable @code{mail-dont-reply-to-names}. Its
value should be a regular expression; any recipients that match are
excluded from the @samp{CC} field. They are also excluded from the
@samp{To} field, unless this would leave the field empty. If this
variable is nil, then the first time you compose a reply it is
variable is @code{nil}, then the first time you compose a reply it is
initialized to a default value that matches your own address.
To omit the @samp{CC} field completely for a particular reply, enter
@ -962,7 +962,7 @@ making any kind of summary discards any previous summary.
use for the summary window. The variable
@code{rmail-summary-line-count-flag} controls whether the summary line
for a message should include the line count of the message. Setting
this option to nil might speed up the generation of summaries.
this option to @code{nil} might speed up the generation of summaries.
@node Rmail Summary Edit
@subsection Editing in Summaries

9
doc/emacs/screen.texi
View file

@ -285,10 +285,7 @@ performs various commands. @xref{Mode Line Mouse}.
can use to perform common operations. There's no need to list them
here, as you can more easily see them yourself.
@kindex M-`
@kindex F10
@findex menu-bar-open
On a display that support a mouse, you can use the mouse to choose a
On a display that supports a mouse, you can use the mouse to choose a
command from the menu bar. An arrow on the right edge of a menu item
means it leads to a subsidiary menu, or @dfn{submenu}. A @samp{...}
at the end of a menu item means that the command will prompt you for
@ -300,12 +297,16 @@ itself. To view the full command name and documentation for a menu
item, type @kbd{C-h k}, and then select the menu bar with the mouse in
the usual way (@pxref{Key Help}).
@kindex F10
@findex menu-bar-open
@cindex menu bar access using keyboard
Instead of using the mouse, you can also invoke the first menu bar
item by pressing @key{F10} (to run the command @code{menu-bar-open}).
You can then navigate the menus with the arrow keys. To activate a
selected menu item, press @key{RET}; to cancel menu navigation, press
@kbd{C-g} or @kbd{@key{ESC} @key{ESC} @key{ESC}}.
@kindex M-`
@findex tmm-menubar
@vindex tty-menu-open-use-tmm
On a text terminal, you can optionally access the menu-bar menus in

25
doc/lispintro/ChangeLog
View file

@ -1,3 +1,28 @@
2014-06-23 Glenn Morris <rgm@gnu.org>
* Makefile.in (%.texi): Disable implicit rules.
(mkinfodir): Remove.
(.dvi.ps): Replace with explicit rule.
(${buildinfodir}): New rule.
(${buildinfodir}/eintr.info): Use order-only prereq for output dir.
Use $<.
(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html):
Use $<.
(emacs-lisp-intro.ps): New rule.
2014-06-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (bootstrap-clean): New.
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
2014-06-02 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi (Autoload): Update loaddefs.el details.
2014-04-17 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (infoclean): Be consistent about reporting failures.

43
doc/lispintro/Makefile.in
View file

@ -46,9 +46,8 @@ GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
INFO_OPTS=@INFO_OPTS@
INFO_OPTS= --no-split
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@ -67,42 +66,41 @@ HTML_TARGETS = emacs-lisp-intro.html
PDF_TARGETS = emacs-lisp-intro.pdf
PS_TARGETS = emacs-lisp-intro.ps
mkinfodir = @${MKDIR_P} ${buildinfodir}
srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
${emacsdir}/emacsver.texi
## Disable implicit rules.
%.texi: ;
.PHONY: info dvi html pdf ps
.SUFFIXES: .ps .dvi
.dvi.ps:
$(DVIPS) -o $@ $<
info: ${buildinfodir}/eintr$(INFO_EXT)
info: ${buildinfodir}/eintr.info
dvi: $(DVI_TARGETS)
html: $(HTML_TARGETS)
pdf: $(PDF_TARGETS)
ps: $(PS_TARGETS)
${buildinfodir}:
${MKDIR_P} $@
# The file name eintr must fit within 5 characters, to allow for
# -NN extensions to fit into DOS 8+3 limits without clashing.
# Note: "<" is not portable in ordinary make rules.
${buildinfodir}/eintr$(INFO_EXT): ${srcs}
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
${buildinfodir}/eintr.info: ${srcs} | ${buildinfodir}
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
emacs-lisp-intro.dvi: ${srcs}
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi
$(ENVADD) $(TEXI2DVI) $<
emacs-lisp-intro.pdf: ${srcs}
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi
$(ENVADD) $(TEXI2PDF) $<
emacs-lisp-intro.html: ${srcs}
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
.PHONY: mostlyclean clean distclean maintainer-clean infoclean
emacs-lisp-intro.ps: emacs-lisp-intro.dvi
$(DVIPS) -o $@ $<
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
mostlyclean:
rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \
@ -117,10 +115,10 @@ distclean: clean
infoclean:
rm -f \
$(buildinfodir)/eintr$(INFO_EXT) \
$(buildinfodir)/eintr$(INFO_EXT)-[1-9]
$(buildinfodir)/eintr.info \
$(buildinfodir)/eintr.info-[1-9]
maintainer-clean: distclean infoclean
bootstrap-clean maintainer-clean: distclean infoclean
.PHONY: dist
@ -136,7 +134,6 @@ dist:
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \

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

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@comment %**start of header
@setfilename ../../info/eintr
@setfilename ../../info/eintr.info
@c setfilename emacs-lisp-intro.info
@c sethtmlfilename emacs-lisp-intro.html
@settitle Programming in Emacs Lisp
@ -17548,8 +17548,8 @@ are not loaded right away; but you need to wait a moment when you
first use such a function, while its containing file is evaluated.
Rarely used functions are frequently autoloaded. The
@file{loaddefs.el} library contains hundreds of autoloaded functions,
from @code{bookmark-set} to @code{wordstar-mode}. Of course, you may
@file{loaddefs.el} library contains thousands of autoloaded functions,
from @code{5x5} to @code{zone}. Of course, you may
come to use a `rare' function frequently. When you do, you should
load that function's file with a @code{load} expression in your
@file{.emacs} file.

70
doc/lispref/ChangeLog
View file

@ -1,3 +1,73 @@
2014-06-23 Glenn Morris <rgm@gnu.org>
* Makefile.in (%.texi): Disable implicit rules.
(mkinfodir): Remove.
(.dvi.ps): Replace with explicit rule.
(html): Declare as PHONY.
(${buildinfodir}): New rule.
($(buildinfodir)/elisp.info): Use order-only prereq for output dir.
Use $<.
(elisp.dvi, elisp.html, elisp.pdf): Use $<.
(elisp.ps): New rule.
2014-06-21 Eli Zaretskii <eliz@gnu.org>
* positions.texi (Screen Lines): Clarify how columns are counted
by vertical-motion.
2014-06-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (bootstrap-clean): New.
2014-06-15 Eli Zaretskii <eliz@gnu.org>
* commands.texi (Accessing Mouse): Improve the wording of the
posn-col-row documentation. (Bug#17768)
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
2014-06-09 Paul Eggert <eggert@cs.ucla.edu>
Say (accept-process-output P)'s result pertains to P if P is non-nil.
* processes.texi (Accepting Output): Mention that if PROCESS is non-nil,
the return value is about PROCESS, not about other processes.
2014-06-08 Glenn Morris <rgm@gnu.org>
* os.texi (Startup Summary): Small fix for initial-buffer-choice.
* files.texi (Subroutines of Visiting): Mention uniquify.
* numbers.texi (Comparison of Numbers): Copyedits.
2014-06-08 Glenn Morris <rgm@gnu.org>
* display.texi (Window Systems): Remove window-setup-hook.
* os.texi (Startup Summary, Init File):
Improve description of window-setup-hook.
(Terminal-Specific): Update window-setup-hook cross-reference.
* hooks.texi (Standard Hooks): Update window-setup-hook cross-reference.
* display.texi (Overlay Properties): Update re priority. (Bug#17234)
* package.texi (Package Archives): Mention signing packages.
2014-06-07 Eli Zaretskii <eliz@gnu.org>
* commands.texi (Click Events): Update contents of click event's
position list due to last changes in make_lispy_position.
2014-06-02 Glenn Morris <rgm@gnu.org>
* text.texi (Buffer Contents):
Update for filter-buffer-substring changes.
* abbrevs.texi (Abbrev Expansion): Update for expand-abbrev changes.
* functions.texi (Advising Functions): Standardize menu case.
2014-05-26 Eli Zaretskii <eliz@gnu.org>
* display.texi (Invisible Text): Clarify the description of

44
doc/lispref/Makefile.in
View file

@ -49,9 +49,8 @@ GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
INFO_OPTS=@INFO_OPTS@
INFO_OPTS= --no-split
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@ -125,36 +124,36 @@ srcs = \
$(srcdir)/gpl.texi \
$(srcdir)/doclicense.texi
mkinfodir = @${MKDIR_P} ${buildinfodir}
## Disable implicit rules.
%.texi: ;
.PHONY: info dvi pdf ps
.PHONY: info dvi html pdf ps
.SUFFIXES: .ps .dvi
.dvi.ps:
$(DVIPS) -o $@ $<
info: $(buildinfodir)/elisp$(INFO_EXT)
info: $(buildinfodir)/elisp.info
dvi: $(DVI_TARGETS)
html: $(HTML_TARGETS)
pdf: $(PDF_TARGETS)
ps: $(PS_TARGETS)
## Note: "<" is not portable in ordinary make rules.
$(buildinfodir)/elisp$(INFO_EXT): $(srcs)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi
${buildinfodir}:
${MKDIR_P} $@
$(buildinfodir)/elisp.info: $(srcs) | ${buildinfodir}
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
elisp.dvi: $(srcs)
$(ENVADD) $(TEXI2DVI) $(srcdir)/elisp.texi
$(ENVADD) $(TEXI2DVI) $<
elisp.html: $(srcs)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $(srcdir)/elisp.texi
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
elisp.pdf: $(srcs)
$(ENVADD) $(TEXI2PDF) $(srcdir)/elisp.texi
$(ENVADD) $(TEXI2PDF) $<
.PHONY: mostlyclean clean distclean maintainer-clean infoclean
elisp.ps: elisp.dvi
$(DVIPS) -o $@ $<
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
## [12] stuff is from two-volume.make.
mostlyclean:
@ -172,11 +171,11 @@ distclean: clean
infoclean:
rm -f \
$(buildinfodir)/elisp$(INFO_EXT) \
$(buildinfodir)/elisp$(INFO_EXT)-[1-9] \
$(buildinfodir)/elisp$(INFO_EXT)-[1-9][0-9]
$(buildinfodir)/elisp.info \
$(buildinfodir)/elisp.info-[1-9] \
$(buildinfodir)/elisp.info-[1-9][0-9]
maintainer-clean: distclean infoclean
bootstrap-clean maintainer-clean: distclean infoclean
.PHONY: dist
@ -193,7 +192,6 @@ dist:
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \

37
doc/lispref/abbrevs.texi
View file

@ -257,13 +257,16 @@ as in @code{abbrev-symbol}.
@deffn Command expand-abbrev
This command expands the abbrev before point, if any. If point does not
follow an abbrev, this command does nothing. The command returns the
abbrev symbol if it did expansion, @code{nil} otherwise.
follow an abbrev, this command does nothing. To do the expansion, it
calls the function that is the value of the @code{abbrev-expand-function}
variable, with no arguments, and returns whatever that function does.
If the abbrev symbol has a hook function that is a symbol whose
@code{no-self-insert} property is non-@code{nil}, and if the hook
function returns @code{nil} as its value, then @code{expand-abbrev}
returns @code{nil} even though expansion did occur.
The default expansion function returns the abbrev symbol if it did
expansion, and @code{nil} otherwise. If the abbrev symbol has a hook
function that is a symbol whose @code{no-self-insert} property is
non-@code{nil}, and if the hook function returns @code{nil} as its
value, then the default expansion function returns @code{nil},
even though expansion did occur.
@end deffn
@defun abbrev-insert abbrev &optional name start end
@ -331,24 +334,21 @@ has already been unexpanded. This contains information left by
@code{expand-abbrev} for the sake of the @code{unexpand-abbrev} command.
@end defvar
@defvar abbrev-expand-functions
This is a wrapper hook (@pxref{Running Hooks}) run around the
@code{expand-abbrev} function. Each function on this hook is called
with a single argument: a function that performs the normal abbrev
expansion. The hook function can hence do anything it wants before
and after performing the expansion. It can also choose not to call
its argument, thus overriding the default behavior; or it may even
call it several times. The function should return the abbrev symbol
if expansion took place.
@defvar abbrev-expand-function
The value of this variable is a function that @code{expand-abbrev}
will call with no arguments to do the expansion. The function can do
anything it wants before and after performing the expansion.
It should return the abbrev symbol if expansion took place.
@end defvar
The following sample code shows a simple use of
@code{abbrev-expand-functions}. It assumes that @code{foo-mode} is a
@code{abbrev-expand-function}. It assumes that @code{foo-mode} is a
mode for editing certain files in which lines that start with @samp{#}
are comments. You want to use Text mode abbrevs for those lines. The
regular local abbrev table, @code{foo-mode-abbrev-table} is
appropriate for all other lines. @xref{Standard Abbrev Tables}, for the
definitions of @code{local-abbrev-table} and @code{text-mode-abbrev-table}.
@xref{Advising Functions}, for details of @code{add-function}.
@smallexample
(defun foo-mode-abbrev-expand-function (expand)
@ -361,9 +361,8 @@ definitions of @code{local-abbrev-table} and @code{text-mode-abbrev-table}.
(add-hook 'foo-mode-hook
#'(lambda ()
(add-hook 'abbrev-expand-functions
'foo-mode-abbrev-expand-function
nil t)))
(add-function :around (local 'abbrev-expand-function)
#'foo-mode-abbrev-expand-function)))
@end smallexample
@node Standard Abbrev Tables

2
doc/lispref/anti.texi
View file

@ -30,7 +30,7 @@ minimum of fuss. But @xref{Dynamic Binding Tips}, for tips to avoid
making your programs hard to understand.
@item
Calling a minor mode function from Lisp with a nil or omitted argument
Calling a minor mode function from Lisp with a @code{nil} or omitted argument
does not enable the minor mode unconditionally; instead, it toggles
the minor mode---which is the straightforward thing to do, since that
is the behavior when invoked interactively. One downside is that it

26
doc/lispref/commands.texi
View file

@ -1396,8 +1396,9 @@ The position in the string where the click occurred.
@item @var{text-pos}
For clicks on a marginal area or on a fringe, this is the buffer
position of the first visible character in the corresponding line in
the window. For other events, it is the current buffer position in
the window.
the window. For clicks on the mode line or the header line, this is
@code{nil}. For other events, it is the buffer position closest to
the click.
@item @var{col}, @var{row}
These are the actual column and row coordinate numbers of the glyph
@ -2052,23 +2053,24 @@ POSITION is assumed to lie in a window text area."
@defun posn-col-row position
This function returns a cons cell @code{(@var{col} . @var{row})},
containing the estimated column and row corresponding to buffer
position @var{position}. The return value is given in units of the
frame's default character width and height, as computed from the
@var{x} and @var{y} values corresponding to @var{position}. (So, if
the actual characters have non-default sizes, the actual row and
column may differ from these computed values.)
position in @var{position}. The return value is given in units of the
frame's default character width and default line height (including
spacing), as computed from the @var{x} and @var{y} values
corresponding to @var{position}. (So, if the actual characters have
non-default sizes, the actual row and column may differ from these
computed values.)
Note that @var{row} is counted from the top of the text area. If the
window possesses a header line (@pxref{Header Lines}), it is
@emph{not} counted as the first line.
window given by @var{position} possesses a header line (@pxref{Header
Lines}), it is @emph{not} included in the @var{row} count.
@end defun
@defun posn-actual-col-row position
Return the actual row and column in @var{position}, as a cons cell
@code{(@var{col} . @var{row})}. The values are the actual row and
column numbers in the window. @xref{Click Events}, for details. It
returns @code{nil} if @var{position} does not include actual positions
values.
column numbers in the window given by @var{position}. @xref{Click
Events}, for details. The function returns @code{nil} if
@var{position} does not include actual position values.
@end defun
@defun posn-string position

36
doc/lispref/display.texi
View file

@ -1515,9 +1515,9 @@ of them:
@table @code
@item priority
@kindex priority @r{(overlay property)}
This property's value determines the priority of the overlay. No priority, or
@code{nil}, means zero. A non-nil and non-integer value has
undefined behavior.
This property's value determines the priority of the overlay.
If you want to specify a priority value, use either @code{nil}
(or zero), or a positive integer. Any other value has undefined behavior.
The priority matters when two or more overlays cover the same
character and both specify the same property; the one whose
@ -1527,9 +1527,13 @@ completely override the other value; instead, its face attributes
override the face attributes of the lower priority @code{face}
property.
Currently, all overlays take priority over text properties. Please
avoid using negative priority values, as we have not yet decided just
what they should mean.
Currently, all overlays take priority over text properties.
Note that Emacs sometimes uses non-numeric priority values for some of
its internal overlays, so do not try to do arithmetic on the
priority of an overlay (unless it is one that you created). If you
need to put overlays in priority order, use the @var{sorted} argument
of @code{overlays-at}. @xref{Finding Overlays}.
@item window
@kindex window @r{(overlay property)}
@ -1716,10 +1720,10 @@ Properties}.
@defun overlays-at pos &optional sorted
This function returns a list of all the overlays that cover the character at
position @var{pos} in the current buffer. If @var{sorted} is non-nil, the list
is in decreasing order of priority, otherwise it is in no particular order.
An overlay contains position @var{pos} if it begins at or before @var{pos}, and
ends after @var{pos}.
position @var{pos} in the current buffer. If @var{sorted} is non-@code{nil},
the list is in decreasing order of priority, otherwise it is in no particular
order. An overlay contains position @var{pos} if it begins at or before
@var{pos}, and ends after @var{pos}.
To illustrate usage, here is a Lisp function that returns a list of the
overlays that specify property @var{prop} for the character at point:
@ -6515,18 +6519,6 @@ indicator of Emacs capabilities on a given display type. Instead, use
@code{display-graphic-p} or any of the other @code{display-*-p}
predicates described in @ref{Display Feature Testing}.
@defvar window-setup-hook
This variable is a normal hook which Emacs runs after handling the
initialization files. Emacs runs this hook after it has completed
loading your init file, the default initialization file (if
any), and the terminal-specific Lisp code, and running the hook
@code{emacs-startup-hook}.
This hook is used for internal purposes: setting up communication with
the window system, and creating the initial window. Users should not
interfere with it.
@end defvar
@node Bidirectional Display
@section Bidirectional Display
@cindex bidirectional display

2
doc/lispref/elisp.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename elisp
@setfilename ../../info/elisp.info
@ifset VOL1
@set volflag

5
doc/lispref/files.texi
View file

@ -254,11 +254,16 @@ is permanent local, so it is unaffected by changes of major modes.
which are sometimes useful in user Lisp code: @code{create-file-buffer}
and @code{after-find-file}. This section explains how to use them.
@c FIXME This does not describe the default behavior, because
@c uniquify is enabled by default and advises this function.
@c This is confusing. uniquify should be folded into the function proper.
@defun create-file-buffer filename
This function creates a suitably named buffer for visiting
@var{filename}, and returns it. It uses @var{filename} (sans directory)
as the name if that name is free; otherwise, it appends a string such as
@samp{<2>} to get an unused name. See also @ref{Creating Buffers}.
Note that the @file{uniquify} library affects the result of this
function. @xref{Uniquify,,, emacs, The GNU Emacs Manual}.
@strong{Please note:} @code{create-file-buffer} does @emph{not}
associate the new buffer with a file and does not select the buffer.

8
doc/lispref/functions.texi
View file

@ -1207,10 +1207,10 @@ specify how the two functions are composed, since there are many different
ways to do it. The added function is also called an @emph{advice}.
@menu
* Core Advising Primitives:: Primitives to Manipulate Advices
* Advising Named Functions:: Advising Named Functions
* Advice combinators:: Ways to compose advices
* Porting old advices:: Adapting code using the old defadvice
* Core Advising Primitives:: Primitives to manipulate advice.
* Advising Named Functions:: Advising named functions.
* Advice combinators:: Ways to compose advice.
* Porting old advices:: Adapting code using the old defadvice.
@end menu
@node Core Advising Primitives

6
doc/lispref/hooks.texi
View file

@ -55,6 +55,7 @@ not exactly a hook, but does a similar job.
@item after-init-hook
@itemx before-init-hook
@itemx emacs-startup-hook
@itemx window-setup-hook
@xref{Init File}.
@item after-insert-file-functions
@ -220,9 +221,6 @@ Hook run when about to switch windows with a mouse command.
@itemx window-size-change-functions
@xref{Window Hooks}.
@item window-setup-hook
@xref{Window Systems}.
@item window-text-change-functions
@vindex window-text-change-functions
Functions to call in redisplay when text in the window might change.
@ -240,11 +238,9 @@ choose-completion-string-functions
completing-read-function
completion-annotate-function
completion-at-point-functions
completion-in-region-functions
completion-list-insert-choice-function
deactivate-current-input-method-function
describe-current-input-method-function
filter-buffer-substring-functions
font-lock-function
menu-bar-select-buffer-function
read-file-name-function

4
doc/lispref/keymaps.texi
View file

@ -2901,7 +2901,7 @@ Documentation}).
@item :key-sequence @var{keys}
@var{keys} is a hint for speeding up Emacs's first display of the
menu. It should be nil if you know that the menu item has no keyboard
menu. It should be @code{nil} if you know that the menu item has no keyboard
equivalent; otherwise it should be a string or vector specifying a
keyboard equivalent for the menu item.
@ -2929,7 +2929,7 @@ anything else (meaning an ordinary menu item).
@item :selected @var{selected}
@var{selected} is an expression; the checkbox or radio button is
selected whenever the expression's value is non-nil.
selected whenever the expression's value is non-@code{nil}.
@item :help @var{help}
@var{help} is a string describing the menu item.

8
doc/lispref/modes.texi
View file

@ -702,7 +702,7 @@ mode and minor modes. It uses the @code{documentation} function to
retrieve the documentation strings of the major and minor mode
commands (@pxref{Accessing Documentation}).
If called from Lisp with a non-nil @var{buffer} argument, this
If called from Lisp with a non-@code{nil} @var{buffer} argument, this
function displays the documentation for that buffer's major and minor
modes, rather than those of the current buffer.
@end deffn
@ -3804,8 +3804,8 @@ expressions (not separated by any token) rather than an expression.
@end itemize
When @var{arg} is a token, the function is called with point just before
that token. A return value of nil always means to fallback on the
default behavior, so the function should return nil for arguments it
that token. A return value of @code{nil} always means to fallback on the
default behavior, so the function should return @code{nil} for arguments it
does not expect.
@var{offset} can be:
@ -3904,7 +3904,7 @@ A few things to note:
@itemize
@item
The first case indicates the basic indentation increment to use.
If @code{sample-indent-basic} is nil, then SMIE uses the global
If @code{sample-indent-basic} is @code{nil}, then SMIE uses the global
setting @code{smie-indent-basic}. The major mode could have set
@code{smie-indent-basic} buffer-locally instead, but that
is discouraged.

20
doc/lispref/numbers.texi
View file

@ -400,27 +400,23 @@ returns @code{t} if they are not, and @code{nil} if they are.
@end defun
@defun < number-or-marker &rest number-or-markers
This function tests whether every argument is strictly less than the
respective next argument. It returns @code{t} if so, @code{nil}
otherwise.
This function tests whether each argument is strictly less than the
following argument. It returns @code{t} if so, @code{nil} otherwise.
@end defun
@defun <= number-or-marker &rest number-or-markers
This function tests whether every argument is less than or equal to
the respective next argument. It returns @code{t} if so, @code{nil}
otherwise.
This function tests whether each argument is less than or equal to
the following argument. It returns @code{t} if so, @code{nil} otherwise.
@end defun
@defun > number-or-marker &rest number-or-markers
This function tests whether every argument is strictly greater than
the respective next argument. It returns @code{t} if so, @code{nil}
otherwise.
This function tests whether each argument is strictly greater than
the following argument. It returns @code{t} if so, @code{nil} otherwise.
@end defun
@defun >= number-or-marker &rest number-or-markers
This function tests whether every argument is greater than or equal to
the respective next argument. It returns @code{t} if so, @code{nil}
otherwise.
This function tests whether each argument is greater than or equal to
the following argument. It returns @code{t} if so, @code{nil} otherwise.
@end defun
@defun max number-or-marker &rest numbers-or-markers

29
doc/lispref/os.texi
View file

@ -194,11 +194,16 @@ It processes any command-line options that were not handled earlier.
It now exits if the option @code{--batch} was specified.
@item
If @code{initial-buffer-choice} is a string, it visits the file with
that name. If it is a function, it calls the function and selects the
buffer returned by the function. It it is @code{t}, it selects the
@file{*scratch*} buffer. If the @file{*scratch*} buffer exists and is
empty, it inserts @code{initial-scratch-message} into that buffer.
If @code{initial-buffer-choice} is a string, it visits the file (or
directory) with that name. If it is a function, it calls the function
with no arguments and selects the buffer that it returns.
@ignore
@c I do not think this should be mentioned. AFAICS it is just a dodge
@c around inhibit-startup-screen not being settable on a site-wide basis.
If it is @code{t}, it selects the @file{*scratch*} buffer.
@end ignore
If the @file{*scratch*} buffer exists and is empty, it inserts
@code{initial-scratch-message} into that buffer.
@c To make things nice and confusing, the next three items can be
@c called from two places. If displaying a startup screen, they are
@ -218,7 +223,9 @@ parameters of the selected frame according to whatever the init files
specify.
@item
It runs @code{window-setup-hook}. @xref{Window Systems}.
It runs @code{window-setup-hook}. The only difference between this
hook and @code{emacs-startup-hook} is that this one runs after the
previously mentioned modifications to the frame parameters.
@item
@cindex startup screen
@ -411,6 +418,12 @@ This normal hook is run, once, just after handling the command line
arguments. In batch mode, Emacs does not run this hook.
@end defvar
@defvar window-setup-hook
This normal hook is very similar to @code{emacs-startup-hook}.
The only difference is that it runs slightly later, after setting
of the frame parameters. @xref{Startup Summary, window-setup-hook}.
@end defvar
@defvar user-init-file
This variable holds the absolute file name of the user's init file. If the
actual init file loaded is a compiled file, such as @file{.emacs.elc},
@ -497,7 +510,7 @@ hook runs after loading your init file (if applicable) and the
terminal-specific Lisp file, so you can use it to adjust the
definitions made by that file.
For a related feature, @pxref{Window Systems, window-setup-hook}.
For a related feature, @pxref{Init File, window-setup-hook}.
@end defvar
@node Command-Line Arguments
@ -745,7 +758,7 @@ Here is an example of how you could use these hooks:
(add-hook 'suspend-resume-hook (lambda () (message "Resumed!")
(sit-for 2)))
@end smallexample
@c The sit-for prevents the ``nil'' that suspend-emacs returns
@c The sit-for prevents the @code{nil} that suspend-emacs returns
@c hiding the message.
Here is what you would see upon evaluating @code{(suspend-emacs "pwd")}:

35
doc/lispref/package.texi
View file

@ -342,3 +342,38 @@ otherwise, an error is raised.
@noindent
After you create an archive, remember that it is not accessible in the
Package Menu interface unless it is in @code{package-archives}.
@cindex package archive security
@cindex package signing
Maintaining a public package archive entails a degree of responsibility.
When Emacs users install packages from your archive, those packages
can cause Emacs to run arbitrary code with the permissions of the
installing user. (This is true for Emacs code in general, not just
for packages.) So you should ensure that your archive is
well-maintained and keep the hosting system secure.
One way to increase the security of your packages is to @dfn{sign}
them using a cryptographic key. If you have generated a
private/public gpg key pair, you can use gpg to sign the package like
this:
@c FIXME EasyPG / package-x way to do this.
@example
gpg -ba -o @var{file}.sig @var{file}
@end example
@noindent
For a single-file package, @var{file} is the package Lisp file;
for a multi-file package, it is the package tar file.
You can also sign the archive's contents file in the same way.
Make the @file{.sig} files available in the same location as the packages.
You should also make your public key available for people to download;
e.g., by uploading it to a key server such as @url{http://pgp.mit.edu/}.
When people install packages from your archive, they can use
your public key to verify the signatures.
A full explanation of these matters is outside the scope of this
manual. For more information on cryptographic keys and signing,
@pxref{Top,, GnuPG, gnupg, The GNU Privacy Guard Manual}. Emacs comes
with an interface to GNU Privacy Guard, @pxref{Top,, EasyPG, epa,
Emacs EasyPG Assistant Manual}.

6
doc/lispref/positions.texi
View file

@ -500,7 +500,11 @@ is negative, it moves up instead.
The @var{count} argument can be a cons cell, @code{(@var{cols}
. @var{lines})}, instead of an integer. Then the function moves by
@var{lines} screen lines, and puts point @var{cols} columns from the
start of that screen line.
visual start of that screen line. Note that @var{cols} are counted
from the @emph{visual} start of the line; if the window is scrolled
horizontally (@pxref{Horizontal Scrolling}), the column on which point
will end is in addition to the number of columns by which the text is
scrolled.
The return value is the number of screen lines over which point was
moved. The value may be less in absolute value than @var{count} if

5
doc/lispref/processes.texi
View file

@ -1484,7 +1484,7 @@ The arguments @var{seconds} and @var{millisec} let you specify timeout
periods. The former specifies a period measured in seconds and the
latter specifies one measured in milliseconds. The two time periods
thus specified are added together, and @code{accept-process-output}
returns after that much time, whether or not there has been any
returns after that much time, even if there is no
subprocess output.
The argument @var{millisec} is obsolete (and should not be used),
@ -1502,7 +1502,8 @@ recommended, but may be necessary for specific applications, such as
speech synthesis.
The function @code{accept-process-output} returns non-@code{nil} if it
did get some output, or @code{nil} if the timeout expired before output
got output from @var{process}, or from any process if @var{process} is
@code{nil}. It returns @code{nil} if the timeout expired before output
arrived.
@end defun

2
doc/lispref/sequences.texi
View file

@ -862,7 +862,7 @@ argument @var{b} is given, the result of this operation is stored into
@defun bool-vector-subsetp a b
Return @code{t} if every @code{t} value in @var{a} is also t in
@var{b}, nil otherwise. All arguments should be bool vectors of the
@var{b}, @code{nil} otherwise. All arguments should be bool vectors of the
same length.
@end defun

67
doc/lispref/text.texi
View file

@ -220,15 +220,17 @@ the current buffer, as a string.
@end defun
@defun filter-buffer-substring start end &optional delete
This function passes the buffer text between @var{start} and @var{end}
through the filter functions specified by the wrapper hook
@code{filter-buffer-substring-functions}, and returns the result. The
obsolete variable @code{buffer-substring-filters} is also consulted.
If both of these variables are @code{nil}, the value is the unaltered
text from the buffer, i.e., what @code{buffer-substring} would
return.
This function filters the buffer text between @var{start} and @var{end}
using a function specified by the variable
@code{filter-buffer-substring-function}, and returns the result.
If @var{delete} is non-@code{nil}, this function deletes the text
The default filter function consults the obsolete wrapper hook
@code{filter-buffer-substring-functions}, and the obsolete variable
@code{buffer-substring-filters}. If both of these are @code{nil}, it
returns the unaltered text from the buffer, i.e., what
@code{buffer-substring} would return.
If @var{delete} is non-@code{nil}, the function deletes the text
between @var{start} and @var{end} after copying it, like
@code{delete-and-extract-region}.
@ -236,20 +238,29 @@ Lisp code should use this function instead of @code{buffer-substring},
@code{buffer-substring-no-properties},
or @code{delete-and-extract-region} when copying into user-accessible
data structures such as the kill-ring, X clipboard, and registers.
Major and minor modes can add functions to
@code{filter-buffer-substring-functions} to alter such text as it is
copied out of the buffer.
Major and minor modes can modify @code{filter-buffer-substring-function}
to alter such text as it is copied out of the buffer.
@end defun
@c FIXME: `filter-buffer-substring-function' should be documented.
@defvar filter-buffer-substring-function
The value of this variable is a function that @code{filter-buffer-substring}
will call to do the actual work. The function receives three
arguments, the same as those of @code{filter-buffer-substring},
which it should treat as per the documentation of that function. It
should return the filtered text (and optionally delete the source text).
@end defvar
@noindent The following two variables are obsoleted by
@code{filter-buffer-substring-function}, but are still supported for
backward compatibility.
@defvar filter-buffer-substring-functions
This variable is a wrapper hook (@pxref{Running Hooks}), whose members
should be functions that accept four arguments: @var{fun},
@var{start}, @var{end}, and @var{delete}. @var{fun} is a function
that takes three arguments (@var{start}, @var{end}, and @var{delete}),
and returns a string. In both cases, the @var{start}, @var{end}, and
@var{delete} arguments are the same as those of
@code{filter-buffer-substring}.
This obsolete variable is a wrapper hook, whose members should be functions
that accept four arguments: @var{fun}, @var{start}, @var{end}, and
@var{delete}. @var{fun} is a function that takes three arguments
(@var{start}, @var{end}, and @var{delete}), and returns a string. In
both cases, the @var{start}, @var{end}, and @var{delete} arguments are
the same as those of @code{filter-buffer-substring}.
The first hook function is passed a @var{fun} that is equivalent to
the default operation of @code{filter-buffer-substring}, i.e., it
@ -263,14 +274,12 @@ hook functions acting in sequence.
@end defvar
@defvar buffer-substring-filters
This variable is obsoleted by
@code{filter-buffer-substring-functions}, but is still supported for
backward compatibility. Its value should should be a list of
functions which accept a single string argument and return another
string. @code{filter-buffer-substring} passes the buffer substring to
the first function in this list, and the return value of each function
is passed to the next function. The return value of the last function
is passed to @code{filter-buffer-substring-functions}.
The value of this obsolete variable should be a list of functions
that accept a single string argument and return another string.
The default @code{filter-buffer-substring} function passes the buffer
substring to the first function in this list, and the return value of
each function is passed to the next function. The return value of the
last function is passed to @code{filter-buffer-substring-functions}.
@end defvar
@defun current-word &optional strict really-word
@ -797,7 +806,7 @@ non-whitespace character in each line in the region.
If this command acts on the entire buffer (i.e. if called
interactively with the mark inactive, or called from Lisp with
@var{end} nil), it also deletes all trailing lines at the end of the
@var{end} @code{nil}), it also deletes all trailing lines at the end of the
buffer if the variable @code{delete-trailing-lines} is non-@code{nil}.
@end deffn
@ -2856,7 +2865,7 @@ adding the face @var{face} to the @code{face} text property.
(@pxref{Special Properties}), such as a face name or an anonymous face
(@pxref{Faces}).
If any text in the region already has a non-nil @code{face} property,
If any text in the region already has a non-@code{nil} @code{face} property,
those face(s) are retained. This function sets the @code{face}
property to a list of faces, with @var{face} as the first element (by
default) and the pre-existing faces as the remaining elements. If the

92
doc/misc/ChangeLog
View file

@ -1,3 +1,95 @@
2014-06-23 Glenn Morris <rgm@gnu.org>
* Makefile.in (%.texi): Disable implicit rules.
2014-06-22 Mario Lang <mlang@delysid.org>
* srecode.texi (Base Arguments): The the -> to the.
* org.texi (Images in ODT export): The the -> the.
2014-06-21 Eli Zaretskii <eliz@gnu.org>
* autotype.texi (Skeleton Language): Document the feature of \n
when at eol.
2014-06-21 Michael Albinus <michael.albinus@gmx.de>
* dbus.texi (Type Conversion): Formatting edits in example.
2014-06-15 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.2.10.
* tramp.texi (Inline methods): Remove restriction on "telnet".
Recommend sharing ssh connections for "plink".
(External methods): Remove "sftp". Merge "pscp" and "psftp"
descriptions. Recommend sharing ssh connections. Add "nc" method.
(GVFS based methods): Add "sftp".
(Customizing Completion, External packages, Issues):
Use @dots{}.
* trampver.texi: Update release number.
2014-06-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (bootstrap-clean): New.
2014-06-12 Vincent Belaïche <vincentb1@users.sourceforge.net>
* ses.texi: Adding documentation for SES local printer functions.
2014-06-12 Glenn Morris <rgm@gnu.org>
* Makefile.in: Use GNU Make features to reduce duplication.
(mkinfodir): Remove.
(${buildinfodir}): Generate using an order-only prerequisite.
(.dvi.ps): Replace with pattern rule.
($INFO_TARGETS): Mark as PHONY.
(${buildinfodir}): New rule.
(EXTRA_OPTS, need_emacsver, need_emacsver_prefix): New variables.
(${buildinfodir}/%.info, %.dvi, %.pdf, %.html, %.ps):
New pattern rules, replacing numerous previous explicit rules.
(info_template): New definition.
(gnus.dvi, gnus.pdf): Use distinct intermediate files.
(mostlyclean): Adjust for above gnus change.
2014-06-11 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_INSTALL): Update for 2013-08-28 DOCMISC_W32 change.
2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.
2014-06-08 Karl Berry <karl@gnu.org>
* doc/info.texi (Help-^L): "mode line", "screenful",
stand-alone and Emacs Info both use the mode line.
Use x instead of weird C-x 0 to get rid of help msg
in standalone Info.
2014-06-08 Glenn Morris <rgm@gnu.org>
* vip.texi (Files): Defer to Emacs manual for uniquify details.
* info.texi (Help-Small-Screen): Clarify details of S-SPC.
(Help-Small-Screen, Help-]): Do not mention S-SPC.
(Emacs Info Variables): Markup fix.
* ebrowse.texi (Source Display, Finding/Viewing):
* erc.texi (Sample Session):
* ses.texi (The Basics):
* todo-mode.texi (Moving and Deleting Items):
* woman.texi (Navigation): Markup fixes re SPC, RET.
2014-06-02 Glenn Morris <rgm@gnu.org>
* efaq.texi (Finding a package with particular functionality):
Update example.
* vip.texi: Mention this is obsolete.
2014-05-27 Paul Eggert <eggert@cs.ucla.edu>
* texinfo.tex: Update from gnulib.

795
doc/misc/Makefile.in
View file

@ -19,15 +19,18 @@
SHELL = @SHELL@
# Where to find the source code. $(srcdir) will be the man-aux
# subdirectory of the source tree. This is
# set by the configure script's `--srcdir' option.
# Where to find the source code. $(srcdir) will be the doc/misc subdirectory
# of the source tree. This is set by configure's `--srcdir' option.
srcdir=@srcdir@
version=@version@
## Where the output files go.
## Note that all the Info targets build the Info files in srcdir.
## There is no provision for Info files to exist in the build directory.
## In a tarfile of Emacs, the Info files should be up to date.
buildinfodir = $(srcdir)/../../info
## Directory with emacsver.texi.
emacsdir = $(srcdir)/../emacs
@ -47,15 +50,16 @@ GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
INFO_OPTS=@INFO_OPTS@
# (Note that idlwave, info used --nosplit even without the .info extension.)
INFO_OPTS= --no-split
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
# The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors.
# (TODO? Why is this appropriate?)
MAKEINFO = @MAKEINFO@
MAKEINFO_OPTS = --force -I$(emacsdir)
@ -73,7 +77,7 @@ INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
url vhdl-mode vip viper widget wisent woman
## Info files to install on current platform.
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32)
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
## Info files to build on current platform.
## This is all of them, even though they might not all get installed,
@ -97,18 +101,14 @@ DVIPS = dvips
ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
mkinfodir = @${MKDIR_P} ${buildinfodir}
gfdl = ${srcdir}/doclicense.texi
.PHONY: info dvi html pdf ps echo-info
.PHONY: info dvi html pdf ps echo-info $(INFO_TARGETS)
## Prevent implicit rule triggering for foo.info.
.SUFFIXES:
.SUFFIXES: .ps .dvi
.dvi.ps:
$(DVIPS) -o $@ $<
## Disable implicit rules.
%.texi: ;
# Default.
info: $(INFO_TARGETS)
@ -117,7 +117,7 @@ info: $(INFO_TARGETS)
## Base file names of output info files.
echo-info:
@echo "$(INFO_INSTALL) " | \
sed -e 's|[^ ]*/||g' -e 's/\.info//g' -e "s/ */$(INFO_EXT) /g"
sed -e 's|[^ ]*/||g' -e 's/\.info//g' -e "s/ */.info /g"
dvi: $(DVI_TARGETS)
@ -127,750 +127,98 @@ pdf: $(PDF_TARGETS)
ps: $(PS_TARGETS)
# Note that all the Info targets build the Info files in srcdir.
# There is no provision for Info files to exist in the build directory.
# In a distribution of Emacs, the Info files should be up to date.
${buildinfodir}:
${MKDIR_P} $@
# Note: "<" is not portable in ordinary make rules.
### The general case.
ada_mode_deps = ${srcdir}/ada-mode.texi ${gfdl}
ada-mode : $(buildinfodir)/ada-mode$(INFO_EXT)
$(buildinfodir)/ada-mode$(INFO_EXT): $(ada_mode_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ada-mode.texi
ada-mode.dvi: $(ada_mode_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
ada-mode.pdf: $(ada_mode_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
ada-mode.html: $(ada_mode_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ada-mode.texi
EXTRA_OPTS =
auth_deps = ${srcdir}/auth.texi ${gfdl}
auth : $(buildinfodir)/auth$(INFO_EXT)
$(buildinfodir)/auth$(INFO_EXT): $(auth_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/auth.texi
auth.dvi: $(auth_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
auth.pdf: $(auth_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
auth.html: $(auth_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/auth.texi
${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} | ${buildinfodir}
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) -o $@ $<
autotype_deps = ${srcdir}/autotype.texi ${gfdl}
autotype : $(buildinfodir)/autotype$(INFO_EXT)
$(buildinfodir)/autotype$(INFO_EXT): $(autotype_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/autotype.texi
autotype.dvi: $(autotype_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
autotype.pdf: $(autotype_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
autotype.html: $(autotype_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/autotype.texi
## The short aliases, eg efaq = $(buildinfodir)/efaq.info.
define info_template
$(1): $$(buildinfodir)/$(1).info
endef
bovine_deps = ${srcdir}/bovine.texi ${gfdl}
bovine : $(buildinfodir)/bovine$(INFO_EXT)
$(buildinfodir)/bovine$(INFO_EXT): $(bovine_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/bovine.texi
bovine.dvi: $(bovine_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/bovine.texi
bovine.pdf: $(bovine_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/bovine.texi
bovine.html: $(bovine_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/bovine.texi
## "info" is already taken.
info.info: $(buildinfodir)/info.info
calc_deps = ${srcdir}/calc.texi $(emacsdir)/emacsver.texi ${gfdl}
calc : $(buildinfodir)/calc$(INFO_EXT)
$(buildinfodir)/calc$(INFO_EXT): $(calc_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/calc.texi
calc.dvi: $(calc_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
calc.pdf: $(calc_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
calc.html: $(calc_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/calc.texi
$(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_template,$(ifile))))
cc_mode_deps = ${srcdir}/cc-mode.texi ${gfdl}
ccmode : $(buildinfodir)/ccmode$(INFO_EXT)
$(buildinfodir)/ccmode$(INFO_EXT): $(cc_mode_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cc-mode.texi
cc-mode.dvi: $(cc_mode_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
cc-mode.pdf: $(cc_mode_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
cc-mode.html: $(cc_mode_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/cc-mode.texi
cl_deps = ${srcdir}/cl.texi $(emacsdir)/emacsver.texi ${gfdl}
cl : $(buildinfodir)/cl$(INFO_EXT)
$(buildinfodir)/cl$(INFO_EXT): $(cl_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cl.texi
cl.dvi: $(cl_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
cl.pdf: $(cl_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
cl.html: $(cl_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/cl.texi
%.dvi: ${srcdir}/%.texi ${gfdl}
$(ENVADD) $(TEXI2DVI) $<
dbus_deps = ${srcdir}/dbus.texi ${gfdl}
dbus : $(buildinfodir)/dbus$(INFO_EXT)
$(buildinfodir)/dbus$(INFO_EXT): $(dbus_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dbus.texi
dbus.dvi: $(dbus_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
dbus.pdf: $(dbus_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
dbus.html: $(dbus_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/dbus.texi
%.pdf: ${srcdir}/%.texi ${gfdl}
$(ENVADD) $(TEXI2PDF) $<
dired_x_deps = ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi ${gfdl}
dired-x : $(buildinfodir)/dired-x$(INFO_EXT)
$(buildinfodir)/dired-x$(INFO_EXT): $(dired_x_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dired-x.texi
dired-x.dvi: $(dired_x_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
dired-x.pdf: $(dired_x_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
dired-x.html: $(dired_x_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/dired-x.texi
%.html: ${srcdir}/%.texi ${gfdl}
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) -o $@ $<
ebrowse_deps = ${srcdir}/ebrowse.texi ${gfdl}
ebrowse : $(buildinfodir)/ebrowse$(INFO_EXT)
$(buildinfodir)/ebrowse$(INFO_EXT): $(ebrowse_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ebrowse.texi
ebrowse.dvi: $(ebrowse_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
ebrowse.pdf: $(ebrowse_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
ebrowse.html: $(ebrowse_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ebrowse.texi
%.ps: %.dvi
$(DVIPS) -o $@ $<
ede_deps = ${srcdir}/ede.texi ${gfdl}
ede : $(buildinfodir)/ede$(INFO_EXT)
$(buildinfodir)/ede$(INFO_EXT): $(ede_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ede.texi
ede.dvi: $(ede_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
ede.pdf: $(ede_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
ede.html: $(ede_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ede.texi
ediff_deps = ${srcdir}/ediff.texi ${gfdl}
ediff : $(buildinfodir)/ediff$(INFO_EXT)
$(buildinfodir)/ediff$(INFO_EXT): $(ediff_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ediff.texi
ediff.dvi: $(ediff_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
ediff.pdf: $(ediff_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
ediff.html: $(ediff_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ediff.texi
### The exceptions.
edt_deps = ${srcdir}/edt.texi ${gfdl}
edt : $(buildinfodir)/edt$(INFO_EXT)
$(buildinfodir)/edt$(INFO_EXT): $(edt_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/edt.texi
edt.dvi: $(edt_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
edt.pdf: $(edt_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
edt.html: $(edt_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/edt.texi
## Extra dependencies.
## No gfdl dependency.
efaq_deps = ${srcdir}/efaq.texi $(emacsdir)/emacsver.texi
efaq : $(buildinfodir)/efaq$(INFO_EXT)
$(buildinfodir)/efaq$(INFO_EXT): $(efaq_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq.texi
efaq.dvi: $(efaq_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/efaq.texi
efaq.pdf: $(efaq_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/efaq.texi
efaq.html: $(efaq_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq.texi
need_emacsver = calc cl dired-x efaq efaq-w32 erc ido reftex woman
need_emacsver_prefix = $(addprefix ${buildinfodir}/,${need_emacsver})
efaq_w32_deps = ${srcdir}/efaq-w32.texi $(emacsdir)/emacsver.texi
efaq-w32 : $(buildinfodir)/efaq-w32$(INFO_EXT)
$(buildinfodir)/efaq-w32$(INFO_EXT): $(efaq_w32_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq-w32.texi
efaq-w32.dvi: $(efaq_w32_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/efaq-w32.texi
efaq-w32.pdf: $(efaq_w32_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/efaq-w32.texi
efaq-w32.html: $(efaq_w32_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq-w32.texi
$(need_emacsver_prefix:=.info) $(need_emacsver:=.dvi) $(need_emacsver:=.pdf) $(need_emacsver:=.html) : ${emacsdir}/emacsver.texi
eieio_deps = ${srcdir}/eieio.texi ${gfdl}
eieio : $(buildinfodir)/eieio$(INFO_EXT)
$(buildinfodir)/eieio$(INFO_EXT): $(eieio_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eieio.texi
eieio.dvi: $(eieio_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
eieio.pdf: $(eieio_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
eieio.html: $(eieio_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eieio.texi
$(buildinfodir)/gnus.info gnus.html: ${srcdir}/gnus-faq.texi
emacs_gnutls_deps = ${srcdir}/emacs-gnutls.texi ${gfdl}
emacs-gnutls : $(buildinfodir)/emacs-gnutls$(INFO_EXT)
$(buildinfodir)/emacs-gnutls$(INFO_EXT): $(emacs_gnutls_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi
emacs-gnutls.dvi: $(emacs_gnutls_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi
emacs-gnutls.pdf: $(emacs_gnutls_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi
emacs-gnutls.html: $(emacs_gnutls_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi
$(buildinfodir)/semantic.info semantic.dvi semantic.pdf semantic.html: ${srcdir}/sem-user.texi
emacs_mime_deps = ${srcdir}/emacs-mime.texi ${gfdl}
emacs-mime : $(buildinfodir)/emacs-mime$(INFO_EXT)
$(buildinfodir)/emacs-mime$(INFO_EXT): $(emacs_mime_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi
emacs-mime.dvi: $(emacs_mime_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
emacs-mime.pdf: $(emacs_mime_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
emacs-mime.html: $(emacs_mime_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi
epa_deps = ${srcdir}/epa.texi ${gfdl}
epa : $(buildinfodir)/epa$(INFO_EXT)
$(buildinfodir)/epa$(INFO_EXT): $(epa_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/epa.texi
epa.dvi: $(epa_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
epa.pdf: $(epa_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
epa.html: $(epa_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/epa.texi
## Please can we just rename cc-mode.texi to ccmode.texi...
${buildinfodir}/ccmode.info: ${srcdir}/cc-mode.texi ${gfdl}
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
erc_deps = ${srcdir}/erc.texi $(emacsdir)/emacsver.texi ${gfdl}
erc : $(buildinfodir)/erc$(INFO_EXT)
$(buildinfodir)/erc$(INFO_EXT): $(erc_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/erc.texi
erc.dvi: $(erc_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
erc.pdf: $(erc_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
erc.html: $(erc_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/erc.texi
## efaq, efaq_w32 do not depend on gfdl.
## Maybe we can use .SECONDEXPANSION for this.
${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
ert_deps = ${srcdir}/ert.texi ${gfdl}
ert : $(buildinfodir)/ert$(INFO_EXT)
$(buildinfodir)/ert$(INFO_EXT): $(ert_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ert.texi
ert.dvi: $(ert_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi
ert.pdf: $(ert_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
ert.html: $(ert_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ert.texi
efaq%.dvi: ${srcdir}/efaq%.texi
$(ENVADD) $(TEXI2DVI) $<
eshell_deps = ${srcdir}/eshell.texi ${gfdl}
eshell : $(buildinfodir)/eshell$(INFO_EXT)
$(buildinfodir)/eshell$(INFO_EXT): $(eshell_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eshell.texi
eshell.dvi: $(eshell_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
eshell.pdf: $(eshell_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
eshell.html: $(eshell_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eshell.texi
efaq%.pdf: ${srcdir}/efaq%.texi
$(ENVADD) $(TEXI2PDF) $<
eudc_deps = ${srcdir}/eudc.texi ${gfdl}
eudc : $(buildinfodir)/eudc$(INFO_EXT)
$(buildinfodir)/eudc$(INFO_EXT): $(eudc_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eudc.texi
eudc.dvi: $(eudc_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
eudc.pdf: $(eudc_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
eudc.html: $(eudc_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eudc.texi
efaq%.html: ${srcdir}/efaq%.texi
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
eww_deps = ${srcdir}/eww.texi ${gfdl}
eww : $(buildinfodir)/eww$(INFO_EXT)
$(buildinfodir)/eww$(INFO_EXT): $(eww_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eww.texi
eww.dvi: $(eww_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/eww.texi
eww.pdf: $(eww_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/eww.texi
eww.html: $(eww_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eww.texi
${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding
flymake_deps = ${srcdir}/flymake.texi ${gfdl}
flymake : $(buildinfodir)/flymake$(INFO_EXT)
$(buildinfodir)/flymake$(INFO_EXT): $(flymake_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/flymake.texi
flymake.dvi: $(flymake_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
flymake.pdf: $(flymake_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
flymake.html: $(flymake_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/flymake.texi
forms_deps = ${srcdir}/forms.texi ${gfdl}
forms : $(buildinfodir)/forms$(INFO_EXT)
$(buildinfodir)/forms$(INFO_EXT): $(forms_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/forms.texi
forms.dvi: $(forms_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
forms.pdf: $(forms_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
forms.html: $(forms_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/forms.texi
## gnus/message/emacs-mime/sieve/pgg are part of Gnus.
gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
gnus : $(buildinfodir)/gnus$(INFO_EXT)
$(buildinfodir)/gnus$(INFO_EXT): $(gnus_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/gnus.texi
gnus.dvi: $(gnus_deps)
sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
$(ENVADD) $(TEXI2DVI) gnustmp.texi
cp gnustmp.dvi $@
rm gnustmp.*
sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmpdvi.texi
$(ENVADD) $(TEXI2DVI) gnustmpdvi.texi
cp gnustmpdvi.dvi $@
rm gnustmpdvi.*
gnus.pdf: $(gnus_deps)
sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
$(ENVADD) $(TEXI2PDF) gnustmp.texi
cp gnustmp.pdf $@
rm gnustmp.*
gnus.html: $(gnus_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/gnus.texi
sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmppdf.texi
$(ENVADD) $(TEXI2PDF) gnustmppdf.texi
cp gnustmppdf.pdf $@
rm gnustmppdf.*
htmlfontify_deps = ${srcdir}/htmlfontify.texi ${gfdl}
htmlfontify : $(buildinfodir)/htmlfontify$(INFO_EXT)
$(buildinfodir)/htmlfontify$(INFO_EXT): $(htmlfontify_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/htmlfontify.texi
htmlfontify.dvi: $(htmlfontify_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/htmlfontify.texi
htmlfontify.pdf: $(htmlfontify_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/htmlfontify.texi
htmlfontify.html: $(htmlfontify_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/htmlfontify.texi
${buildinfodir}/tramp.info tramp.html: EXTRA_OPTS = -D emacs
${buildinfodir}/tramp.info tramp.html: ${srcdir}/trampver.texi
idlwave_deps = ${srcdir}/idlwave.texi ${gfdl}
idlwave : $(buildinfodir)/idlwave$(INFO_EXT)
# NB this one needs --no-split even without a .info extension.
$(buildinfodir)/idlwave$(INFO_EXT): $(idlwave_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/idlwave.texi
idlwave.dvi: $(idlwave_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
idlwave.pdf: $(idlwave_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi
idlwave.html: $(idlwave_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/idlwave.texi
ido_deps = ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl}
ido : $(buildinfodir)/ido$(INFO_EXT)
$(buildinfodir)/ido$(INFO_EXT): $(ido_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ido.texi
ido.dvi: $(ido_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/ido.texi
ido.pdf: $(ido_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/ido.texi
ido.html: $(ido_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ido.texi
info_deps = ${srcdir}/info.texi ${gfdl}
# Avoid name clash with overall "info" target.
info.info : $(buildinfodir)/info$(INFO_EXT)
# NB this one needs --no-split even without a .info extension.
$(buildinfodir)/info$(INFO_EXT): $(info_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/info.texi
info.dvi: $(info_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
info.pdf: $(info_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
info.html: $(info_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/info.texi
mairix_el_deps = ${srcdir}/mairix-el.texi ${gfdl}
mairix-el : $(buildinfodir)/mairix-el$(INFO_EXT)
$(buildinfodir)/mairix-el$(INFO_EXT): $(mairix_el_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mairix-el.texi
mairix-el.dvi: $(mairix_el_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
mairix-el.pdf: $(mairix_el_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
mairix-el.html: $(mairix_el_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/mairix-el.texi
message_deps = ${srcdir}/message.texi ${gfdl}
message : $(buildinfodir)/message$(INFO_EXT)
$(buildinfodir)/message$(INFO_EXT): $(message_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/message.texi
message.dvi: $(message_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
message.pdf: $(message_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
message.html: $(message_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/message.texi
mh_e_deps = ${srcdir}/mh-e.texi ${gfdl}
mh-e : $(buildinfodir)/mh-e$(INFO_EXT)
$(buildinfodir)/mh-e$(INFO_EXT): $(mh_e_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mh-e.texi
mh-e.dvi: $(mh_e_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
mh-e.pdf: $(mh_e_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
mh-e.html: $(mh_e_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/mh-e.texi
newsticker_deps = ${srcdir}/newsticker.texi ${gfdl}
newsticker : $(buildinfodir)/newsticker$(INFO_EXT)
$(buildinfodir)/newsticker$(INFO_EXT): $(newsticker_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/newsticker.texi
newsticker.dvi: $(newsticker_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
newsticker.pdf: $(newsticker_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
newsticker.html: $(newsticker_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/newsticker.texi
nxml_mode_deps = ${srcdir}/nxml-mode.texi ${gfdl}
nxml-mode : $(buildinfodir)/nxml-mode$(INFO_EXT)
$(buildinfodir)/nxml-mode$(INFO_EXT): $(nxml_mode_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/nxml-mode.texi
nxml-mode.dvi: $(nxml_mode_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
nxml-mode.pdf: $(nxml_mode_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
nxml-mode.html: $(nxml_mode_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/nxml-mode.texi
octave_mode_deps = ${srcdir}/octave-mode.texi ${gfdl}
octave-mode : $(buildinfodir)/octave-mode$(INFO_EXT)
$(buildinfodir)/octave-mode$(INFO_EXT): $(octave_mode_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/octave-mode.texi
octave-mode.dvi: $(octave_mode_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/octave-mode.texi
octave-mode.pdf: $(octave_mode_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/octave-mode.texi
octave-mode.html: $(octave_mode_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/octave-mode.texi
org_deps = ${srcdir}/org.texi ${gfdl}
org : $(buildinfodir)/org$(INFO_EXT)
$(buildinfodir)/org$(INFO_EXT): $(org_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/org.texi
org.dvi: $(org_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
org.pdf: $(org_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
org.html: $(org_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/org.texi
pcl_cvs_deps = ${srcdir}/pcl-cvs.texi ${gfdl}
pcl-cvs : $(buildinfodir)/pcl-cvs$(INFO_EXT)
$(buildinfodir)/pcl-cvs$(INFO_EXT): $(pcl_cvs_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pcl-cvs.texi
pcl-cvs.dvi: $(pcl_cvs_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
pcl-cvs.pdf: $(pcl_cvs_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
pcl-cvs.html: $(pcl_cvs_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/pcl-cvs.texi
pgg_deps = ${srcdir}/pgg.texi ${gfdl}
pgg : $(buildinfodir)/pgg$(INFO_EXT)
$(buildinfodir)/pgg$(INFO_EXT): $(pgg_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pgg.texi
pgg.dvi: $(pgg_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
pgg.pdf: $(pgg_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
pgg.html: $(pgg_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/pgg.texi
rcirc_deps = ${srcdir}/rcirc.texi ${gfdl}
rcirc : $(buildinfodir)/rcirc$(INFO_EXT)
$(buildinfodir)/rcirc$(INFO_EXT): $(rcirc_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/rcirc.texi
rcirc.dvi: $(rcirc_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
rcirc.pdf: $(rcirc_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
rcirc.html: $(rcirc_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/rcirc.texi
reftex_deps = ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi ${gfdl}
reftex : $(buildinfodir)/reftex$(INFO_EXT)
$(buildinfodir)/reftex$(INFO_EXT): $(reftex_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi
reftex.dvi: $(reftex_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
reftex.pdf: $(reftex_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
reftex.html: $(reftex_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/reftex.texi
remember_deps = ${srcdir}/remember.texi ${gfdl}
remember : $(buildinfodir)/remember$(INFO_EXT)
$(buildinfodir)/remember$(INFO_EXT): $(remember_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/remember.texi
remember.dvi: $(remember_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
remember.pdf: $(remember_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
remember.html: $(remember_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/remember.texi
sasl_deps = ${srcdir}/sasl.texi ${gfdl}
sasl : $(buildinfodir)/sasl$(INFO_EXT)
$(buildinfodir)/sasl$(INFO_EXT): $(sasl_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sasl.texi
sasl.dvi: $(sasl_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
sasl.pdf: $(sasl_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
sasl.html: $(sasl_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sasl.texi
sc_deps = ${srcdir}/sc.texi ${gfdl}
sc : $(buildinfodir)/sc$(INFO_EXT)
$(buildinfodir)/sc$(INFO_EXT): $(sc_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sc.texi
sc.dvi: $(sc_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
sc.pdf: $(sc_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
sc.html: $(sc_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sc.texi
semantic_deps = ${srcdir}/semantic.texi ${srcdir}/sem-user.texi ${gfdl}
semantic : $(buildinfodir)/semantic$(INFO_EXT)
$(buildinfodir)/semantic$(INFO_EXT): $(semantic_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/semantic.texi
semantic.dvi: $(semantic_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
semantic.pdf: $(semantic_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
semantic.html: $(semantic_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/semantic.texi
ses_deps = ${srcdir}/ses.texi ${gfdl}
ses : $(buildinfodir)/ses$(INFO_EXT)
$(buildinfodir)/ses$(INFO_EXT): $(ses_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ses.texi
ses.dvi: $(ses_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
ses.pdf: $(ses_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
ses.html: $(ses_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/ses.texi
sieve_deps = ${srcdir}/sieve.texi ${gfdl}
sieve : $(buildinfodir)/sieve$(INFO_EXT)
$(buildinfodir)/sieve$(INFO_EXT): $(sieve_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sieve.texi
sieve.dvi: $(sieve_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
sieve.pdf: $(sieve_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
sieve.html: $(sieve_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/sieve.texi
smtpmail_deps = ${srcdir}/smtpmail.texi ${gfdl}
smtpmail : $(buildinfodir)/smtpmail$(INFO_EXT)
$(buildinfodir)/smtpmail$(INFO_EXT): $(smtpmail_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/smtpmail.texi
smtpmail.dvi: $(smtpmail_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
smtpmail.pdf: $(smtpmail_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
smtpmail.html: $(smtpmail_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/smtpmail.texi
speedbar_deps = ${srcdir}/speedbar.texi ${gfdl}
speedbar : $(buildinfodir)/speedbar$(INFO_EXT)
$(buildinfodir)/speedbar$(INFO_EXT): $(speedbar_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/speedbar.texi
speedbar.dvi: $(speedbar_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
speedbar.pdf: $(speedbar_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
speedbar.html: $(speedbar_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/speedbar.texi
srecode_deps = ${srcdir}/srecode.texi ${gfdl}
srecode : $(buildinfodir)/srecode$(INFO_EXT)
$(buildinfodir)/srecode$(INFO_EXT): $(srecode_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/srecode.texi
srecode.dvi: $(srecode_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/srecode.texi
srecode.pdf: $(srecode_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/srecode.texi
srecode.html: $(srecode_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/srecode.texi
todo_mode_deps = ${srcdir}/todo-mode.texi ${gfdl}
todo-mode : $(buildinfodir)/todo-mode$(INFO_EXT)
$(buildinfodir)/todo-mode$(INFO_EXT): $(todo_mode_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/todo-mode.texi
todo-mode.dvi: $(todo_mode_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/todo-mode.texi
todo-mode.pdf: $(todo_mode_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/todo-mode.texi
todo-mode.html: $(todo_mode_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/todo-mode.texi
tramp_deps = ${srcdir}/tramp.texi ${srcdir}/trampver.texi ${gfdl}
tramp : $(buildinfodir)/tramp$(INFO_EXT)
$(buildinfodir)/tramp$(INFO_EXT): $(tramp_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi
tramp.dvi: $(tramp_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
tramp.pdf: $(tramp_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
tramp.html: $(tramp_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi
url_deps = ${srcdir}/url.texi ${gfdl}
url : $(buildinfodir)/url$(INFO_EXT)
$(buildinfodir)/url$(INFO_EXT): $(url_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/url.texi
url.dvi: $(url_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
url.pdf: $(url_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
url.html: $(url_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/url.texi
vhdl_mode_deps = ${srcdir}/vhdl-mode.texi ${gfdl}
vhdl-mode : $(buildinfodir)/vhdl-mode$(INFO_EXT)
$(buildinfodir)/vhdl-mode$(INFO_EXT): $(vhdl_mode_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/vhdl-mode.texi
vhdl-mode.dvi: $(vhdl_mode_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/vhdl-mode.texi
vhdl-mode.pdf: $(vhdl_mode_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/vhdl-mode.texi
vhdl-mode.html: $(vhdl_mode_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/vhdl-mode.texi
vip_deps = ${srcdir}/vip.texi ${gfdl}
vip : $(buildinfodir)/vip$(INFO_EXT)
$(buildinfodir)/vip$(INFO_EXT): $(vip_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/vip.texi
vip.dvi: $(vip_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
vip.pdf: $(vip_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
vip.html: $(vip_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/vip.texi
viper_deps = ${srcdir}/viper.texi ${gfdl}
viper : $(buildinfodir)/viper$(INFO_EXT)
$(buildinfodir)/viper$(INFO_EXT): $(viper_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/viper.texi
viper.dvi: $(viper_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
viper.pdf: $(viper_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
viper.html: $(viper_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/viper.texi
widget_deps = ${srcdir}/wisent.texi ${gfdl}
widget : $(buildinfodir)/widget$(INFO_EXT)
$(buildinfodir)/widget$(INFO_EXT): $(widget_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/widget.texi
widget.dvi: $(widget_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
widget.pdf: $(widget_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
widget.html: $(widget_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/widget.texi
wisent_deps = ${srcdir}/wisent.texi ${gfdl}
wisent : $(buildinfodir)/wisent$(INFO_EXT)
$(buildinfodir)/wisent$(INFO_EXT): $(wisent_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/wisent.texi
wisent.dvi: $(wisent_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/wisent.texi
wisent.pdf: $(wisent_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/wisent.texi
wisent.html: $(wisent_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/wisent.texi
woman_deps = ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl}
woman : $(buildinfodir)/woman$(INFO_EXT)
$(buildinfodir)/woman$(INFO_EXT): $(woman_deps)
$(mkinfodir)
$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/woman.texi
woman.dvi: $(woman_deps)
$(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
woman.pdf: $(woman_deps)
$(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi
woman.html: $(woman_deps)
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/woman.texi
.PHONY: mostlyclean clean distclean maintainer-clean
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
mostlyclean:
rm -f *.aux *.log *.toc *.c[mp] *.c[mp]s *.fn *.fns \
*.ky *.kys *.op *.ops *.p[gj] *.p[gj]s *.sc *.scs *.ss \
*.t[gp] *.t[gp]s *.vr *.vrs
rm -f gnustmp.*
rm -f gnustmp*
clean: mostlyclean
rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
@ -883,14 +231,14 @@ distclean: clean
## buildinfodir is relative to srcdir.
infoclean:
for file in $(INFO_TARGETS); do \
file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \
file=`echo $${file} | sed 's/\.info$$//'`.info; \
rm -f \
$(buildinfodir)/$${file} \
$(buildinfodir)/$${file}-[1-9] \
$(buildinfodir)/$${file}-[1-9][0-9]; \
done
maintainer-clean: distclean infoclean
bootstrap-clean maintainer-clean: distclean infoclean
dist:
rm -rf emacs-misc-${version}
@ -904,7 +252,6 @@ dist:
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \
-e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
${srcdir}/Makefile.in > emacs-misc-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \

2
doc/misc/ada-mode.texi
View file

@ -1,5 +1,5 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/ada-mode
@setfilename ../../info/ada-mode.info
@settitle Ada Mode
@documentencoding UTF-8

2
doc/misc/auth.texi
View file

@ -4,7 +4,7 @@
@set VERSION 0.3
@setfilename ../../info/auth
@setfilename ../../info/auth.info
@settitle Emacs auth-source Library @value{VERSION}
@documentencoding UTF-8

9
doc/misc/autotype.texi
View file

@ -1,7 +1,7 @@
\input texinfo
@c This is an annex of the Emacs manual.
@c Author: Daniel Pfeiffer <Daniel.Pfeiffer@Informatik.START.dbp.de>
@setfilename ../../info/autotype
@setfilename ../../info/autotype.info
@c @node Autotypist, Picture, Abbrevs, Top
@c @chapter Features for Automatic Typing
@settitle Features for Automatic Typing
@ -232,8 +232,11 @@ Insert string or character. Literal strings and characters are passed through
@code{skeleton-transformation} when that is non-@code{nil}.
@item @code{?\n}
@c ??? something seems very wrong here.
Insert a newline and align under current line. Use newline character
@code{?\n} to prevent alignment.
Insert a newline and align under current line, but not if this is the
last element of a skeleton and the newline would be inserted at end of
line. Use newline character @code{?\n} to prevent alignment. Use
@code{"\n"} as the last string element of a skeleton to insert a
newline after the skeleton unconditionally.
@item @code{_}
Interesting point. When wrapping skeletons around successive regions, they are
put at these places. Point is left at first @code{_} where nothing is wrapped.

2
doc/misc/bovine.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename ../../info/bovine
@setfilename ../../info/bovine.info
@set TITLE Bovine parser development
@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
@settitle @value{TITLE}

6
doc/misc/calc.texi
View file

@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@comment %**start of header (This is for running Texinfo on a region.)
@c smallbook
@setfilename ../../info/calc
@setfilename ../../info/calc.info
@c [title]
@settitle GNU Emacs Calc Manual
@documentencoding UTF-8
@ -21624,7 +21624,7 @@ to
@noindent
Every character not part of the sub-formula @samp{b} has been changed
to a dot. (If the customizable variable
@code{calc-highlight-selections-with-faces} is non-nil, then the characters
@code{calc-highlight-selections-with-faces} is non-@code{nil}, then the characters
not part of the sub-formula are de-emphasized by using a less
noticeable face instead of using dots. @pxref{Displaying Selections}.)
The @samp{*} next to the line number is to remind you that
@ -21858,7 +21858,7 @@ by @samp{#} signs:
@end group
@end smallexample
If the customizable variable
@code{calc-highlight-selections-with-faces} is non-nil, then the
@code{calc-highlight-selections-with-faces} is non-@code{nil}, then the
non-selected portion of the formula will be de-emphasized by using a
less noticeable face (@code{calc-nonselected-face}) instead of dots
and the selected sub-formula will be highlighted by using a more

8
doc/misc/cc-mode.texi
View file

@ -81,7 +81,7 @@ the second with them pointing to the XEmacs manuals.
@comment No overfull hbox marks in the dvi file.
@finalout
@setfilename ../../info/ccmode
@setfilename ../../info/ccmode.info
@settitle CC Mode Manual
@documentencoding UTF-8
@footnotestyle end
@ -3915,7 +3915,7 @@ Conceptually, a line of code is always indented relative to some
position higher up in the buffer (typically the indentation of the
previous line). That position is the @dfn{anchor position} in the
syntactic element. If there is an entry after the syntactic symbol in
the syntactic element list then it's either nil or that anchor position.
the syntactic element list then it's either @code{nil} or that anchor position.
Here is an example. Suppose we had the following code as the only thing
in a C++ buffer @footnote{The line numbers in this and future examples
@ -6067,7 +6067,7 @@ suggestion to get a consistent style):
@defun c-lineup-assignments
@findex lineup-assignments (c-)
Line up the current line after the assignment operator on the first line
in the statement. If there isn't any, return nil to allow stacking with
in the statement. If there isn't any, return @code{nil} to allow stacking with
other line-up functions. If the current line contains an assignment
operator too, try to align it with the first one.
@ -6532,7 +6532,7 @@ Return the syntactic symbol in @var{langelem}.
@defun c-langelem-pos langelem
@findex langelem-pos (c-)
Return the anchor position in @var{langelem}, or nil if there is none.
Return the anchor position in @var{langelem}, or @code{nil} if there is none.
@end defun
@defun c-langelem-col langelem &optional preserve-point

2
doc/misc/cl.texi
View file

@ -1,5 +1,5 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/cl
@setfilename ../../info/cl.info
@settitle Common Lisp Extensions
@documentencoding UTF-8
@include emacsver.texi

6
doc/misc/dbus.texi
View file

@ -1,5 +1,5 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/dbus
@setfilename ../../info/dbus.info
@c %**start of header
@settitle Using of D-Bus
@documentencoding UTF-8
@ -1060,11 +1060,11 @@ elements of this array. Example:
"" ;; No icon.
"Notification summary" ;; Summary.
(format ;; Body.
"This is a test notification, raised from %s" (emacs-version))
"This is a test notification, raised from\n%S" (emacs-version))
'(:array) ;; No actions (empty array of strings).
'(:array :signature "@{sv@}") ;; No hints
;; (empty array of dictionary entries).
:int32 -1) ;; Default timeout.
:int32 -1) ;; Default timeout.
@result{} 3
@end lisp

2
doc/misc/dired-x.texi
View file

@ -7,7 +7,7 @@
@c [Dodd's address no longer valid.]
@comment %**start of header (This is for running Texinfo on a region.)
@setfilename ../../info/dired-x
@setfilename ../../info/dired-x.info
@settitle Dired Extra User's Manual
@documentencoding UTF-8

10
doc/misc/ebrowse.texi
View file

@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@comment %**start of header
@setfilename ../../info/ebrowse
@setfilename ../../info/ebrowse.info
@settitle A Class Browser for C++
@documentencoding UTF-8
@setchapternewpage odd
@ -475,13 +475,13 @@ You can view or find a class declaration when the cursor is on a class
name.
@table @kbd
@item SPC
@item @key{SPC}
This command views the class declaration if the database
contains information about it. If you don't parse the entire source
you are working on, some classes will only be known to exist but the
location of their declarations and definitions will not be known.
@item RET
@item @key{RET}
Works like @kbd{SPC}, except that it finds the class
declaration rather than viewing it, so that it is ready for
editing.
@ -876,7 +876,7 @@ context menu.
@cindex declaration of a member, in member buffers
@table @kbd
@item RET
@item @key{RET}
This command finds the definition of the member the cursor is on.
Finding involves roughly the same as the standard Emacs tags facility
does---loading the file and searching for a regular expression matching
@ -885,7 +885,7 @@ the member.
@item f
This command finds the declaration of the member the cursor is on.
@item SPC
@item @key{SPC}
This is the same command as @kbd{RET}, but views the member definition
instead of finding the member's source file.

20
doc/misc/ede.texi
View file

@ -1,5 +1,5 @@
\input texinfo
@setfilename ../../info/ede
@setfilename ../../info/ede.info
@settitle Emacs Development Environment
@documentencoding UTF-8
@ -1200,7 +1200,7 @@ until one of them returns true. The method
from the autoload. If it is a string (i.e., a project file name), it
checks to see if that exists in BUFFER's directory. If it is a
function, then it calls that function and expects it to return a file
name or nil. If the file exists, then this directory is assumed to be
name or @code{nil}. If the file exists, then this directory is assumed to be
part of a project, and @code{ede-directory-project-p} returns the
instance of @code{ede-project-autoload} that matched.
@ -1275,11 +1275,11 @@ Return a string that is the name of the target used by a Make system.
A brief description of the project or target. This is currently used
by the @samp{ede-speedbar} interface.
@item ede-want-file-p
Return non-nil if a target will accept a given file.
Return non-@code{nil} if a target will accept a given file.
It is generally unnecessary to override this. See the section on source
code.
@item ede-buffer-mine
Return non-nil if a buffer belongs to this target. Used during
Return non-@code{nil} if a buffer belongs to this target. Used during
association when a file is loaded. It is generally unnecessary to
override this unless you keep auxiliary files.
@end table
@ -1614,7 +1614,7 @@ Provide a speedbar description for @var{OBJ}.
@end deffn
@deffn Method ede-map-any-target-p :AFTER this proc
For project @var{THIS}, map @var{PROC} to all targets and return if any non-nil.
For project @var{THIS}, map @var{PROC} to all targets and return if any non-@code{nil}.
Return the first non-@code{nil} value returned by @var{PROC}.
@end deffn
@ -1768,7 +1768,7 @@ If @var{TARGET} belongs to a subproject, return that project file.
@end deffn
@deffn Method ede-find-target :AFTER proj buffer
Fetch the target in @var{PROJ} belonging to @var{BUFFER} or nil.
Fetch the target in @var{PROJ} belonging to @var{BUFFER} or @code{nil}.
@end deffn
@deffn Method ede-add-subproject :AFTER proj-a proj-b
@ -1884,8 +1884,8 @@ The function symbol must take two arguments:
NAME - The name of the file to find.
DIR - The directory root for this cpp-root project.
It should return the fully qualified file name passed in from NAME@. If that file does not
exist, it should return nil.
It should return the fully qualified file name passed in from NAME@.
If that file does not exist, it should return @code{nil}.
@end table
@ -2047,7 +2047,7 @@ Default Value: @code{nil}
Non-@code{nil} if this is a metasubproject.
Usually, a subproject is determined by a parent project. If multiple top level
projects are grouped into a large project not maintained by EDE, then you need
to set this to non-nil. The only effect is that the @code{dist} rule will then avoid
to set this to non-@code{nil}. The only effect is that the @code{dist} rule will then avoid
making a tar file.
@end table
@ -2281,7 +2281,7 @@ Default Value: @code{nil}
Non-@code{nil} if this is a metasubproject.
Usually, a subproject is determined by a parent project. If multiple top level
projects are grouped into a large project not maintained by EDE, then you need
to set this to non-nil. The only effect is that the @code{dist} rule will then avoid
to set this to non-@code{nil}. The only effect is that the @code{dist} rule will then avoid
making a tar file.
@end table

2
doc/misc/ediff.texi
View file

@ -7,7 +7,7 @@
@comment Using ediff.info instead of ediff in setfilename breaks DOS.
@comment @setfilename ediff
@comment @setfilename ediff.info
@setfilename ../../info/ediff
@setfilename ../../info/ediff.info
@settitle Ediff User's Manual
@documentencoding UTF-8

2
doc/misc/edt.texi
View file

@ -1,5 +1,5 @@
\input texinfo
@setfilename ../../info/edt
@setfilename ../../info/edt.info
@settitle EDT Emulation for Emacs
@documentencoding UTF-8

10
doc/misc/efaq-w32.texi
View file

@ -1,5 +1,5 @@
\input texinfo @c -*-coding:utf-8 -*-
@setfilename efaq-w32
@setfilename ../../info/efaq-w32.info
@settitle GNU Emacs FAQ For MS Windows
@setchapternewpage odd
@syncodeindex pg cp
@ -1176,8 +1176,8 @@ Place the following in your init file:
@cindex font menu, adding fonts
@vindex w32-fixed-font-alist
If you have set w32-use-w32-font-dialog to nil, you can add fonts to
the font menu by changing `w32-fixed-font-alist'. For example:
If you have set w32-use-w32-font-dialog to @code{nil}, you can add fonts to
the font menu by changing @code{w32-fixed-font-alist}. For example:
@example
(setq w32-fixed-font-alist
@ -1664,8 +1664,8 @@ smtpmail is loaded, then you'll need to change
@code{smtpmail-smtp-server}.
If you are experiencing problems with sending large messages, check
the value of the variable @code{smtpmail-debug-info}. If it is non-nil, you
should set it to @code{nil}:
the value of the variable @code{smtpmail-debug-info}. If it is
non-@code{nil}, you should set it to @code{nil}:
@node Incoming mail with Rmail
@subsection Incoming mail with Rmail and POP3

8
doc/misc/efaq.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*- mode: texinfo; -*-
@c %**start of header
@setfilename ../../info/efaq
@setfilename ../../info/efaq.info
@settitle GNU Emacs FAQ
@documentencoding UTF-8
@c %**end of header
@ -1944,7 +1944,7 @@ automatically scrolls the display horizontally when point moves off the
left or right edge of the window.
Note that this is overridden by the variable
@code{truncate-partial-width-windows} if that variable is non-nil
@code{truncate-partial-width-windows} if that variable is non-@code{nil}
and the current buffer is not full-frame width.
In Emacs 20, use @code{hscroll-mode}.
@ -3264,8 +3264,8 @@ archive sites that make GNU software available.
First of all, you should check to make sure that the package isn't
already available. For example, typing @kbd{M-x apropos @key{RET}
wordstar @key{RET}} lists all functions and variables containing the
string @samp{wordstar}.
python @key{RET}} lists all functions and variables containing the
string @samp{python}.
It is also possible that the package is on your system, but has not been
loaded. To see which packages are available for loading, look through

10
doc/misc/eieio.texi
View file

@ -1,5 +1,5 @@
\input texinfo
@setfilename ../../info/eieio
@setfilename ../../info/eieio.info
@set TITLE Enhanced Implementation of Emacs Interpreted Objects
@set AUTHOR Eric M. Ludlam
@settitle @value{TITLE}
@ -306,7 +306,7 @@ or is of a subclass of @var{CLASS-NAME}.
@end defun
@defvar eieio-error-unsupported-class-tags
If non-nil, @code{defclass} signals an error if a tag in a slot
If non-@code{nil}, @code{defclass} signals an error if a tag in a slot
specifier is unsupported.
This option is here to support programs written with older versions of
@ -471,7 +471,7 @@ Here are some examples:
@item my-class-name
An object of your class type.
@item (or null symbol)
A symbol, or nil.
A symbol, or @code{nil}.
@end table
@item :allocation
@ -573,7 +573,7 @@ prefixed by the @code{:documentation} tag, and appears after the list
of slots, and before the options.
@item :allow-nil-initform
If this option is non-nil, and the @code{:initform} is @code{nil}, but
If this option is non-@code{nil}, and the @code{:initform} is @code{nil}, but
the @code{:type} is specifies something such as @code{string} then allow
this to pass. The default is to have this option be off. This is
implemented as an alternative to unbound slots.
@ -1264,7 +1264,7 @@ Return the list of public slots for @var{obj}.
@defun class-slot-initarg class slot
For the given @var{class} return the :initarg associated with
@var{slot}. Not all slots have initargs, so the return value can be
nil.
@code{nil}.
@end defun
@node Base Classes

4
doc/misc/emacs-gnutls.texi
View file

@ -2,7 +2,7 @@
@set VERSION 0.3
@setfilename ../../info/emacs-gnutls
@setfilename ../../info/emacs-gnutls.info
@settitle Emacs GnuTLS Integration @value{VERSION}
@documentencoding UTF-8
@ -94,7 +94,7 @@ There's one way to find out if GnuTLS is available, by calling
Zaretskii) in the same directory as Emacs, you should be OK.
@defun gnutls-available-p
This function returns t if GnuTLS is available in this instance of Emacs.
This function returns @code{t} if GnuTLS is available in this instance of Emacs.
@end defun
Oh, but sometimes things go wrong. Budgets aren't balanced,

2
doc/misc/emacs-mime.texi
View file

@ -2,7 +2,7 @@
@include gnus-overrides.texi
@setfilename ../../info/emacs-mime
@setfilename ../../info/emacs-mime.info
@settitle Emacs MIME Manual
@synindex fn cp
@synindex vr cp

2
doc/misc/epa.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*- mode: texinfo -*-
@c %**start of header
@setfilename ../../info/epa
@setfilename ../../info/epa.info
@settitle EasyPG Assistant User's Manual
@documentencoding UTF-8
@c %**end of header

4
doc/misc/erc.texi
View file

@ -1,6 +1,6 @@
\input texinfo
@c %**start of header
@setfilename ../../info/erc
@setfilename ../../info/erc.info
@settitle ERC Manual
@syncodeindex fn cp
@include emacsver.texi
@ -150,7 +150,7 @@ then a bunch of other messages that describe the current IRC server.
@item Join the #emacs channel
In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}. Depending
In that buffer, type ``/join @key{SPC} #emacs'' and hit @kbd{RET}. Depending
on how you've set up ERC, either a new buffer for ``#emacs'' will be
displayed, or a new buffer called ``#emacs'' will be created in the
background. If the latter, switch to the ``#emacs'' buffer. You will

16
doc/misc/ert.texi
View file

@ -1,6 +1,6 @@
\input texinfo
@c %**start of header
@setfilename ../../info/ert
@setfilename ../../info/ert.info
@settitle Emacs Lisp Regression Testing
@documentencoding UTF-8
@c %**end of header
@ -139,8 +139,7 @@ An ERT test definition equivalent to the above comments is this:
If you know @code{defun}, the syntax of @code{ert-deftest} should look
familiar: This example defines a test named @code{pp-test-quote} that
will pass if the three calls to @code{equal} all return true
(non-nil).
will pass if the three calls to @code{equal} all return non-@code{nil}.
@code{should} is a macro with the same meaning as @code{cl-assert} but
better error reporting. @xref{The @code{should} Macro}.
@ -315,7 +314,8 @@ tests or symbols naming tests.
@item @code{(tag TAG)} selects all tests that have TAG on their tags list.
(Tags are optional labels you can apply to tests when you define them.)
@item @code{(satisfies PREDICATE)} selects all tests that satisfy PREDICATE,
a function that takes a test as argument and returns non-nil if it is selected.
a function that takes a test as argument and returns non-@code{nil} if
it is selected.
@end itemize
Selectors that are frequently useful when selecting tests to run
@ -382,13 +382,13 @@ F addition-test
@end example
In this example, @code{should} recorded the fact that (= (+ 1 2) 4)
reduced to (= 3 4) before it reduced to nil. When debugging why the
reduced to (= 3 4) before it reduced to @code{nil}. When debugging why the
test failed, it helps to know that the function @code{+} returned 3
here. ERT records the return value for any predicate called directly
within @code{should}.
In addition to @code{should}, ERT provides @code{should-not}, which
checks that the predicate returns nil, and @code{should-error}, which
checks that the predicate returns @code{nil}, and @code{should-error}, which
checks that the form called within it signals an error. An example
use of @code{should-error}:
@ -531,7 +531,7 @@ Instead, it is better to use lower-level mechanisms with simple and
predictable semantics like @code{with-temp-buffer}, @code{insert} or
@code{insert-file-contents-literally}, and to activate any desired mode
by calling the corresponding function directly, after binding the
hook variables to nil. This avoids the above problems.
hook variables to @code{nil}. This avoids the above problems.
@node Useful Techniques
@ -761,7 +761,7 @@ the arguments given to the explanation function, returns the value
that it returns. The explanation can be any object but should have a
comprehensible printed representation. If the return value of the
predicate needs no explanation for a given list of arguments, the
explanation function should return nil.
explanation function should return @code{nil}.
To associate an explanation function with a predicate, add the
property @code{ert-explainer} to the symbol that names the predicate.

6
doc/misc/eshell.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename ../../info/eshell
@setfilename ../../info/eshell.info
@settitle Eshell: The Emacs Shell
@defindex cm
@synindex vr fn
@ -676,8 +676,8 @@ You can, of course, define your own virtual targets. They are defined
by adding a list of the form @samp{("/dev/name" @var{function} @var{mode})} to
@code{eshell-virtual-targets}. The first element is the device name;
@var{function} may be either a lambda or a function name. If
@var{mode} is nil, then the function is the output function; if it is
non-nil, then the function is passed the redirection mode as a
@var{mode} is @code{nil}, then the function is the output function; if it is
non-@code{nil}, then the function is passed the redirection mode as a
symbol--@code{overwrite} for @code{>}, @code{append} for @code{>>}, or
@code{insert} for @code{>>>}--and the function is expected to return
the output function.

2
doc/misc/eudc.texi
View file

@ -1,6 +1,6 @@
\input texinfo.tex
@c %**start of header
@setfilename ../../info/eudc
@setfilename ../../info/eudc.info
@settitle Emacs Unified Directory Client (EUDC) Manual
@afourpaper
@documentencoding UTF-8

2
doc/misc/eww.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename ../../info/eww
@setfilename ../../info/eww.info
@settitle Emacs Web Wowser
@documentencoding UTF-8
@c %**end of header

2
doc/misc/flymake.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@comment %**start of header
@setfilename ../../info/flymake
@setfilename ../../info/flymake.info
@set VERSION 0.3
@set UPDATED April 2004
@settitle GNU Flymake @value{VERSION}

2
doc/misc/forms.texi
View file

@ -3,7 +3,7 @@
@c Written by Johan Vromans, and edited by Richard Stallman
@comment %**start of header (This is for running Texinfo on a region.)
@setfilename ../../info/forms
@setfilename ../../info/forms.info
@settitle Forms Mode User's Manual
@syncodeindex vr cp
@syncodeindex fn cp

2
doc/misc/gnus-coding.texi
View file

@ -1,6 +1,6 @@
\input texinfo
@setfilename gnus-coding
@setfilename gnus-coding.info
@settitle Gnus Coding Style and Maintenance Guide
@documentencoding UTF-8
@syncodeindex fn cp

66
doc/misc/gnus-faq.texi
View file

@ -377,7 +377,7 @@ but it only says "nntp (news) open error", what to do?
You've got to tell Gnus where to fetch the news from. Read
the documentation for information on how to do this. As a
first start, put those lines in ~/.gnus.el:
first start, put those lines in @file{~/.gnus.el}:
@example
(setq gnus-select-method '(nntp "news.yourprovider.net"))
@ -389,7 +389,7 @@ first start, put those lines in ~/.gnus.el:
@node FAQ 3-2
@subsubheading Question 3.2
I'm working under Windows and have no idea what ~/.gnus.el means.
I'm working under Windows and have no idea what @file{~/.gnus.el} means.
@subsubheading Answer
@ -421,7 +421,7 @@ to Control Panel -> System -> Advanced). There you'll find the
possibility to set environment variables. Create a new one with
name HOME and value C:\myhome. Rebooting is not necessary.
Now to create ~/.gnus.el, say
Now to create @file{~/.gnus.el}, say
@samp{C-x C-f ~/.gnus.el RET C-x C-s}.
in Emacs.
@ -495,7 +495,7 @@ I want Gnus to fetch news from several servers, is this possible?
Of course. You can specify more sources for articles in the
variable gnus-secondary-select-methods. Add something like
this in ~/.gnus.el:
this in @file{~/.gnus.el}:
@example
(add-to-list 'gnus-secondary-select-methods
@ -566,7 +566,7 @@ commonly used one is nnml. It stores every mail in one file
and is therefore quite fast. However you might prefer a one
file per group approach if your file system has problems with
many small files, the nnfolder back end is then probably the
choice for you. To use nnml add the following to ~/.gnus.el:
choice for you. To use nnml add the following to @file{~/.gnus.el}:
@example
(add-to-list 'gnus-secondary-select-methods '(nnml ""))
@ -591,7 +591,7 @@ it's a POP3 server, then you need something like this:
@end example
@noindent
Make sure ~/.gnus.el isn't readable to others if you store
Make sure @file{~/.gnus.el} isn't readable to others if you store
your password there. If you want to read your mail from a
traditional spool file on your local machine, it's
@ -630,7 +630,7 @@ OK, now you only need to tell Gnus how to send mail. If you
want to send mail via sendmail (or whichever MTA is playing
the role of sendmail on your system), you don't need to do
anything. However, if you want to send your mail to an
SMTP Server you need the following in your ~/.gnus.el
SMTP Server you need the following in your @file{~/.gnus.el}
@example
(setq send-mail-function 'smtpmail-send-it)
@ -650,7 +650,7 @@ There are two ways of using IMAP with Gnus. The first one is
to use IMAP like POP3, that means Gnus fetches the mail from
the IMAP server and stores it on disk. If you want to do
this (you don't really want to do this) add the following to
~/.gnus.el
@file{~/.gnus.el}
@example
(add-to-list 'mail-sources '(imap :server "mail.mycorp.com"
@ -765,7 +765,7 @@ Loading only unread messages can be annoying if you have threaded view enabled,
@end example
@noindent
in ~/.gnus.el to load enough old articles to prevent teared threads, replace 'some with t to load
in @file{~/.gnus.el} to load enough old articles to prevent teared threads, replace 'some with @code{t} to load
all articles (Warning: Both settings enlarge the amount of data which is
fetched when you enter a group and slow down the process of entering a group).
@ -829,7 +829,7 @@ The variable gnus-visible-headers controls which headers
are shown, its value is a regular expression, header lines
which match it are shown. So if you want author, subject,
date, and if the header exists, Followup-To and MUA / NUA
say this in ~/.gnus.el:
say this in @file{~/.gnus.el}:
@example
(setq gnus-visible-headers
@ -856,7 +856,7 @@ Say
@end example
@noindent
in ~/.gnus.el. If you don't want HTML rendered, even if there's no text alternative add
in @file{~/.gnus.el}. If you don't want HTML rendered, even if there's no text alternative add
@example
(setq mm-automatic-display (remove "text/html" mm-automatic-display))
@ -970,7 +970,7 @@ adaptive scoring say
@end example
@noindent
in ~/.gnus.el.
in @file{~/.gnus.el}.
@node FAQ 4-10
@subsubheading Question 4.10
@ -985,7 +985,7 @@ While in group buffer move point over the group and hit
can set options for the group. At the bottom of the buffer
you'll find an item that allows you to set variables
locally for the group. To disable threading enter
gnus-show-threads as name of variable and nil as
gnus-show-threads as name of variable and @code{nil} as
value. Hit button done at the top of the buffer when
you're ready.
@ -1147,7 +1147,7 @@ don't want that (you probably don't want), say
@end example
@noindent
in ~/.gnus.el.
in @file{~/.gnus.el}.
An example might be better than thousand words, so here's
my nnmail-split-methods. Note that I send duplicates in a
@ -1269,7 +1269,7 @@ For other versions of Gnus, say
@end example
@noindent
in ~/.gnus.el.
in @file{~/.gnus.el}.
You can reformat a paragraph by hitting @samp{M-q}
(as usual).
@ -1303,7 +1303,7 @@ following lists are signature, signature-file,
organization, address, name or body. The attribute name
can also be a string. In that case, this will be used as
a header name, and the value will be inserted in the
headers of the article; if the value is `nil', the header
headers of the article; if the value is @code{nil}, the header
name will be removed. You can also say (eval (foo bar)),
then the function foo will be evaluated with argument bar
and the result will be thrown away.
@ -1395,7 +1395,7 @@ If you want your outgoing messages to be spell-checked, say
@end example
@noindent
In your ~/.gnus.el, if you prefer on-the-fly spell-checking say
In your @file{~/.gnus.el}, if you prefer on-the-fly spell-checking say
@example
(add-hook 'message-mode-hook (lambda () (flyspell-mode 1)))
@ -1423,7 +1423,7 @@ Yes, say something like
@end example
@noindent
in ~/.gnus.el. Change "^de\\." and "deutsch8" to something
in @file{~/.gnus.el}. Change "^de\\." and "deutsch8" to something
that suits your needs.
@node FAQ 5-7
@ -1452,7 +1452,7 @@ details.
However, what you really want is the Insidious Big Brother
Database bbdb. Get it through the XEmacs package system or from
@uref{http://bbdb.sourceforge.net/, bbdb's homepage}.
Now place the following in ~/.gnus.el, to activate bbdb for Gnus:
Now place the following in @file{~/.gnus.el}, to activate bbdb for Gnus:
@example
(require 'bbdb)
@ -1532,7 +1532,7 @@ Now you only have to tell Gnus to include the X-face in your postings by saying
@end example
@noindent
in ~/.gnus.el. If you use Gnus 5.10, you can simply add an entry
in @file{~/.gnus.el}. If you use Gnus 5.10, you can simply add an entry
@example
(x-face-file "~/.xface")
@ -1550,7 +1550,7 @@ newsgroups?
@subsubheading Answer
Put this in ~/.gnus.el:
Put this in @file{~/.gnus.el}:
@example
(setq gnus-confirm-mail-reply-to-news t)
@ -1580,7 +1580,7 @@ How to tell Gnus not to generate a sender header?
@subsubheading Answer
Since 5.10 Gnus doesn't generate a sender header by
default. For older Gnus' try this in ~/.gnus.el:
default. For older Gnus' try this in @file{~/.gnus.el}:
@example
(eval-after-load "message"
@ -1645,7 +1645,7 @@ by saying:
@end example
@noindent
in ~/.gnus.el. If you use Gnus 5.9 or earlier, you can use this
in @file{~/.gnus.el}. If you use Gnus 5.9 or earlier, you can use this
instead (works for newer versions as well):
@example
@ -1745,7 +1745,7 @@ by saying @samp{O f}. However, wouldn't
it be much more convenient to have more direct access to
the archived message from Gnus? If you say yes, put this
snippet by Frank Haun <pille3003@@fhaun.de> in
~/.gnus.el:
@file{~/.gnus.el}:
@example
(defun my-archive-article (&optional n)
@ -1898,7 +1898,7 @@ to another group.
@subsubheading Answer
Say something like this in ~/.gnus.el:
Say something like this in @file{~/.gnus.el}:
@example
(setq nnmail-expiry-target "nnml:expired")
@ -1980,7 +1980,7 @@ The Gnus agent is part of Gnus, it allows you to fetch
mail and news and store them on disk for reading them
later when you're offline. It kind of mimics offline
newsreaders like Forte Agent. If you want to use
the Agent place the following in ~/.gnus.el if you are
the Agent place the following in @file{~/.gnus.el} if you are
still using 5.8.8 or 5.9 (it's the default since 5.10):
@example
@ -2175,13 +2175,13 @@ Starting Gnus is really slow, how to speed it up?
The reason for this could be the way Gnus reads its
active file, see the node "The Active File" in the Gnus
manual for things you might try to speed the process up.
An other idea would be to byte compile your ~/.gnus.el (say
An other idea would be to byte compile your @file{~/.gnus.el} (say
@samp{M-x byte-compile-file RET ~/.gnus.el
RET} to do it). Finally, if you have require
statements in your .gnus, you could replace them with
eval-after-load, which loads the stuff not at startup
time, but when it's needed. Say you've got this in your
~/.gnus.el:
@file{~/.gnus.el}:
@example
(require 'message)
@ -2208,7 +2208,7 @@ How to speed up the process of entering a group?
@subsubheading Answer
A speed killer is setting the variable
gnus-fetch-old-headers to anything different from nil,
gnus-fetch-old-headers to anything different from @code{nil},
so don't do this if speed is an issue. To speed up
building of summary say
@ -2217,7 +2217,7 @@ building of summary say
@end example
@noindent
at the bottom of your ~/.gnus.el, this will make gnus
at the bottom of your @file{~/.gnus.el}, this will make gnus
byte-compile things like
gnus-summary-line-format.
then you could increase the value of gc-cons-threshold
@ -2237,7 +2237,7 @@ recent GNU Emacs, you should say
@end example
@noindent
in ~/.gnus.el (thanks to Jesper harder for the last
in @file{~/.gnus.el} (thanks to Jesper harder for the last
two suggestions). Finally if you are still using 5.8.8
or 5.9 and experience speed problems with summary
buffer generation, you definitely should update to
@ -2263,8 +2263,8 @@ to normal speed.
@table @dfn
@item ~/.gnus.el
When the term ~/.gnus.el is used it just means your Gnus
configuration file. You might as well call it ~/.gnus or
When the term @file{~/.gnus.el} is used it just means your Gnus
configuration file. You might as well call it @file{~/.gnus} or
specify another name.
@item Back End

19
doc/misc/gnus.texi
View file

@ -2,7 +2,7 @@
@include gnus-overrides.texi
@setfilename ../../info/gnus
@setfilename ../../info/gnus.info
@settitle Gnus Manual
@syncodeindex fn cp
@syncodeindex vr cp
@ -12537,7 +12537,7 @@ you're in, you could say something like the following:
Modify to suit your needs.
@vindex gnus-message-highlight-citation
If @code{gnus-message-highlight-citation} is t, different levels of
If @code{gnus-message-highlight-citation} is @code{t}, different levels of
citations are highlighted like in Gnus article buffers also in message
mode buffers.
@ -20487,7 +20487,7 @@ matches. This takes a long time in big groups.
You can inhibit this slow scoring on headers or body by setting the
variable @code{gnus-inhibit-slow-scoring}. If
@code{gnus-inhibit-slow-scoring} is regexp, slow scoring is inhibited if
the group matches the regexp. If it is t, slow scoring on it is
the group matches the regexp. If it is @code{t}, slow scoring on it is
inhibited for all groups.
Now, there's not much you can do about the slowness for news groups, but for
@ -21414,18 +21414,19 @@ three items unique to nnir summary buffers:
%g Article original short group name (string)
@end example
If nil (the default) this will use @code{gnus-summary-line-format}.
If @code{nil} (the default) this will use @code{gnus-summary-line-format}.
@item nnir-retrieve-headers-override-function
If non-nil, a function that retrieves article headers rather than using
If non-@code{nil}, a function that retrieves article headers rather than using
the gnus built-in function. This function takes an article list and
group as arguments and populates the `nntp-server-buffer' with the
retrieved headers. It should then return either 'nov or 'headers
indicating the retrieved header format. Failure to retrieve headers
should return @code{nil}.
If this variable is nil, or if the provided function returns nil for a
search result, @code{gnus-retrieve-headers} will be called instead."
If this variable is @code{nil}, or if the provided function returns
@code{nil} for a search result, @code{gnus-retrieve-headers} will be
called instead."
@end table
@ -21928,7 +21929,7 @@ original article yet, @code{nnmairix} will use an additional mairix
search for determining the file name of the article. This, of course, is
way slower than the registry---if you set hundreds or even thousands of
marks this way, it might take some time. You can avoid this situation by
setting @code{nnmairix-only-use-registry} to t.
setting @code{nnmairix-only-use-registry} to @code{t}.
Maybe you also want to propagate marks the other way round, i.e., if you
tick an article in a "real" mail group, you'd like to have the same
@ -24874,7 +24875,7 @@ classified as spammers.
While @code{spam-use-BBDB-exclusive} @emph{can} be used as an alias
for @code{spam-use-BBDB} as far as @code{spam.el} is concerned, it is
@emph{not} a separate back end. If you set
@code{spam-use-BBDB-exclusive} to t, @emph{all} your BBDB splitting
@code{spam-use-BBDB-exclusive} to @code{t}, @emph{all} your BBDB splitting
will be exclusive.
@end defvar

6
doc/misc/htmlfontify.texi
View file

@ -1,6 +1,6 @@
\input texinfo
@comment %**start of header
@setfilename ../../info/htmlfontify
@setfilename ../../info/htmlfontify.info
@settitle Htmlfontify User Manual
@exampleindent 2
@documentencoding UTF-8
@ -792,7 +792,7 @@ See: @ref{hfy-link-style-fun}.
@end lisp
Given @var{props}, a list of text-properties, return the value of the
face property, or nil.
face property, or @code{nil}.
@item hfy-box-to-border-assoc
@findex hfy-box-to-border-assoc
@ -824,7 +824,7 @@ with a class of @code{t} is considered to match any class you specify.
This matches Emacs's behavior when deciding on which face attributes to
use, to the best of my understanding ).
If @var{class} is nil, then you just get get whatever
If @var{class} is @code{nil}, then you just get get whatever
@code{face-attr-construct} returns; i.e., the current specification in
effect for @var{face}.

4
doc/misc/idlwave.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename ../../info/idlwave
@setfilename ../../info/idlwave.info
@settitle IDLWAVE User Manual
@synindex ky cp
@syncodeindex vr cp
@ -1645,7 +1645,7 @@ of completed words.
@defopt idlwave-completion-force-default-case (@code{nil})
Non-@code{nil} means completion will always honor the settings in
@code{idlwave-completion-case}. When nil (the default), entirely lower
@code{idlwave-completion-case}. When @code{nil} (the default), entirely lower
case strings will always be completed to lower case, no matter what the
settings in @code{idlwave-completion-case}.
@end defopt

2
doc/misc/ido.texi
View file

@ -1,5 +1,5 @@
\input texinfo @c -*-texinfo-*-
@setfilename ../../info/ido
@setfilename ../../info/ido.info
@settitle Interactive Do
@documentencoding UTF-8
@include emacsver.texi

50
doc/misc/info.texi
View file

@ -151,19 +151,22 @@ Since your terminal has a relatively small number of lines on its
screen, it is necessary to give you special advice at the beginning.
If the entire text you are looking at fits on the screen, the text
@samp{All} will be displayed at the bottom of the screen. In the
stand-alone Info reader, it is displayed at the bottom right corner of
the screen; in Emacs, it is displayed on the modeline. If you see the
text @samp{Top} instead, it means that there is more text below that
does not fit. To move forward through the text and see another screen
full, press @key{SPC}, the Space bar. To move back up, press the key
@samp{All} will be displayed near the bottom of the screen, on the
mode line (usually, the line in inverse video). If you see the text
@samp{Top} instead, it means that there is more text below that does
not fit. To move forward through the text and see another screenful,
press @key{SPC}, the Space bar. To move back up, press the key
labeled @samp{Backspace} or @samp{DEL} (on some keyboards, this key
might be labeled @samp{Delete}), or @key{S-SPC}.
might be labeled @samp{Delete}). In a graphical Emacs, you can also use
@kbd{S-@key{SPC}} (press and hold the @key{Shift} key and then press
@key{SPC}) to move backwards, but this does not work in the
stand-alone Info reader (nor in Emacs, if you are using it in a
text-mode terminal).
@ifinfo
Here are 40 lines of junk, so you can try @key{SPC} and @key{DEL} (or
@key{S-SPC}) and see what they do. At the end are instructions of
what you should do next.
Here are 40 lines of junk, so you can try @key{SPC} and @key{DEL} and
see what they do. At the end are instructions of what you should do
next.
@format
This is line 20
@ -209,11 +212,11 @@ This is line 59
@end format
If you have managed to get here, go back to the beginning with
@kbd{DEL} (or @key{S-SPC}), and come back here again, then you
understand the about the @samp{Space} and @samp{Backspace} keys. So
now type an @kbd{n}---just one character; don't type the quotes and
don't type the Return key afterward---to get to the normal start of
the course.
@key{DEL} (or @key{BACKSPACE}), and come back here again, then you
understand about the @samp{Space} and @samp{Backspace} keys. So now
type an @kbd{n}---just one character; don't type the quotes and don't
type the Return key afterward---to get to the normal start of the
course.
@end ifinfo
@node Help
@ -401,13 +404,10 @@ repeatedly.
>> Type a @key{?} now. Press @key{SPC} to see consecutive screenfuls of
the list until finished. Then type @key{SPC} several times. If
you are using Emacs, the help will then go away automatically.
If you are using the stand-alone Info reader, type @kbd{x} to
return here.
@end format
(If you are using the stand-alone Info reader, type @kbd{C-x 0} to
return here, that is---press and hold @key{CTRL}, type an @kbd{x},
then release @key{CTRL} and @kbd{x}, and press @kbd{0}; that's a zero,
not the letter ``o''.)
From now on, you will encounter large nodes without warning, and
will be expected to know how to use @key{SPC} and @key{BACKSPACE} to
move around in them without being told. Since not all terminals have
@ -478,10 +478,10 @@ you to the following node in the manual @emph{regardless of level}.
If you immediately want to go to that node, without having to scroll
to the bottom of the screen first, you can type @kbd{]}.
Similarly, @kbd{@key{BACKSPACE}} (or @kbd{@key{S-SPC}}) carries you to
the preceding node regardless of level, after you scrolled to the
beginning of the present node. If you want to go to the preceding
node immediately, you can type @kbd{[}.
Similarly, @kbd{@key{BACKSPACE}} carries you to the preceding node
regardless of level, after you scrolled to the beginning of the
present node. If you want to go to the preceding node immediately,
you can type @kbd{[}.
For instance, typing this sequence will come back here in three steps:
@kbd{[ n [}. To do the same backward, type @kbd{] p ]}.
@ -1214,7 +1214,7 @@ all text that could potentially be useful.
@item Info-scroll-prefer-subnodes
If set to a non-@code{nil} value, @key{SPC} and @key{BACKSPACE} (or
@key{DEL}, or @key{S-SPC}) keys in a menu visit subnodes of the
@key{DEL}, or @kbd{S-@key{SPC}}) keys in a menu visit subnodes of the
current node before scrolling to its end or beginning, respectively.
For example, if the node's menu appears on the screen, the next
@key{SPC} moves to a subnode indicated by the following menu item.

4
doc/misc/mairix-el.texi
View file

@ -1,6 +1,6 @@
\input texinfo.tex
@setfilename ../../info/mairix-el
@setfilename ../../info/mairix-el.info
@settitle Emacs Interface for Mairix
@documentencoding UTF-8
@ -307,7 +307,7 @@ options `mairix-update-options'; the default is ``-F'' and ``-Q'' to
make updates as fast as possible. Note that by using these options,
absolutely no integrity checking is done. If your database somehow gets
corrupted, simply delete it and update. If `mairix-synchronous-update'
is nil (the default), mairix will be called in a subprocess so Emacs
is @code{nil} (the default), mairix will be called in a subprocess so Emacs
will still be usable while the update is done.
@end table

4
doc/misc/message.texi
View file

@ -2,7 +2,7 @@
@include gnus-overrides.texi
@setfilename ../../info/message
@setfilename ../../info/message.info
@settitle Message Manual
@documentencoding UTF-8
@synindex fn cp
@ -2137,7 +2137,7 @@ translation process.
@vindex message-fill-column
@cindex auto-fill
Local value for the column beyond which automatic line-wrapping should
happen for message buffers. If non-nil (the default), also turn on
happen for message buffers. If non-@code{nil} (the default), also turn on
auto-fill in message buffers.
@item message-signature-separator

4
doc/misc/mh-e.texi
View file

@ -3,7 +3,7 @@
@c Note: This document requires makeinfo version 4.6 or greater to build.
@c
@c %**start of header
@setfilename ../../info/mh-e
@setfilename ../../info/mh-e.info
@settitle The MH-E Manual
@documentencoding UTF-8
@c %**end of header
@ -3739,7 +3739,7 @@ when you press @key{TAB} when prompted for a folder name.
The hook @code{mh-kill-folder-suppress-prompt-functions} is an abnormal
hook run at the beginning of the command @kbd{k}. The hook functions
are called with no arguments and should return a non-nil value to
are called with no arguments and should return a non-@code{nil} value to
suppress the normal prompt when you remove a folder. This is useful
for folders that are easily regenerated. The default value of
@code{mh-search-p} suppresses the prompt on folders generated by

2
doc/misc/newsticker.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@comment %**start of header
@setfilename ../../info/newsticker
@setfilename ../../info/newsticker.info
@set VERSION 1.99
@set UPDATED June 2008
@settitle Newsticker @value{VERSION}

2
doc/misc/nxml-mode.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*- texinfo -*-
@c %**start of header
@setfilename ../../info/nxml-mode
@setfilename ../../info/nxml-mode.info
@settitle nXML Mode
@documentencoding UTF-8
@c %**end of header

2
doc/misc/octave-mode.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename ../../info/octave-mode
@setfilename ../../info/octave-mode.info
@settitle Octave Mode
@documentencoding UTF-8
@c %**end of header

4
doc/misc/org.texi
View file

@ -1,6 +1,6 @@
\input texinfo
@c %**start of header
@setfilename ../../info/org
@setfilename ../../info/org.info
@settitle The Org Manual
@set VERSION 8.2.6
@ -12228,7 +12228,7 @@ height:width ratio, do the following
@cindex #+ATTR_ODT
You can control the manner in which an image is anchored by setting the
@code{:anchor} property of it's @code{#+ATTR_ODT} line. You can specify one
of the the following three values for the @code{:anchor} property:
of the following three values for the @code{:anchor} property:
@samp{"as-char"}, @samp{"paragraph"} and @samp{"page"}.
To create an image that is anchored to a page, do the following:

2
doc/misc/pcl-cvs.texi
View file

@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename ../../info/pcl-cvs
@setfilename ../../info/pcl-cvs.info
@settitle PCL-CVS---Emacs Front-End to CVS
@syncodeindex vr fn
@documentencoding UTF-8

2
doc/misc/pgg.texi
View file

@ -2,7 +2,7 @@
@include gnus-overrides.texi
@setfilename ../../info/pgg
@setfilename ../../info/pgg.info
@set VERSION 0.1
@settitle PGG @value{VERSION}

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