mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Code Issues Releases Activity

Merge from mainline.

Browse Source
This commit is contained in:
Xue Fuqiao 2013-09-04 08:39:34 +08:00
commit adf2fc4a01
473 changed files with 22701 additions and 10660 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
ChangeLog
View File

@ -1,3 +1,169 @@
2013-09-02 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Add ns_check_file.
2013-08-31 Glenn Morris <rgm@gnu.org>
* configure.ac (--with-sound): Rename ossaudio to bsd-ossaudio,
and voxware to oss.
2013-08-31 Ulrich Müller <ulm@gentoo.org>
* configure.ac: Allow for --with-sound=voxware that will enable
sound but otherwise disable ALSA. This will use the OSS device,
typically /dev/dsp, for sound output. (Bug#15067)
2013-08-31 Glenn Morris <rgm@gnu.org>
* make-dist: Update for nt/INSTALL* changes.
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-08-28 Stefan Monnier <monnier@iro.umontreal.ca>
* configure.ac (DOCMISC_W32): New var to replace DOCMISC_*_W32.
2013-08-27 Paul Eggert <eggert@cs.ucla.edu>
Simplify EMACS_TIME-related code.
Merge from gnulib, incorporating:
2013-08-27 timespec: new convenience constants and function
2013-08-27 Dmitry Antipov <dmantipov@yandex.ru>
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): No spaces!
2013-08-27 Glenn Morris <rgm@gnu.org>
* configure.ac (emacs_broken_SIGIO): No longer set on gnu-kfreebsd.
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
2013-08-26 Paul Eggert <eggert@cs.ucla.edu>
Minor merge from gnulib (mostly just for texinfo.tex).
2013-08-22 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (EMACS_CONFIG_OPTIONS): Quote systematically (Bug#13274).
This improves on the patch already installed, by quoting options
that contain spaces and suchlike systematically, so that
EMACS_CONFIG_OPTIONS is no longer ambiguous when options contain
these characters.
2013-08-21 Paul Eggert <eggert@cs.ucla.edu>
Port close-on-exec pty creation to FreeBSD 9.1-RELEASE (Bug#15129).
* configure.ac (PTY_OPEN): If posix_openpt with O_CLOEXEC fails
and reports EINVAL, try it again without O_CLOEXEC. This should
port PTY_OPEN to FreeBSD 9, which stupidly rejects O_CLOEXEC.
What were they thinking?
2013-08-20 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Fix shell-operator precedence problem in previous change.
2013-08-20 Glenn Morris <rgm@gnu.org>
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Clean test/automated if present.
2013-08-19 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-08-15 warnings: minor optimization
2013-08-15 warnings: check -Wfoo rather than -Wno-foo
2013-08-15 Ken Brown <kbrown@cornell.edu>
* configure.ac (G_SLICE_ALWAYS_MALLOC): Update comment.
2013-08-15 Glenn Morris <rgm@gnu.org>
* make-dist: Do not distribute etc/refcards TeX intermediate files.
* Makefile.in (install-arch-indep):
Do not install etc/refcards TeX intermediate files.
2013-08-14 Ulrich Müller <ulm@gentoo.org>
* configure.ac (EMACS_CONFIGURATION): Escape backslashes. (Bug#15091)
2013-08-12 Eli Zaretskii <eliz@gnu.org>
* configure.ac (HAVE_ZLIB): Don't use -lz on MinGW.
2013-08-12 Paul Eggert <eggert@cs.ucla.edu>
Minor zlib configuration tweaks.
* configure.ac (HAVE_ZLIB): Don't assume zlib is linked if PNG is.
2013-08-12 Eli Zaretskii <eliz@gnu.org>
* configure.ac (LIBZ): Comment on w32 peculiarities regarding LIBZ.
2013-08-12 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
2013-08-10 sys_time: port to OpenBSD
2013-08-12 Glenn Morris <rgm@gnu.org>
* configure.ac (etcdocdir): Rename from docdir, to avoid confusion
with configure's standard --docdir argument. All uses updated.
* Makefile.in (etcdocdir): Rename from docdir. All uses updated.
(install-etcdoc): Rename from install-doc. All uses updated.
(uninstall): Run uninstall-doc.
(PSS): Add misc-ps.
(INSTALL_DVI, INSTALL_HTML, INSTALL_PDF, INSTALL_PS)
(INSTALL_DOC, UNINSTALL_DVI, UNINSTALL_HTML, UNINSTALL_PDF)
(UNINSTALL_PS, UNINSTALL_DOC): New variables.
($(INSTALL_DOC), install-doc, install-dvi, install-html, install-pdf)
(install-ps, $(UNINSTALL_DOC), uninstall-doc, uninstall-dvi)
(uninstall-html, uninstall-pdf, uninstall-ps): New .PHONY rules.
2013-08-11 Paul Eggert <eggert@cs.ucla.edu>
Add --with-zlib to 'configure'.
* configure.ac: Add --with-zlib option to 'configure', so that Emacs
can be built without zlib. Don't assume that -lz is needed on
non-PNG hosts. Mention zlib configuration status in 'configure' output.
2013-08-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
* configure.ac: Test for zlib.
2013-08-10 Eli Zaretskii <eliz@gnu.org>
* configure.ac: Define and substitute UPDATE_MANIFEST.
2013-08-04 Stephen Berman <stephen.berman@gmx.net>
* info/dir: Add todo-mode.
2013-08-04 Paul Eggert <eggert@cs.ucla.edu>
Fix some minor races in hosts lacking mkostemp (Bug#15015).
Gnulib's emulation of mkostemp doesn't have races that Emacs's does.
* configure.ac (mkostemp): Remove check for this function;
gnulib does the check now.
(mkstemp): Remove check for this no-longer-used function.
* lib/mkostemp.c, lib/secure_getenv.c, lib/tempname.c, lib/tempname.h:
* m4/mkostemp.m4, m4/secure_getenv.m4, m4/tempname.m4:
New files, copied from Gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
2013-07-29 Michael Albinus <michael.albinus@gmx.de>
* INSTALL (DETAILED BUILDING AND INSTALLATION): Add

213
Makefile.in
View File

@ -56,7 +56,7 @@
# make docs
# Make Emacs documentation files from their sources; requires makeinfo.
SHELL = /bin/sh
SHELL = @SHELL@
# This may not work with certain non-GNU make's. It only matters when
# inheriting a CDPATH not starting with the current directory.
@ -233,8 +233,8 @@ etcdir=@etcdir@
# once.
archlibdir=@archlibdir@
# Where to put the docstring file.
docdir=@docdir@
# Where to put the etc/DOC file.
etcdocdir=@etcdocdir@
# Where to install Emacs game score files.
gamedir=@gamedir@
@ -313,7 +313,7 @@ epaths-force: FRC
-e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \
-e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
-e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
-e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \
-e 's;\(#.*PATH_DOC\).*$$;\1 "${etcdocdir}";') && \
${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
# Convert MSYS-style /x/foo or Windows-style x:\foo file names
@ -453,7 +453,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
# ==================== Installation ====================
.PHONY: install install-arch-dep install-arch-indep install-doc install-info
.PHONY: install install-arch-dep install-arch-indep install-etcdoc install-info
.PHONY: install-man install-etc install-strip install-$(NTDIR)
.PHONY: uninstall uninstall-$(NTDIR)
@ -461,7 +461,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
## don't have to duplicate the list of utilities to install in
## this Makefile as well.
install: all install-arch-indep install-doc install-arch-dep install-$(NTDIR) blessmail
install: all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR) blessmail
@true
## Ensure that $subdir contains a subdirs.el file.
@ -482,7 +482,7 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \
### Install the executables that were compiled specifically for this machine.
### We do install-arch-indep first because the executable needs the
### Lisp files and DOC file to work properly.
install-arch-dep: src install-arch-indep install-doc install-$(NTDIR)
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} \
@ -541,7 +541,12 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
## We delete etc/DOC* because there may be irrelevant DOC files from
## other builds in the source directory. This is ok because we just
## deleted the entire installed etc/ directory and recreated it.
## install-doc installs the relevant DOC.
## install-etcdoc installs the relevant DOC.
## Note that we install etc/refcards/*.ps if present.
## TODO we should compress these if GZIP_PROG is set.
## It would be simpler to have a separate install rule for etc/refcards
## (maybe move it to doc/refcards?).
## Note that the Makefiles in the etc directory are potentially useful
## in an installed Emacs, so should not be excluded.
@ -578,7 +583,12 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
tar -xvf - && cat > /dev/null) || exit 1; \
[ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
if [ "$${dir}" = "${srcdir}/etc" ]; then \
rm -f $${dest}/DOC* ; \
rm -f $${dest}/refcards/*.aux $${dest}/refcards/*.dvi; \
rm -f $${dest}/refcards/*.log; \
else true; \
fi; \
for subdir in `find $${dest} -type d -print` ; do \
chmod a+rx $${subdir} ; \
rm -f $${subdir}/.gitignore ; \
@ -621,16 +631,16 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
## Note that install-arch-indep deletes and recreates the entire
## installed etc/ directory, so we need it to run before this does.
install-doc: src install-arch-indep
install-etcdoc: src install-arch-indep
-unset CDPATH; \
umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \
umask 022; ${MKDIR_P} $(DESTDIR)${etcdocdir} ; \
if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${etcdocdir}; /bin/pwd` ]; \
then \
docfile="DOC"; \
echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \
echo "Copying etc/$${docfile} to $(DESTDIR)${etcdocdir} ..." ; \
${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${etcdocdir}/$${docfile}; \
$(set_installuser); \
chown $${installuser} $(DESTDIR)${docdir}/$${docfile} || true ; \
chown $${installuser} $(DESTDIR)${etcdocdir}/$${docfile} || true ; \
else true; fi
install-info: info
@ -716,7 +726,7 @@ install-strip:
### 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: uninstall-$(NTDIR) uninstall-doc
cd lib-src && \
$(MAKE) $(MFLAGS) uninstall \
prefix=${prefix} exec_prefix=${exec_prefix} \
@ -787,17 +797,17 @@ FRC:
### target for GCC does not delete `libgcc.a', because recompiling it
### is rarely necessary and takes a lot of time.
mostlyclean: FRC
(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)
(cd leim; $(MAKE) $(MFLAGS) 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
cd leim && $(MAKE) $(MFLAGS) mostlyclean
### `clean'
### Delete all files from the current directory that are normally
@ -809,18 +819,18 @@ mostlyclean: FRC
### Delete `.dvi' files here if they are not part of the distribution.
clean: FRC
-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 leim; $(MAKE) $(MFLAGS) clean)
(cd nextstep && $(MAKE) $(MFLAGS) clean)
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 leim && $(MAKE) $(MFLAGS) clean
cd nextstep && $(MAKE) $(MFLAGS) clean
### `bootclean'
### Delete all files that need to be remade for a clean bootstrap.
@ -836,38 +846,44 @@ top_distclean=\
${top_bootclean}; \
rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
distclean: FRC
(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)
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
[ ! -d test/automated ] || { \
cd test/automated && $(MAKE) $(MFLAGS) distclean; \
}
${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: FRC
(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) maintainer-clean)
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
(cd nextstep && $(MAKE) $(MFLAGS) maintainer-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) maintainer-clean
cd lisp && $(MAKE) $(MFLAGS) bootstrap-clean
cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean
[ ! -d test/automated ] || { \
cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean; \
}
[ ! -f config.log ] || mv -f config.log config.log~
${top_bootclean}
@ -886,8 +902,11 @@ top_maintainer_clean=\
${top_distclean}; \
rm -fr autom4te.cache
maintainer-clean: bootstrap-clean FRC
(cd src; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
cd src && $(MAKE) $(MFLAGS) maintainer-clean
cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
[ ! -d test/automated ] || { \
cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean; \
}
${top_maintainer_clean}
### This doesn't actually appear in the coding standards, but Karl
@ -921,7 +940,7 @@ DVIS = lispref-dvi lispintro-dvi emacs-dvi misc-dvi
HTMLS = lispref-html lispintro-html emacs-html misc-html
INFOS = lispref-info lispintro-info emacs-info misc-info
PDFS = lispref-pdf lispintro-pdf emacs-pdf misc-pdf
PSS = lispref-ps lispintro-ps emacs-ps # no misc-ps
PSS = lispref-ps lispintro-ps emacs-ps misc-ps
DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
$(DOCS):
@ -930,6 +949,7 @@ $(DOCS):
.PHONY: $(DOCS) docs pdf ps
.PHONY: info dvi dist check html info-real force-info check-info-dir
## TODO add etc/refcards.
docs: $(DOCS)
dvi: $(DVIS)
html: $(HTMLS)
@ -937,6 +957,55 @@ info-real: $(INFOS)
pdf: $(PDFS)
ps: $(PSS)
INSTALL_DVI = install-emacs-dvi install-lispref-dvi \
install-lispintro-dvi install-misc-dvi
INSTALL_HTML = install-emacs-html install-lispref-html \
install-lispintro-html install-misc-html
INSTALL_PDF = install-emacs-pdf install-lispref-pdf \
install-lispintro-pdf install-misc-pdf
INSTALL_PS = install-emacs-ps install-lispref-ps \
install-lispintro-ps install-misc-ps
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
.PHONY: $(INSTALL_DOC) install-doc
.PHONY: install-dvi install-html install-pdf install-ps
install-doc: $(INSTALL_DOC)
install-dvi: $(INSTALL_DVI)
install-html: $(INSTALL_HTML)
install-pdf: $(INSTALL_PDF)
install-ps: $(INSTALL_PS)
UNINSTALL_DVI = uninstall-emacs-dvi uninstall-lispref-dvi \
uninstall-lispintro-dvi uninstall-misc-dvi
UNINSTALL_HTML = uninstall-emacs-html uninstall-lispref-html \
uninstall-lispintro-html uninstall-misc-html
UNINSTALL_PDF = uninstall-emacs-pdf uninstall-lispref-pdf \
uninstall-lispintro-pdf uninstall-misc-pdf
UNINSTALL_PS = uninstall-emacs-ps uninstall-lispref-ps \
uninstall-lispintro-ps uninstall-misc-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
.PHONY: $(UNINSTALL_DOC) uninstall-doc
.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
uninstall-doc: $(UNINSTALL_DOC)
uninstall-dvi: $(UNINSTALL_DVI)
uninstall-html: $(UNINSTALL_HTML)
uninstall-pdf: $(UNINSTALL_PDF)
uninstall-ps: $(UNINSTALL_PS)
force-info:
# Note that man/Makefile knows how to put the info files in $(srcdir),
# so we can do ok running make in the build dir.
@ -957,13 +1026,15 @@ info: force-info
fi
# The info/dir file must be updated by hand when new manuals are added.
# Cannot add an info/dir entry for efaq-w32 since it is not installed
# on all platforms.
check-info-dir: info
cd info ; \
missing= ; \
for file in *; do \
test -f "$${file}" || continue ; \
case $${file} in \
*-[0-9]*|COPYING|dir) continue ;; \
*-[0-9]*|COPYING|dir|efaq-w32*) continue ;; \
esac ; \
file=`echo $${file} | sed 's/\.info//'` ; \
grep -q -F ": ($${file})." dir || missing="$${missing} $${file}" ; \
@ -998,5 +1069,5 @@ check-declare:
echo "You must build Emacs to use this command"; \
exit 1; \
fi
(cd leim; $(MAKE) $(MFLAGS) $@)
(cd lisp; $(MAKE) $(MFLAGS) $@)
cd leim && $(MAKE) $(MFLAGS) $@
cd lisp && $(MAKE) $(MFLAGS) $@

27
admin/ChangeLog
View File

@ -1,3 +1,30 @@
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* unidata/Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-08-27 Glenn Morris <rgm@gnu.org>
* admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS. "faq" does not need special treatment any more.
2013-08-15 Glenn Morris <rgm@gnu.org>
* make-tarball.txt: Mention generating pdfs in etc/refcards.
2013-08-15 Xue Fuqiao <xfq.free@gmail.com>
* notes/hydra: More information about Hydra.
2013-08-10 Xue Fuqiao <xfq.free@gmail.com>
* notes/hydra: New file.
2013-08-04 Paul Eggert <eggert@cs.ucla.edu>
Fix some minor races in hosts lacking mkostemp (Bug#15015).
* merge-gnulib (GNULIB_MODULES): Add mkostemp.
2013-07-12 Glenn Morris <rgm@gnu.org>
* admin.el (manual-style-string): Use non-abbreviated url.

4
admin/FOR-RELEASE
View File

@ -3,6 +3,10 @@ Tasks needed before the next release.
* TO BE DONE SHORTLY BEFORE RELEASE
** Manuals
Check for node names using problematic characters:
find doc -name '*.texi' -exec grep '^@node[^,]*[:.()]' {} +
Sadly makeinfo does not warn about such characters.
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:

19
admin/admin.el
View File

@ -195,19 +195,21 @@ Root must be the root of an Emacs source tree."
(defun manual-misc-manuals (root)
"Return doc/misc manuals as list of strings."
;; Like `make -C doc/misc echo-info', but works if unconfigured.
;; Similar to `make -C doc/misc echo-info', but works if unconfigured,
;; and for INFO_TARGETS rather than INFO_INSTALL.
(with-temp-buffer
(insert-file-contents (expand-file-name "doc/misc/Makefile.in" root))
(search-forward "INFO_TARGETS = ")
(let ((start (point))
res)
;; Should really use expanded value of INFO_TARGETS.
(search-forward "INFO_COMMON = ")
(let ((start (point)))
(end-of-line)
(while (and (looking-back "\\\\")
(zerop (forward-line 1)))
(end-of-line))
(split-string (replace-regexp-in-string
"\\(\\\\\\|\\.info\\)" ""
(buffer-substring start (point)))))))
(append (split-string (replace-regexp-in-string
"\\(\\\\\\|\\.info\\)" ""
(buffer-substring start (point))))
'("efaq-w32")))))
(defun make-manuals (root &optional type)
"Generate the web manuals for the Emacs webpage.
@ -287,9 +289,8 @@ Optional argument TYPE is type of output (nil means all)."
(defun manual-misc-html (name root html-node-dir html-mono-dir)
;; Hack to deal with the cases where .texi creates a different .info.
;; Blech. TODO Why not just rename the .texi files?
;; Blech. TODO Why not just rename the .texi (or .info) files?
(let* ((texiname (cond ((equal name "ccmode") "cc-mode")
((equal name "efaq") "faq")
(t name)))
(texi (expand-file-name (format "doc/misc/%s.texi" texiname) root)))
(manual-html-node texi (expand-file-name name html-node-dir))

2
admin/cus-test.el
View File

@ -202,6 +202,8 @@ The detected problematic options are stored in `cus-test-errors'."
;; Check the values
(mapc (lambda (value)
;; TODO for booleans, check for values that can be
;; evaluated and are not t or nil. Usually a bug.
(unless (widget-apply conv :match value)
(setq mismatch 'mismatch)))
values)

5
admin/make-tarball.txt
View File

@ -61,6 +61,9 @@ General steps (for each step, check for possible errors):
5. autoreconf -i -I m4 --force
make bootstrap
make -C etc/refcards
make -C etc/refcards clean
6. Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed
@ -144,6 +147,8 @@ General steps (for each step, check for possible errors):
Download them and check the signatures. Check they build.
12. For a pretest, announce it on emacs-devel and info-gnu-emacs@gnu.org.
Probably should also include the platform-testers list:
https://lists.gnu.org/mailman/listinfo/platform-testers
For a release, also announce it on info-gnu@gnu.org. (Probably
bcc the info- addresses to make it less likely that people will
followup on those lists.)

2
admin/merge-gnulib
View File

@ -32,7 +32,7 @@ GNULIB_MODULES='
fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
getloadavg getopt-gnu gettime gettimeofday
intprops largefile lstat
manywarnings memrchr mktime
manywarnings memrchr mkostemp mktime
pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
sig2str socklen stat-time stdalign stdarg stdbool stdio
strftime strtoimax strtoumax symlink sys_stat

3
admin/notes/bzr
View File

@ -347,6 +347,9 @@ Runs on commit. Projects can enable it themselves by using `bzr
config' to set post_commit_to option for a branch. See `bzr help email'
(if you have the plugin installed) for other options.
The From: address will be that of your Savannah account, rather than
your `bzr whoami' information.
Note: if you have the bzr-email plugin installed locally, then when
you commit to the Emacs repository it will also try to send a commit
email from your local machine. If your machine is not configured to

25
admin/notes/elpa
View File

@ -1,24 +1,21 @@
NOTES ON THE EMACS PACKAGE ARCHIVE
The GNU Emacs package archive, at elpa.gnu.org, is managed using a Bzr
branch named "elpa", hosted on Savannah. To check it out:
The GNU Emacs package archive, at elpa.gnu.org, is managed using a Git
repository named "elpa", hosted on Savannah. To check it out:
bzr branch bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa elpa
git clone git://bzr.sv.gnu.org/emacs/elpa
cd elpa
echo "public_branch = bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa" >> .bzr/branch/branch.conf
bzr bind bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/elpa
git remote set-url --push origin git+ssh://bzr.sv.gnu.org/srv/git/emacs/elpa
[create task branch for edits, etc.]
Changes to this branch propagate to elpa.gnu.org in a semi-manual way.
There exists a copy of the elpa branch on that machine. Someone with
access logs in, pulls the latest changes from Savannah, and runs a
"deployment" script. This script (which is itself kept in the Bzr
branch) generates the content visible at http://elpa.gnu.org/packages.
Changes to this branch propagate to elpa.gnu.org via a "deployment" script run
daily. This script (which is kept in elpa/admin/update-archive.sh) generates
the content visible at http://elpa.gnu.org/packages.
The reason we set things up this way, instead of using the package
upload commands in package-x.el, is to let Emacs hackers conveniently
edit the contents of the "elpa" branch. (In particular, multi-file
packages are stored on the branch in source form, not as tarfiles.)
A new package is released as soon as the "version number" of that package is
changed. So you can use `elpa' to work on a package without fear of releasing
those changes prematurely. And once the code is ready, just bump the
version number to make a new release of the package.
It is easy to use the elpa branch to deploy a "local" copy of the
package archive. For details, see the README file in the elpa branch.

66
admin/notes/hydra Normal file
View File

@ -0,0 +1,66 @@
-*- outline -*-
Copyright (C) 2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
A continuous build for Emacs can be found at
http://hydra.nixos.org/jobset/gnu/emacs-trunk
http://hydra.nixos.org/jobset/gnu/emacs-24
* It builds Emacs on various platforms.
Sometimes jobs fail due to hydra problems rather than Emacs problems.
Eg it seems like the cygwin build will never work again.
http://lists.gnu.org/archive/html/hydra-users/2013-08/msg00000.html
* Mail notifications
In addition to the web interface, Hydra can send notifications by
email when the build status of a project changes—e.g., from
`SUCCEEDED' to `FAILED'. It sends notifications about build status in
Emacs trunk to emacs-buildstatus@gnu.org.
If you want to receive these notifications, please subscribe at
http://lists.gnu.org/mailman/listinfo/emacs-buildstatus
* The Emacs jobset consists of the following jobs:
** The `tarball' job
which gets a checkout from bzr, and does a bootstrap followed
by running make-dist to create a tarball. If this job fails, all the
others will too (because they use the tarball as input).
** The `build' job
which starts from the tarball and does a normal build
** The 'coverage' job
does a gcov build and then runs `make check'. Fails if any test fails.
* Nix expressions
The recipe for GNU Emacs are available via Git:
http://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/emacs
To modify the build job, email the patch to hydra-users@gnu.org. The
build recipes are written in the Nix language.
* Other Information
For a list of other GNU packages that have a continuous build on
Hydra, see http://hydra.nixos.org/project/gnu
See http://www.gnu.org/software/devel.html#Hydra for more information.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.

18
admin/nt/README-ftp-server
View File

@ -16,12 +16,6 @@ See the end of the file for license conditions.
accustomed to compiling programs themselves. Corresponding source
can be found in the parent directory in emacs-24.3.tar.gz.
If you have access to the World Wide Web, I would recommend pointing
your favorite web browser to the following document (if you haven't
already):
http://www.gnu.org/software/emacs/windows/ntemacs.html
* IMPORTANT LEGAL REMINDER
If you want to redistribute any of the precompiled distributions of
@ -230,16 +224,10 @@ See the end of the file for license conditions.
* Further information
If you have access to the World Wide Web, I would recommend pointing
your favorite web browser to following the document (if you haven't
already):
The Emacs on MS Windows FAQ is distributed with Emacs (info
manual "efaq-w32"), and at
http://www.gnu.org/software/emacs/windows/ntemacs.html
This document serves as an FAQ and a source for further information
about the Windows port and related software packages. Note that as
most of the information in that FAQ is for earlier versions, so some
information may not be relevant to Emacs-24.3.
http://www.gnu.org/software/emacs/manual/efaq-w32.html
In addition to the FAQ, there is a mailing list for discussing issues
related to the Windows port of Emacs. For information about the

2
admin/unidata/Makefile.in
View File

@ -21,7 +21,7 @@
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
SHELL = /bin/sh
SHELL = @SHELL@
srcdir = @srcdir@
abs_builddir = @abs_builddir@

114
autogen/Makefile.in
View File

@ -59,7 +59,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@ -202,14 +202,14 @@ DIST_COMMON = $(srcdir)/../nt/gnulib.mk $(srcdir)/Makefile.am \
@BUILDING_FOR_WINDOWSNT_FALSE@ getopt_int.h gettimeofday.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ group-member.c intprops.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ inttypes.in.h lstat.c memrchr.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ mktime-internal.h mktime.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ openat.h pathmax.h pselect.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ pthread_sigmask.c putenv.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ acl-internal.h acl.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ mkostemp.c mktime-internal.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ mktime.c openat.h pathmax.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ pselect.c pthread_sigmask.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ putenv.c acl-internal.h acl.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ acl_entries.c readlink.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ at-func.c readlinkat.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ root-uid.h sig2str.c sig2str.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ signal.in.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ root-uid.h secure_getenv.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ sig2str.c sig2str.h signal.in.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/_Noreturn.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/c++defs.h \
@ -224,12 +224,13 @@ DIST_COMMON = $(srcdir)/../nt/gnulib.mk $(srcdir)/Makefile.am \
@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtoumax.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ symlink.c sys_select.in.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ sys_stat.in.h sys_time.in.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ time.in.h time_r.c timespec.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ u64.h unistd.in.h unsetenv.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ utimens.h verify.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ tempname.h time.in.h time_r.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ timespec.h u64.h unistd.in.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ unsetenv.c utimens.h verify.h \
@BUILDING_FOR_WINDOWSNT_FALSE@ xalloc-oversized.h
@BUILDING_FOR_WINDOWSNT_FALSE@@gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_10 = gettext.h
@BUILDING_FOR_WINDOWSNT_FALSE@am__append_11 = sys sys
@BUILDING_FOR_WINDOWSNT_FALSE@@gl_GNULIB_ENABLED_tempname_TRUE@am__append_12 = tempname.c
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
@ -255,33 +256,35 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/longlong.m4 \
$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/manywarnings.m4 \
$(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memrchr.m4 \
$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/multiarch.m4 \
$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \
$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/pipe2.m4 \
$(top_srcdir)/m4/pselect.m4 \
$(top_srcdir)/m4/mkostemp.m4 $(top_srcdir)/m4/mktime.m4 \
$(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nocrash.m4 \
$(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/pathmax.m4 \
$(top_srcdir)/m4/pipe2.m4 $(top_srcdir)/m4/pselect.m4 \
$(top_srcdir)/m4/pthread_sigmask.m4 $(top_srcdir)/m4/putenv.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \
$(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/sha1.m4 \
$(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \
$(top_srcdir)/m4/sig2str.m4 $(top_srcdir)/m4/signal_h.m4 \
$(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/ssize_t.m4 \
$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/stat-time.m4 \
$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \
$(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \
$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/string_h.m4 \
$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtoll.m4 \
$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
$(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_select_h.m4 \
$(top_srcdir)/m4/secure_getenv.m4 $(top_srcdir)/m4/setenv.m4 \
$(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sha256.m4 \
$(top_srcdir)/m4/sha512.m4 $(top_srcdir)/m4/sig2str.m4 \
$(top_srcdir)/m4/signal_h.m4 $(top_srcdir)/m4/socklen.m4 \
$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/st_dm_mode.m4 \
$(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \
$(top_srcdir)/m4/stdalign.m4 $(top_srcdir)/m4/stdarg.m4 \
$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \
$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdio_h.m4 \
$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strftime.m4 \
$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strtoimax.m4 \
$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoull.m4 \
$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \
$(top_srcdir)/m4/sys_select_h.m4 \
$(top_srcdir)/m4/sys_socket_h.m4 \
$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
$(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
$(top_srcdir)/m4/timer_time.m4 $(top_srcdir)/m4/timespec.m4 \
$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \
$(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \
$(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/warnings.m4 \
$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \
$(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timer_time.m4 \
$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/utimbuf.m4 \
$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \
$(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_t.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@ -296,10 +299,11 @@ am__libgnu_a_SOURCES_DIST = allocator.c binary-io.h binary-io.c \
careadlinkat.c close-stream.c md5.c sha1.c sha256.c sha512.c \
dtoastr.c dtotimespec.c filemode.c gettext.h gettime.c pipe2.c \
acl-errno-valid.c file-has-acl.c qcopy-acl.c qset-acl.c \
stat-time.c strftime.c timespec.c timespec-add.c \
stat-time.c strftime.c tempname.c timespec.c timespec-add.c \
timespec-sub.c u64.c unistd.c utimens.c openat-die.c \
save-cwd.c
am__objects_1 =
@BUILDING_FOR_WINDOWSNT_FALSE@@gl_GNULIB_ENABLED_tempname_TRUE@am__objects_2 = tempname.$(OBJEXT)
@BUILDING_FOR_WINDOWSNT_FALSE@am_libgnu_a_OBJECTS = \
@BUILDING_FOR_WINDOWSNT_FALSE@ allocator.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_FALSE@ binary-io.$(OBJEXT) \
@ -323,6 +327,7 @@ am__objects_1 =
@BUILDING_FOR_WINDOWSNT_FALSE@ qset-acl.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_FALSE@ stat-time.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_FALSE@ strftime.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_FALSE@ $(am__objects_2) \
@BUILDING_FOR_WINDOWSNT_FALSE@ timespec.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-add.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-sub.$(OBJEXT) \
@ -350,15 +355,16 @@ am__objects_1 =
@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-add.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-sub.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_TRUE@ u64.$(OBJEXT) utimens.$(OBJEXT) \
@BUILDING_FOR_WINDOWSNT_TRUE@ $(am__objects_1)
@BUILDING_FOR_WINDOWSNT_TRUE@ $(am__objects_1) $(am__objects_2)
am__EXTRA_libgnu_a_SOURCES_DIST = openat-proc.c ftoastr.c dup2.c \
euidaccess.c execinfo.c at-func.c faccessat.c fcntl.c \
fdatasync.c fdopendir.c fpending.c fstatat.c fsync.c \
getdtablesize.c getgroups.c getloadavg.c getopt.c getopt1.c \
gettimeofday.c group-member.c lstat.c memrchr.c mktime.c \
pselect.c pthread_sigmask.c putenv.c acl_entries.c readlink.c \
readlinkat.c sig2str.c stat.c strtoimax.c strtol.c strtoll.c \
strtoul.c strtoull.c strtoumax.c symlink.c time_r.c unsetenv.c
gettimeofday.c group-member.c lstat.c memrchr.c mkostemp.c \
mktime.c pselect.c pthread_sigmask.c putenv.c acl_entries.c \
readlink.c readlinkat.c secure_getenv.c sig2str.c stat.c \
strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c \
strtoumax.c symlink.c time_r.c unsetenv.c
libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
@ -417,6 +423,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DEPFLAGS = @DEPFLAGS@
DESLIB = @DESLIB@
DOCMISC_W32 = @DOCMISC_W32@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@ -897,6 +904,7 @@ LIBXSM = @LIBXSM@
LIBXTR6 = @LIBXTR6@
LIBXT_OTHER = @LIBXT_OTHER@
LIBX_OTHER = @LIBX_OTHER@
LIBZ = @LIBZ@
LIB_ACL = @LIB_ACL@
LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
LIB_EACCESS = @LIB_EACCESS@
@ -1123,6 +1131,7 @@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
UNEXEC_OBJ = @UNEXEC_OBJ@
UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
UPDATE_MANIFEST = @UPDATE_MANIFEST@
USE_ACL = @USE_ACL@
VERSION = @VERSION@
VMLIMIT_OBJ = @VMLIMIT_OBJ@
@ -1178,6 +1187,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
etcdir = @etcdir@
etcdocdir = @etcdocdir@
exec_prefix = @exec_prefix@
gamedir = @gamedir@
gameuser = @gameuser@
@ -1210,6 +1220,7 @@ ns_appbindir = @ns_appbindir@
ns_appdir = @ns_appdir@
ns_appresdir = @ns_appresdir@
ns_appsrc = @ns_appsrc@
ns_check_file = @ns_check_file@
ns_self_contained = @ns_self_contained@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
@ -1248,10 +1259,10 @@ DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
@BUILDING_FOR_WINDOWSNT_FALSE@ acl-errno-valid.c file-has-acl.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ qcopy-acl.c qset-acl.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ stat-time.c strftime.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ timespec.c timespec-add.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-sub.c u64.c unistd.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ utimens.c openat-die.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ save-cwd.c
@BUILDING_FOR_WINDOWSNT_FALSE@ $(am__append_12) timespec.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-add.c timespec-sub.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ u64.c unistd.c utimens.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ openat-die.c save-cwd.c
@BUILDING_FOR_WINDOWSNT_TRUE@libgnu_a_SOURCES = c-ctype.h c-ctype.c \
@BUILDING_FOR_WINDOWSNT_TRUE@ c-strcase.h c-strcasecmp.c \
@BUILDING_FOR_WINDOWSNT_TRUE@ c-strncasecmp.c close-stream.c \
@ -1262,7 +1273,8 @@ DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
@BUILDING_FOR_WINDOWSNT_TRUE@ file-has-acl.c qcopy-acl.c \
@BUILDING_FOR_WINDOWSNT_TRUE@ stat-time.c strftime.c timespec.c \
@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-add.c timespec-sub.c \
@BUILDING_FOR_WINDOWSNT_TRUE@ u64.c utimens.c $(am__append_10)
@BUILDING_FOR_WINDOWSNT_TRUE@ u64.c utimens.c $(am__append_10) \
@BUILDING_FOR_WINDOWSNT_TRUE@ $(am__append_12)
@BUILDING_FOR_WINDOWSNT_FALSE@libgnu_a_LIBADD = $(gl_LIBOBJS)
@BUILDING_FOR_WINDOWSNT_TRUE@libgnu_a_LIBADD = $(gl_LIBOBJS)
@BUILDING_FOR_WINDOWSNT_FALSE@libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
@ -1276,11 +1288,12 @@ DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
@BUILDING_FOR_WINDOWSNT_FALSE@ getgroups.c getloadavg.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.c getopt1.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ gettimeofday.c group-member.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ lstat.c memrchr.c mktime.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ pselect.c pthread_sigmask.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ putenv.c acl_entries.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ readlink.c at-func.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ readlinkat.c sig2str.c stat.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ lstat.c memrchr.c mkostemp.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ mktime.c pselect.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ pthread_sigmask.c putenv.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ acl_entries.c readlink.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ at-func.c readlinkat.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ secure_getenv.c sig2str.c stat.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtol.c strtoll.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ strtol.c strtoul.c strtoull.c \
@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtoumax.c \
@ -1402,6 +1415,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkostemp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-die.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-proc.Po@am__quote@
@ -1414,6 +1428,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlink.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlinkat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secure_getenv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha512.Po@am__quote@
@ -1428,6 +1443,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoull.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoumax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symlink.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec-add.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec-sub.Po@am__quote@

3
autogen/aclocal.m4 vendored
View File

@ -1024,6 +1024,7 @@ m4_include([m4/lstat.m4])
m4_include([m4/manywarnings.m4])
m4_include([m4/md5.m4])
m4_include([m4/memrchr.m4])
m4_include([m4/mkostemp.m4])
m4_include([m4/mktime.m4])
m4_include([m4/multiarch.m4])
m4_include([m4/nocrash.m4])
@ -1035,6 +1036,7 @@ m4_include([m4/pthread_sigmask.m4])
m4_include([m4/putenv.m4])
m4_include([m4/readlink.m4])
m4_include([m4/readlinkat.m4])
m4_include([m4/secure_getenv.m4])
m4_include([m4/setenv.m4])
m4_include([m4/sha1.m4])
m4_include([m4/sha256.m4])
@ -1064,6 +1066,7 @@ m4_include([m4/sys_select_h.m4])
m4_include([m4/sys_socket_h.m4])
m4_include([m4/sys_stat_h.m4])
m4_include([m4/sys_time_h.m4])
m4_include([m4/tempname.m4])
m4_include([m4/time_h.m4])
m4_include([m4/time_r.m4])
m4_include([m4/timer_time.m4])

26
autogen/config.in
View File

@ -192,6 +192,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
whether the gnulib module fscanf shall be considered present. */
#undef GNULIB_FSCANF
/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
whether the gnulib module mkostemp shall be considered present. */
#undef GNULIB_MKOSTEMP
/* enable some gnulib portability checks */
#undef GNULIB_PORTCHECK
@ -206,7 +210,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#undef GNU_MALLOC
/* Define to set the G_SLICE environment variable to "always-malloc" at
startup, if using GTK. */
startup. */
#undef G_SLICE_ALWAYS_MALLOC
/* Define to 1 if you have the `accept4' function. */
@ -404,10 +408,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
don't. */
#undef HAVE_DECL__PUTENV
/* Define to 1 if you have the declaration of `__fpending', and to 0 if you
don't. */
#undef HAVE_DECL___FPENDING
/* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
don't. */
#undef HAVE_DECL___SYS_SIGLIST
@ -625,6 +625,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `issetugid' function. */
#undef HAVE_ISSETUGID
/* Define to 1 if you have the jpeg library (-ljpeg). */
#undef HAVE_JPEG
@ -753,9 +756,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `mkostemp' function. */
#undef HAVE_MKOSTEMP
/* Define to 1 if you have the `mkstemp' function. */
#undef HAVE_MKSTEMP
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
@ -847,6 +847,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using librsvg. */
#undef HAVE_RSVG
/* Define to 1 if you have the `secure_getenv' function. */
#undef HAVE_SECURE_GETENV
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
@ -1183,6 +1186,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you want to use the X window system. */
#undef HAVE_X_WINDOWS
/* Define to 1 if you have the zlib library (-lz). */
#undef HAVE_ZLIB
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
@ -1198,8 +1204,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `__executable_start' function. */
#undef HAVE___EXECUTABLE_START
/* Define to 1 if you have the `__fpending' function. */
#undef HAVE___FPENDING
/* Define to 1 if you have the `__secure_getenv' function. */
#undef HAVE___SECURE_GETENV
/* Define to support using a Hesiod database to find the POP server. */
#undef HESIOD

415
autogen/configure vendored
View File

@ -604,6 +604,7 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
SUBDIR_MAKEFILES_IN
ns_check_file
WINDOW_SYSTEM_OBJ
EMACS_HEAPSIZE
TEMACS_POST_LINK
@ -614,12 +615,16 @@ LIBGNU_LIBDEPS
gltests_WITNESS
gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_FALSE
gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_TRUE
gl_GNULIB_ENABLED_tempname_FALSE
gl_GNULIB_ENABLED_tempname_TRUE
gl_GNULIB_ENABLED_strtoull_FALSE
gl_GNULIB_ENABLED_strtoull_TRUE
gl_GNULIB_ENABLED_strtoll_FALSE
gl_GNULIB_ENABLED_strtoll_TRUE
gl_GNULIB_ENABLED_stat_FALSE
gl_GNULIB_ENABLED_stat_TRUE
gl_GNULIB_ENABLED_secure_getenv_FALSE
gl_GNULIB_ENABLED_secure_getenv_TRUE
gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c_FALSE
gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c_TRUE
gl_GNULIB_ENABLED_pathmax_FALSE
@ -1275,6 +1280,7 @@ LD_SWITCH_X_SITE
gameuser
gamedir
bitmapdir
etcdocdir
archlibdir
etcdir
x_default_search_path
@ -1311,6 +1317,7 @@ LIBXSM
LIBGPM
LIBGIF
LIBTIFF
LIBZ
LIBPNG
LIBJPEG
LIBXPM
@ -1364,6 +1371,7 @@ FIRSTFILE_OBJ
W32_RES_LINK
CLIENTW
CLIENTRES
UPDATE_MANIFEST
EMACS_MANIFEST
EMACSRES
W32_LIBS
@ -1390,6 +1398,7 @@ UNEXEC_OBJ
C_SWITCH_MACHINE
LD_SWITCH_SYSTEM
CANNOT_DUMP
DOCMISC_W32
INFO_OPTS
INFO_EXT
HAVE_MAKEINFO
@ -1533,6 +1542,7 @@ with_gconf
with_gsettings
with_selinux
with_gnutls
with_zlib
with_file_notification
with_makeinfo
with_compress_info
@ -2233,8 +2243,8 @@ Optional Packages:
--with-mail-unlink unlink, rather than empty, mail spool after reading
--with-mailhost=HOSTNAME
string giving default POP mail host
--with-sound=VALUE compile with sound support (VALUE one of: yes,
ossaudio, alsa, no; default yes). Only for
--with-sound=VALUE compile with sound support (VALUE one of: yes, alsa,
oss, bsd-ossaudio, no; default yes). Only for
GNU/Linux, FreeBSD, NetBSD, MinGW.
--with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk, gtk2,
gtk3, lucid or athena, motif, no)
@ -2263,6 +2273,7 @@ Optional Packages:
--without-gsettings don't compile with GSettings support
--without-selinux don't compile with SELinux support
--without-gnutls don't use -lgnutls for SSL/TLS support
--without-zlib don't compile with zlib decompression support
--with-file-notification=LIB
use a file notification library (LIB one of: yes,
gfile, inotify, w32, no)
@ -3378,7 +3389,6 @@ as_fn_append ac_func_list " faccessat"
as_fn_append ac_func_list " fcntl"
as_fn_append ac_func_list " fdopendir"
as_fn_append ac_header_list " stdio_ext.h"
as_fn_append ac_func_list " __fpending"
as_fn_append ac_func_list " fstatat"
as_fn_append ac_func_list " fsync"
gl_getopt_required=GNU
@ -3390,6 +3400,7 @@ as_fn_append ac_header_list " wchar.h"
as_fn_append ac_header_list " stdint.h"
as_fn_append ac_header_list " inttypes.h"
as_fn_append ac_func_list " lstat"
as_fn_append ac_func_list " mkostemp"
as_fn_append ac_func_list " pipe2"
as_fn_append ac_header_list " sys/select.h"
as_fn_append ac_func_list " pselect"
@ -3407,6 +3418,7 @@ as_fn_append ac_func_list " futimens"
as_fn_append ac_func_list " utimensat"
as_fn_append ac_func_list " lutimes"
as_fn_append ac_func_list " getdtablesize"
as_fn_append ac_func_list " secure_getenv"
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@ -3476,16 +3488,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
emacs_config_options="$@"
## Add some environment variables, if they were passed via the environment
## rather than on the command-line.
for var in CFLAGS CPPFLAGS LDFLAGS; do
case "$emacs_config_options" in
*$var=*) continue ;;
esac
eval val="\$${var}"
test x"$val" = x && continue
emacs_config_options="${emacs_config_options}${emacs_config_options:+ }$var=\"$val\""
emacs_config_options=
optsep=
for opt in ${1+"$@"} CFLAGS CPPFLAGS LDFLAGS; do
case $opt in
-n | --no-create | --no-recursion)
continue ;;
CFLAGS | CPPFLAGS | LDFLAGS)
eval 'test "${'$opt'+set}" = set' || continue
case " $*" in
*" $opt="*) continue ;;
esac
eval opt=$opt=\$$opt ;;
esac
emacs_shell_specials=$IFS\''"#$&()*;<>?[\\`{|~'
case $opt in
*["$emacs_shell_specials"]*)
case $opt in
*\'*)
emacs_quote_apostrophes="s/'/'\\\\''/g"
opt=`$as_echo "$opt" | sed "$emacs_quote_apostrophes"` ;;
esac
opt="'$opt'"
case $opt in
*['"\\']*)
emacs_quote_for_c='s/["\\]/\\&/g; $!s/$/\\n\\/'
opt=`$as_echo "$opt" | sed "$emacs_quote_for_c"` ;;
esac ;;
esac
as_fn_append emacs_config_options "$optsep$opt"
optsep=' '
done
ac_config_headers="$ac_config_headers src/config.h:src/config.in"
@ -4003,7 +4036,7 @@ locallisppath='${datadir}/emacs/${version}/site-lisp:'\
lisppath='${locallisppath}:${standardlisppath}'
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
etcdocdir='${datadir}/emacs/${version}/etc'
gamedir='${localstatedir}/games/emacs'
@ -4119,9 +4152,9 @@ fi
# Check whether --with-sound was given.
if test "${with_sound+set}" = set; then :
withval=$with_sound; case "${withval}" in
yes|no|ossaudio|alsa) val=$withval ;;
yes|no|alsa|oss|bsd-ossaudio) val=$withval ;;
*) as_fn_error "\`--with-sound=$withval' is invalid;
this option's value should be \`yes', \`no', \`ossaudio', or \`alsa'." "$LINENO" 5
this option's value should be \`yes', \`no', \`alsa', \`oss', or \`bsd-ossaudio'." "$LINENO" 5
;;
esac
with_sound=$val
@ -4349,6 +4382,14 @@ else
fi
# Check whether --with-zlib was given.
if test "${with_zlib+set}" = set; then :
withval=$with_zlib;
else
with_zlib=$with_features
fi
# Check whether --with-file-notification was given.
if test "${with_file_notification+set}" = set; then :
@ -7286,6 +7327,7 @@ esac
# Code from module lstat:
# Code from module manywarnings:
# Code from module memrchr:
# Code from module mkostemp:
# Code from module mktime:
# Code from module multiarch:
# Code from module nocrash:
@ -7299,6 +7341,7 @@ esac
# Code from module readlink:
# Code from module readlinkat:
# Code from module root-uid:
# Code from module secure_getenv:
# Code from module sig2str:
# Code from module signal-h:
# Code from module snippet/_Noreturn:
@ -7329,6 +7372,7 @@ esac
# Code from module sys_select:
# Code from module sys_stat:
# Code from module sys_time:
# Code from module tempname:
# Code from module time:
# Code from module time_r:
# Code from module timer-time:
@ -7899,6 +7943,10 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; }
for w in $ws; do
as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh`
gl_positive="$w"
case $gl_positive in
-Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $w" >&5
$as_echo_n "checking whether C compiler handles $w... " >&6; }
if { as_var=$as_gl_Warn; eval "test \"\${$as_var+set}\" = set"; }; then :
@ -7906,7 +7954,7 @@ if { as_var=$as_gl_Warn; eval "test \"\${$as_var+set}\" = set"; }; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $w"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -7945,7 +7993,7 @@ if test "${gl_cv_warn_c__Wno_missing_field_initializers+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-missing-field-initializers"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wmissing-field-initializers"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -7981,7 +8029,7 @@ if test "${gl_cv_warn_c__Wno_sign_compare+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-sign-compare"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wsign-compare"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8017,7 +8065,7 @@ if test "${gl_cv_warn_c__Wno_type_limits+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-type-limits"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wtype-limits"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8053,7 +8101,7 @@ if test "${gl_cv_warn_c__Wno_switch+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-switch"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wswitch"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8089,7 +8137,7 @@ if test "${gl_cv_warn_c__Wno_unused_parameter+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-parameter"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wunused-parameter"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8125,7 +8173,7 @@ if test "${gl_cv_warn_c__Wno_format_nonliteral+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-format-nonliteral"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wformat-nonliteral"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8164,7 +8212,7 @@ if test "${gl_cv_warn_c__Wno_logical_op+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-logical-op"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wlogical-op"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8203,7 +8251,7 @@ if test "${gl_cv_warn_c__Wno_format_extra_args+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-format-extra-args"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wformat-extra-args"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8239,7 +8287,7 @@ if test "${gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare+set}" =
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-tautological-constant-out-of-range-compare"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wtautological-constant-out-of-range-compare"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8275,7 +8323,7 @@ if test "${gl_cv_warn_c__Wno_unused_command_line_argument+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-command-line-argument"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wunused-command-line-argument"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8311,7 +8359,7 @@ if test "${gl_cv_warn_c__Wno_unused_value+set}" = set; then :
else
gl_save_compiler_FLAGS="$CFLAGS"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-value"
as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wunused-value"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -8709,6 +8757,13 @@ INFO_OPTS=--no-split
if test $opsys = mingw32; then
DOCMISC_W32=efaq-w32
else
DOCMISC_W32=
fi
if test x$GCC = xyes; then
test "x$GCC_LINK_TEST_OPTIONS" != x && \
@ -9027,7 +9082,10 @@ fi
done
if test "${with_sound}" = "ossaudio" || test "${with_sound}" = "yes"; then
test "${with_sound}" = "oss" && test "${have_sound_header}" != "yes" && \
as_fn_error "OSS sound support requested but not found." "$LINENO" 5
if test "${with_sound}" = "bsd-ossaudio" || test "${with_sound}" = "yes"; then
# Emulation library used on NetBSD.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5
$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
@ -9071,8 +9129,8 @@ else
LIBSOUND=
fi
test "${with_sound}" = "ossaudio" && test -z "$LIBSOUND" && \
as_fn_error "ossaudio sound support requested but not found." "$LINENO" 5
test "${with_sound}" = "bsd-ossaudio" && test -z "$LIBSOUND" && \
as_fn_error "bsd-ossaudio sound support requested but not found." "$LINENO" 5
fi
@ -10046,7 +10104,7 @@ if test "${HAVE_NS}" = yes; then
exec_prefix=${ns_appbindir}
libexecdir="\${ns_appbindir}/libexec"
archlibdir="\${ns_appbindir}/libexec"
docdir="\${ns_appresdir}/etc"
etcdocdir="\${ns_appresdir}/etc"
etcdir="\${ns_appresdir}/etc"
infodir="\${ns_appresdir}/info"
mandir="\${ns_appresdir}/man"
@ -10071,6 +10129,7 @@ CLIENTRES=
CLIENTW=
W32_RES_LINK=
EMACS_MANIFEST=
UPDATE_MANIFEST=
if test "${with_w32}" != no; then
case "${opsys}" in
cygwin)
@ -10234,6 +10293,7 @@ fi
x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
*) EMACS_MANIFEST="emacs-x86.manifest" ;;
esac
UPDATE_MANIFEST=update-game-score.exe.manifest
if test "${opsys}" = "cygwin"; then
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@ -10271,6 +10331,7 @@ fi
if test "${HAVE_W32}" = "yes"; then
window_system=w32
with_xft=no
@ -13613,6 +13674,83 @@ fi
fi
HAVE_ZLIB=no
LIBZ=
if test "${with_zlib}" != "no"; then
OLIBS=$LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflateEnd" >&5
$as_echo_n "checking for library containing inflateEnd... " >&6; }
if test "${ac_cv_search_inflateEnd+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char inflateEnd ();
int
main ()
{
return inflateEnd ();
;
return 0;
}
_ACEOF
for ac_lib in '' z; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_inflateEnd=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if test "${ac_cv_search_inflateEnd+set}" = set; then :
break
fi
done
if test "${ac_cv_search_inflateEnd+set}" = set; then :
else
ac_cv_search_inflateEnd=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflateEnd" >&5
$as_echo "$ac_cv_search_inflateEnd" >&6; }
ac_res=$ac_cv_search_inflateEnd
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
HAVE_ZLIB=yes
fi
LIBS=$OLIBS
case $ac_cv_search_inflateEnd in
-*) LIBZ=$ac_cv_search_inflateEnd ;;
esac
fi
if test "${HAVE_ZLIB}" = "yes"; then
$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
### mingw32 doesn't use -lz, since it loads the library dynamically.
if test "${opsys}" = "mingw32"; then
LIBZ=
fi
fi
### Use -ltiff if available, unless `--with-tiff=no'.
### mingw32 doesn't use -ltiff, since it loads the library dynamically.
HAVE_TIFF=no
@ -14692,7 +14830,7 @@ select getpagesize setlocale \
getrlimit setrlimit shutdown getaddrinfo \
strsignal setitimer \
sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
gai_strerror mkostemp mkstemp getline getdelim sync \
gai_strerror getline getdelim sync \
difftime posix_memalign \
getpwent endpwent getgrent endgrent \
touchlock \
@ -16350,7 +16488,7 @@ esac
emacs_broken_SIGIO=no
case $opsys in
hpux* | irix6-5 | openbsd | sol2* | unixware | gnu-kfreebsd )
hpux* | irix6-5 | openbsd | sol2* | unixware )
emacs_broken_SIGIO=yes
;;
@ -16468,7 +16606,7 @@ $as_echo "#define UNIX98_PTYS 1" >>confdefs.h
$as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptyname = 0; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); if (grantpt (fd) != -1 && unlockpt (fd) != -1) ptyname = ptsname(fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (!ptyname) { emacs_close (fd); return -1; } snprintf (pty_name, PTY_NAME_SIZE, \"%s\", ptyname); }" >>confdefs.h
if test "x$ac_cv_func_posix_openpt" = xyes; then
$as_echo "#define PTY_OPEN fd = posix_openpt (O_RDWR | O_CLOEXEC | O_NOCTTY)" >>confdefs.h
$as_echo "#define PTY_OPEN do { fd = posix_openpt (O_RDWR | O_CLOEXEC | O_NOCTTY); if (fd < 0 && errno == EINVAL) fd = posix_openpt (O_RDWR | O_NOCTTY); } while (0)" >>confdefs.h
$as_echo "#define PTY_NAME_SPRINTF /**/" >>confdefs.h
@ -16965,7 +17103,7 @@ fi
case $opsys in
cygwin)
cygwin)
$as_echo "#define G_SLICE_ALWAYS_MALLOC 1" >>confdefs.h
@ -17068,7 +17206,6 @@ cat >>confdefs.h <<_ACEOF
#define EMACS_CONFIGURATION "${canonical}"
_ACEOF
emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g"`
cat >>confdefs.h <<_ACEOF
#define EMACS_CONFIG_OPTIONS "${emacs_config_options}"
@ -18512,8 +18649,6 @@ _ACEOF
GNULIB_FCHMODAT=0;
GNULIB_FSTAT=0;
GNULIB_FSTATAT=0;
@ -20703,6 +20838,8 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
GNULIB_MKTIME=0;
GNULIB_NANOSLEEP=0;
GNULIB_STRPTIME=0;
@ -21932,6 +22069,8 @@ _ACEOF
if false; then
GL_COND_LIBTOOL_TRUE=
GL_COND_LIBTOOL_FALSE='#'
@ -22114,9 +22253,11 @@ _ACEOF
:
:
@ -22950,27 +23091,40 @@ _ACEOF
fp_headers='
# include <stdio.h>
# if HAVE_STDIO_EXT_H
# include <stdio_ext.h>
# endif
'
ac_fn_c_check_decl "$LINENO" "__fpending" "ac_cv_have_decl___fpending" "$fp_headers
"
if test "x$ac_cv_have_decl___fpending" = x""yes; then :
ac_have_decl=1
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpending" >&5
$as_echo_n "checking for __fpending... " >&6; }
if test "${gl_cv_func___fpending+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_have_decl=0
fi
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL___FPENDING $ac_have_decl
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#if HAVE_STDIO_EXT_H
# include <stdio_ext.h>
#endif
int
main ()
{
return ! __fpending (stdin);
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
gl_cv_func___fpending=yes
else
gl_cv_func___fpending=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func___fpending" >&5
$as_echo "$gl_cv_func___fpending" >&6; }
if test $ac_cv_func___fpending = no; then
if test $gl_cv_func___fpending = no; then
@ -24090,6 +24244,48 @@ done
if test $ac_cv_func_mkostemp != yes; then
HAVE_MKOSTEMP=0
fi
if test $HAVE_MKOSTEMP = 0; then
gl_LIBOBJS="$gl_LIBOBJS mkostemp.$ac_objext"
fi
cat >>confdefs.h <<_ACEOF
#define GNULIB_MKOSTEMP 1
_ACEOF
GNULIB_MKOSTEMP=1
if test $APPLE_UNIVERSAL_BUILD = 1; then
# A universal build on Apple Mac OS X platforms.
# The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode.
@ -27493,9 +27689,11 @@ $as_echo "#define FUTIMESAT_NULL_BUG 1" >>confdefs.h
gl_gnulib_enabled_03e0aaad4cb89ca757653bd367a6ccb7=false
gl_gnulib_enabled_pathmax=false
gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=false
gl_gnulib_enabled_secure_getenv=false
gl_gnulib_enabled_stat=false
gl_gnulib_enabled_strtoll=false
gl_gnulib_enabled_strtoull=false
gl_gnulib_enabled_tempname=false
gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec=false
func_gl_gnulib_m4code_260941c0e5dc67ec9e87d1fb321c300b ()
{
@ -28096,6 +28294,70 @@ fi
gl_gnulib_enabled_6099e9737f757db36c47fa9d9f02e88c=true
fi
}
func_gl_gnulib_m4code_secure_getenv ()
{
if ! $gl_gnulib_enabled_secure_getenv; then
if test $ac_cv_func_secure_getenv = no; then
HAVE_SECURE_GETENV=0
fi
if test $HAVE_SECURE_GETENV = 0; then
gl_LIBOBJS="$gl_LIBOBJS secure_getenv.$ac_objext"
for ac_func in __secure_getenv
do :
ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv"
if test "x$ac_cv_func___secure_getenv" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE___SECURE_GETENV 1
_ACEOF
fi
done
if test $ac_cv_func___secure_getenv = no; then
for ac_func in issetugid
do :
ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid"
if test "x$ac_cv_func_issetugid" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ISSETUGID 1
_ACEOF
fi
done
fi
fi
GNULIB_SECURE_GETENV=1
gl_gnulib_enabled_secure_getenv=true
fi
}
func_gl_gnulib_m4code_stat ()
{
if ! $gl_gnulib_enabled_stat; then
@ -28340,6 +28602,18 @@ done
gl_gnulib_enabled_strtoull=true
fi
}
func_gl_gnulib_m4code_tempname ()
{
if ! $gl_gnulib_enabled_tempname; then
:
gl_gnulib_enabled_tempname=true
func_gl_gnulib_m4code_secure_getenv
fi
}
func_gl_gnulib_m4code_682e609604ccaac6be382e4ee3a4eaec ()
{
if ! $gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec; then
@ -28382,6 +28656,9 @@ done
if test $REPLACE_LSTAT = 1; then
func_gl_gnulib_m4code_stat
fi
if test $HAVE_MKOSTEMP = 0; then
func_gl_gnulib_m4code_tempname
fi
if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
func_gl_gnulib_m4code_stat
fi
@ -28481,6 +28758,14 @@ else
gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c_FALSE=
fi
if $gl_gnulib_enabled_secure_getenv; then
gl_GNULIB_ENABLED_secure_getenv_TRUE=
gl_GNULIB_ENABLED_secure_getenv_FALSE='#'
else
gl_GNULIB_ENABLED_secure_getenv_TRUE='#'
gl_GNULIB_ENABLED_secure_getenv_FALSE=
fi
if $gl_gnulib_enabled_stat; then
gl_GNULIB_ENABLED_stat_TRUE=
gl_GNULIB_ENABLED_stat_FALSE='#'
@ -28505,6 +28790,14 @@ else
gl_GNULIB_ENABLED_strtoull_FALSE=
fi
if $gl_gnulib_enabled_tempname; then
gl_GNULIB_ENABLED_tempname_TRUE=
gl_GNULIB_ENABLED_tempname_FALSE='#'
else
gl_GNULIB_ENABLED_tempname_TRUE='#'
gl_GNULIB_ENABLED_tempname_FALSE=
fi
if $gl_gnulib_enabled_682e609604ccaac6be382e4ee3a4eaec; then
gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_TRUE=
gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_FALSE='#'
@ -28713,6 +29006,7 @@ echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}
echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}"
echo " Does Emacs use -lotf? ${HAVE_LIBOTF}"
echo " Does Emacs use -lxft? ${HAVE_XFT}"
echo " Does Emacs directly use zlib? ${HAVE_ZLIB}"
echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
echo
@ -28760,10 +29054,13 @@ if test "$HAVE_NS" = "yes"; then
if test "$NS_IMPL_GNUSTEP" = yes; then
ac_config_files="$ac_config_files nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:nextstep/templates/Info-gnustep.plist.in nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:nextstep/templates/Emacs.desktop.in"
ns_check_file=Resources/Info-gnustep.plist
else
ac_config_files="$ac_config_files nextstep/Cocoa/Emacs.base/Contents/Info.plist:nextstep/templates/Info.plist.in nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:nextstep/templates/InfoPlist.strings.in"
ns_check_file=Contents/Info.plist
fi
fi
SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile"
@ -28993,6 +29290,10 @@ if test -z "${gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c_TRUE}" && test
as_fn_error "conditional \"gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_secure_getenv_TRUE}" && test -z "${gl_GNULIB_ENABLED_secure_getenv_FALSE}"; then
as_fn_error "conditional \"gl_GNULIB_ENABLED_secure_getenv\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_stat_TRUE}" && test -z "${gl_GNULIB_ENABLED_stat_FALSE}"; then
as_fn_error "conditional \"gl_GNULIB_ENABLED_stat\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -29005,6 +29306,10 @@ if test -z "${gl_GNULIB_ENABLED_strtoull_TRUE}" && test -z "${gl_GNULIB_ENABLED_
as_fn_error "conditional \"gl_GNULIB_ENABLED_strtoull\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_tempname_TRUE}" && test -z "${gl_GNULIB_ENABLED_tempname_FALSE}"; then
as_fn_error "conditional \"gl_GNULIB_ENABLED_tempname\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_TRUE}" && test -z "${gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_FALSE}"; then
as_fn_error "conditional \"gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5

125
configure.ac
View File

@ -24,18 +24,43 @@ dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.65)
AC_INIT(emacs, 24.3.50)
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
dnl rather than on the command-line.
emacs_config_options=
optsep=
dnl This is the documented way to record the args passed to configure,
dnl rather than $ac_configure_args.
emacs_config_options="$@"
## Add some environment variables, if they were passed via the environment
## rather than on the command-line.
for var in CFLAGS CPPFLAGS LDFLAGS; do
case "$emacs_config_options" in
*$var=*) continue ;;
esac
eval val="\$${var}"
test x"$val" = x && continue
emacs_config_options="${emacs_config_options}${emacs_config_options:+ }$var=\"$val\""
for opt in ${1+"$@"} CFLAGS CPPFLAGS LDFLAGS; do
case $opt in
-n | --no-create | --no-recursion)
continue ;;
CFLAGS | CPPFLAGS | LDFLAGS)
eval 'test "${'$opt'+set}" = set' || continue
case " $*" in
*" $opt="*) continue ;;
esac
eval opt=$opt=\$$opt ;;
esac
emacs_shell_specials=$IFS\''"#$&()*;<>?@<:@\\`{|~'
case $opt in
*[["$emacs_shell_specials"]]*)
case $opt in
*\'*)
emacs_quote_apostrophes="s/'/'\\\\''/g"
opt=`AS_ECHO(["$opt"]) | sed "$emacs_quote_apostrophes"` ;;
esac
opt="'$opt'"
case $opt in
*[['"\\']]*)
emacs_quote_for_c='s/[["\\]]/\\&/g; $!s/$/\\n\\/'
opt=`AS_ECHO(["$opt"]) | sed "$emacs_quote_for_c"` ;;
esac ;;
esac
AS_VAR_APPEND([emacs_config_options], ["$optsep$opt"])
optsep=' '
done
AC_CONFIG_HEADER(src/config.h:src/config.in)
@ -60,7 +85,7 @@ locallisppath='${datadir}/emacs/${version}/site-lisp:'\
lisppath='${locallisppath}:${standardlisppath}'
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
etcdocdir='${datadir}/emacs/${version}/etc'
gamedir='${localstatedir}/games/emacs'
dnl Special option to disable the most of other options.
@ -142,12 +167,12 @@ AC_ARG_WITH([mailhost],[AS_HELP_STRING([--with-mailhost=HOSTNAME],
AC_DEFINE_UNQUOTED(MAILHOST, ["$withval"], [String giving fallback POP mail host.]))
AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE],
[compile with sound support (VALUE one of: yes, ossaudio, alsa, no;
[compile with sound support (VALUE one of: yes, alsa, oss, bsd-ossaudio, no;
default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW.])],
[ case "${withval}" in
yes|no|ossaudio|alsa) val=$withval ;;
yes|no|alsa|oss|bsd-ossaudio) val=$withval ;;
*) AC_MSG_ERROR([`--with-sound=$withval' is invalid;
this option's value should be `yes', `no', `ossaudio', or `alsa'.])
this option's value should be `yes', `no', `alsa', `oss', or `bsd-ossaudio'.])
;;
esac
with_sound=$val
@ -211,6 +236,7 @@ OPTION_DEFAULT_ON([gconf],[don't compile with GConf support])
OPTION_DEFAULT_ON([gsettings],[don't compile with GSettings support])
OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support])
OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support])
OPTION_DEFAULT_ON([zlib],[don't compile with zlib decompression support])
AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB],
[use a file notification library (LIB one of: yes, gfile, inotify, w32, no)])],
@ -971,6 +997,13 @@ INFO_OPTS=--no-split
AC_SUBST(INFO_EXT)
AC_SUBST(INFO_OPTS)
if test $opsys = mingw32; then
DOCMISC_W32=efaq-w32
else
DOCMISC_W32=
fi
AC_SUBST(DOCMISC_W32)
dnl Add our options to ac_link now, after it is set up.
if test x$GCC = xyes; then
@ -1274,12 +1307,15 @@ if test "${with_sound}" != "no"; then
#include <windows.h>
#endif
])
if test "${with_sound}" = "ossaudio" || test "${with_sound}" = "yes"; then
test "${with_sound}" = "oss" && test "${have_sound_header}" != "yes" && \
AC_MSG_ERROR([OSS sound support requested but not found.])
if test "${with_sound}" = "bsd-ossaudio" || test "${with_sound}" = "yes"; then
# Emulation library used on NetBSD.
AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
test "${with_sound}" = "ossaudio" && test -z "$LIBSOUND" && \
AC_MSG_ERROR([ossaudio sound support requested but not found.])
dnl FIXME? If we did find ossaudio, should we set with_sound=ossaudio?
test "${with_sound}" = "bsd-ossaudio" && test -z "$LIBSOUND" && \
AC_MSG_ERROR([bsd-ossaudio sound support requested but not found.])
dnl FIXME? If we did find ossaudio, should we set with_sound=bsd-ossaudio?
dnl Traditionally, we go on to check for alsa too. Does that make sense?
fi
AC_SUBST(LIBSOUND)
@ -1614,7 +1650,7 @@ if test "${HAVE_NS}" = yes; then
dnl This one isn't really used, only archlibdir is.
libexecdir="\${ns_appbindir}/libexec"
archlibdir="\${ns_appbindir}/libexec"
docdir="\${ns_appresdir}/etc"
etcdocdir="\${ns_appresdir}/etc"
etcdir="\${ns_appresdir}/etc"
dnl FIXME maybe set datarootdir instead.
dnl That would also get applications, icons, man.
@ -1641,6 +1677,7 @@ CLIENTRES=
CLIENTW=
W32_RES_LINK=
EMACS_MANIFEST=
UPDATE_MANIFEST=
if test "${with_w32}" != no; then
case "${opsys}" in
cygwin)
@ -1691,6 +1728,7 @@ if test "${HAVE_W32}" = "yes"; then
x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
*) EMACS_MANIFEST="emacs-x86.manifest" ;;
esac
UPDATE_MANIFEST=update-game-score.exe.manifest
if test "${opsys}" = "cygwin"; then
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@ -1717,6 +1755,7 @@ AC_SUBST(W32_OBJ)
AC_SUBST(W32_LIBS)
AC_SUBST(EMACSRES)
AC_SUBST(EMACS_MANIFEST)
AC_SUBST(UPDATE_MANIFEST)
AC_SUBST(CLIENTRES)
AC_SUBST(CLIENTW)
AC_SUBST(W32_RES_LINK)
@ -2939,6 +2978,26 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
fi
AC_SUBST(LIBPNG)
HAVE_ZLIB=no
LIBZ=
if test "${with_zlib}" != "no"; then
OLIBS=$LIBS
AC_SEARCH_LIBS([inflateEnd], [z], [HAVE_ZLIB=yes])
LIBS=$OLIBS
case $ac_cv_search_inflateEnd in
-*) LIBZ=$ac_cv_search_inflateEnd ;;
esac
fi
if test "${HAVE_ZLIB}" = "yes"; then
AC_DEFINE([HAVE_ZLIB], 1, [Define to 1 if you have the zlib library (-lz).])
### mingw32 doesn't use -lz, since it loads the library dynamically.
if test "${opsys}" = "mingw32"; then
LIBZ=
fi
fi
AC_SUBST(LIBZ)
### Use -ltiff if available, unless `--with-tiff=no'.
### mingw32 doesn't use -ltiff, since it loads the library dynamically.
HAVE_TIFF=no
@ -3277,7 +3336,7 @@ select getpagesize setlocale \
getrlimit setrlimit shutdown getaddrinfo \
strsignal setitimer \
sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
gai_strerror mkostemp mkstemp getline getdelim sync \
gai_strerror getline getdelim sync \
difftime posix_memalign \
getpwent endpwent getgrent endgrent \
touchlock \
@ -3798,7 +3857,7 @@ emacs_broken_SIGIO=no
case $opsys in
dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
hpux* | irix6-5 | openbsd | sol2* | unixware | gnu-kfreebsd )
hpux* | irix6-5 | openbsd | sol2* | unixware )
emacs_broken_SIGIO=yes
;;
@ -3970,7 +4029,7 @@ case $opsys in
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptyname = 0; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); if (grantpt (fd) != -1 && unlockpt (fd) != -1) ptyname = ptsname(fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (!ptyname) { emacs_close (fd); return -1; } snprintf (pty_name, PTY_NAME_SIZE, "%s", ptyname); }])
dnl if HAVE_POSIX_OPENPT
if test "x$ac_cv_func_posix_openpt" = xyes; then
AC_DEFINE(PTY_OPEN, [fd = posix_openpt (O_RDWR | O_CLOEXEC | O_NOCTTY)])
AC_DEFINE(PTY_OPEN, [do { fd = posix_openpt (O_RDWR | O_CLOEXEC | O_NOCTTY); if (fd < 0 && errno == EINVAL) fd = posix_openpt (O_RDWR | O_NOCTTY); } while (0)])
AC_DEFINE(PTY_NAME_SPRINTF, [])
dnl if HAVE_GETPT
elif test "x$ac_cv_func_getpt" = xyes; then
@ -4316,14 +4375,16 @@ fi
case $opsys in
dnl Emacs supplies its own malloc, but glib (part of Gtk+) calls
dnl memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
dnl As malloc is not the Cygwin malloc, the Cygwin memalign always
dnl returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */
dnl Emacs supplies its own malloc, but glib calls posix_memalign,
dnl and on Cygwin prior to version 1.7.24 that becomes the
dnl Cygwin-supplied posix_memalign. As malloc is not the Cygwin
dnl malloc, the Cygwin posix_memalign always returns ENOSYS. A
dnl workaround is to set G_SLICE=always-malloc. This is no longer
dnl needed starting with cygwin-1.7.24, and it is no longer
dnl effective starting with glib-2.36. */
cygwin)
AC_DEFINE(G_SLICE_ALWAYS_MALLOC, 1, [Define to set the
G_SLICE environment variable to "always-malloc" at startup, if
using GTK.])
G_SLICE environment variable to "always-malloc" at startup.])
;;
hpux11)
@ -4387,7 +4448,7 @@ AC_SUBST(lisppath)
AC_SUBST(x_default_search_path)
AC_SUBST(etcdir)
AC_SUBST(archlibdir)
AC_SUBST(docdir)
AC_SUBST(etcdocdir)
AC_SUBST(bitmapdir)
AC_SUBST(gamedir)
AC_SUBST(gameuser)
@ -4414,8 +4475,6 @@ fi
AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}",
[Define to the canonical Emacs configuration name.])
dnl Replace any embedded " characters (bug#13274).
emacs_config_options=`echo "$emacs_config_options " | sed -e 's/--no-create //' -e 's/--no-recursion //' -e 's/ *$//' -e "s/\"/'/g"`
AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}",
[Define to the options passed to configure.])
AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure
@ -4791,6 +4850,7 @@ echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}
echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}"
echo " Does Emacs use -lotf? ${HAVE_LIBOTF}"
echo " Does Emacs use -lxft? ${HAVE_XFT}"
echo " Does Emacs directly use zlib? ${HAVE_ZLIB}"
echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
echo
@ -4837,10 +4897,13 @@ if test "$HAVE_NS" = "yes"; then
if test "$NS_IMPL_GNUSTEP" = yes; then
AC_CONFIG_FILES([nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:nextstep/templates/Info-gnustep.plist.in \
nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:nextstep/templates/Emacs.desktop.in])
ns_check_file=Resources/Info-gnustep.plist
else
AC_CONFIG_FILES([nextstep/Cocoa/Emacs.base/Contents/Info.plist:nextstep/templates/Info.plist.in \
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:nextstep/templates/InfoPlist.strings.in])
ns_check_file=Contents/Info.plist
fi
AC_SUBST(ns_check_file)
fi
dnl Obviously there is duplication here wrt $SUBDIR_MAKEFILES.

43
doc/emacs/ChangeLog
View File

@ -2,6 +2,49 @@
* maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
2013-08-31 Ulrich Müller <ulm@gentoo.org>
* xresources.texi (Motif Resources):
Rename from LessTif Resources. Update xrefs. (Bug#15145)
* emacs.texi: Update menu.
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-08-17 Xue Fuqiao <xfq.free@gmail.com>
* text.texi (Enriched Justification): Minor fixes.
2013-08-14 Xue Fuqiao <xfq.free@gmail.com>
* files.texi (Filesets): Add an index.
2013-08-12 Glenn Morris <rgm@gnu.org>
* macos.texi (GNUstep Support):
* trouble.texi (Checklist, Contributing, Service):
Avoid mailto: in html output.
* Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(emacs.ps, emacs-xtra.ps): Remove explicit rules.
(emacs.html): Use HTML_OPTS.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
2013-07-31 Eli Zaretskii <eliz@gnu.org>
* emacs.texi (Top): Remove menu item for the removed "Disabling

96
doc/emacs/Makefile.in
View File

@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
SHELL = /bin/sh
SHELL = @SHELL@
# NB If you add any more configure variables,
# update the sed rules in the dist target below.
@ -38,8 +38,22 @@ buildinfodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
prefix = @prefix@
datarootdir = @datarootdir@
datadir = @datadir@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
docdir = @docdir@
dvidir = @dvidir@
htmldir = @htmldir@
pdfdir = @pdfdir@
psdir = @psdir@
MKDIR_P = @MKDIR_P@
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.
@ -47,6 +61,9 @@ INFO_EXT=@INFO_EXT@
# http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html
INFO_OPTS=@INFO_OPTS@
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.
MAKEINFO = @MAKEINFO@
@ -60,6 +77,10 @@ DVIPS = dvips
ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
DVI_TARGETS = emacs.dvi emacs-xtra.dvi
HTML_TARGETS = emacs.html
PDF_TARGETS = emacs.pdf emacs-xtra.pdf
PS_TARGETS = emacs.ps emacs-xtra.ps
EMACS_XTRA= \
${srcdir}/emacs-xtra.texi \
@ -128,11 +149,16 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
.PHONY: info dvi html pdf ps
.SUFFIXES: .ps .dvi
.dvi.ps:
$(DVIPS) -o $@ $<
info: $(buildinfodir)/emacs$(INFO_EXT)
dvi: emacs.dvi
html: emacs.html
pdf: emacs.pdf
ps: emacs.ps
dvi: $(DVI_TARGETS)
html: $(HTML_TARGETS)
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.
@ -145,21 +171,15 @@ $(buildinfodir)/emacs$(INFO_EXT): ${EMACSSOURCES}
emacs.dvi: ${EMACSSOURCES}
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
emacs.ps: emacs.dvi
$(DVIPS) -o $@ emacs.dvi
emacs.pdf: ${EMACSSOURCES}
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi
emacs.html: ${EMACSSOURCES}
$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ ${srcdir}/emacs.texi
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs.texi
emacs-xtra.dvi: $(EMACS_XTRA)
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
emacs-xtra.ps: emacs-xtra.dvi
$(DVIPS) -o $@ emacs-xtra.dvi
emacs-xtra.pdf: $(EMACS_XTRA)
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-xtra.texi
@ -172,9 +192,7 @@ mostlyclean:
## Products not in the release tarfiles.
clean: mostlyclean
rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf \
emacs.ps emacs-xtra.ps
rm -rf emacs.html/
rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
rm -f emacs-manual-${version}.tar*
distclean: clean
@ -207,4 +225,52 @@ dist:
tar -cf emacs-manual-${version}.tar emacs-manual-${version}
rm -rf emacs-manual-${version}
.PHONY: install-dvi install-html install-pdf install-ps install-doc
install-dvi: dvi
umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir)
$(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir)
install-html: html
umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir)
$(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir)
install-pdf: pdf
umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir)
$(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir)
install-ps: ps
umask 022; $(MKDIR_P) $(DESTDIR)$(psdir)
for file in $(PS_TARGETS); do \
$(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \
[ -n "${GZIP_PROG}" ] || continue; \
rm -f $(DESTDIR)$(psdir)/$${file}.gz; \
${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \
done
## Top-level Makefile installs the info pages.
install-doc: install-dvi install-html install-pdf install-ps
.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps uninstall-doc
uninstall-dvi:
for file in $(DVI_TARGETS); do \
rm -f $(DESTDIR)$(dvidir)/$${file}; \
done
uninstall-html:
for file in $(HTML_TARGETS); do \
rm -f $(DESTDIR)$(htmldir)/$${file}; \
done
uninstall-ps:
ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
for file in $(PS_TARGETS); do \
rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \
done
uninstall-pdf:
for file in $(PDF_TARGETS); do \
rm -f $(DESTDIR)$(pdfdir)/$${file}; \
done
uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
### Makefile ends here

2
doc/emacs/emacs.texi
View File

@ -1189,7 +1189,7 @@ X Options and Resources
* Resources:: Using X resources with Emacs (in general).
* Table of Resources:: Table of specific X resources that affect Emacs.
* Lucid Resources:: X resources for Lucid menus.
* LessTif Resources:: X resources for LessTif and Motif menus.
* Motif Resources:: X resources for Motif and LessTif menus.
* GTK resources:: Resources for GTK widgets.
GTK resources

1
doc/emacs/files.texi
View File

@ -1982,6 +1982,7 @@ thumbnails. @xref{Image-Dired}.
@node Filesets
@section Filesets
@cindex filesets
@cindex sets of files
@findex filesets-init
If you regularly edit a certain group of files, you can define them

1
doc/emacs/glossary.texi
View File

@ -873,6 +873,7 @@ The Emacs major modes are a mutually exclusive set of options, each of
which configures Emacs for editing a certain sort of text. Ideally,
each programming language has its own major mode. @xref{Major Modes}.
@c FIXME: Mention margins for filling?
@item Margin
The space between the usable part of a window (including the
fringe) and the window edge.

2
doc/emacs/killing.texi
View File

@ -109,6 +109,8 @@ number of characters. If the numeric argument is omitted or one, they
delete all the text in the region if it is active (@pxref{Using
Region}).
@c FIXME: `cycle-spacing' should be documented, too. (Maybe not in
@c this node, tho.) --xfq
@kindex M-\
@findex delete-horizontal-space
@kindex M-SPC

6
doc/emacs/macos.texi
View File

@ -210,4 +210,10 @@ restart Emacs to access newly-available services.
Emacs can be built and run under GNUstep, but there are still
issues to be addressed. Interested developers should contact
@ifnothtml
@email{emacs-devel@@gnu.org}.
@end ifnothtml
@ifhtml
@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
emacs-devel mailing list}.
@end ifhtml

11
doc/emacs/text.texi
View File

@ -2255,6 +2255,7 @@ Prefix}.
@node Enriched Justification
@subsection Justification in Enriched Text
@cindex justification style
In Enriched mode, you can use the following commands to specify
various @dfn{justification styles} for filling. These commands apply
@ -2293,13 +2294,13 @@ commands do nothing on text with this setting. You can, however,
still indent the left margin.
@end table
@c FIXME: We should explain the effect of these symbols. --xfq
@vindex default-justification
You can also specify justification styles using the Justification
submenu in the Text Properties menu.
The default justification style is specified by the per-buffer
variable @code{default-justification}. Its value should be one of the
symbols @code{left}, @code{right}, @code{full}, @code{center}, or
@code{none}.
submenu in the Text Properties menu. The default justification style
is specified by the per-buffer variable @code{default-justification}.
Its value should be one of the symbols @code{left}, @code{right},
@code{full}, @code{center}, or @code{none}.
@node Enriched Properties
@subsection Setting Other Text Properties

46
doc/emacs/trouble.texi
View File

@ -658,7 +658,13 @@ absolutely sure it is best to leave it, so that the developers can
decide for themselves.
When you have finished writing your report, type @kbd{C-c C-c} and it
will be sent to the Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.
will be sent to the Emacs maintainers at
@ifnothtml
@email{bug-gnu-emacs@@gnu.org}.
@end ifnothtml
@ifhtml
@url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, bug-gnu-emacs}.
@end ifhtml
(If you want to suggest an improvement or new feature, use the same
address.) If you cannot send mail from inside Emacs, you can copy the
text of your report to your normal mail client (if your system
@ -1138,15 +1144,26 @@ form that is clearly safe to install.
@section Contributing to Emacs Development
@cindex contributing to Emacs
If you would like to work on improving Emacs, please contact
the maintainers at @email{emacs-devel@@gnu.org}. You can ask for
suggested projects or suggest your own ideas.
If you would like to work on improving Emacs, please contact the maintainers at
@ifnothtml
@email{emacs-devel@@gnu.org}.
@end ifnothtml
@ifhtml
@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
emacs-devel mailing list}.
@end ifhtml
You can ask for suggested projects or suggest your own ideas.
If you have already written an improvement, please tell us about it. If
you have not yet started work, it is useful to contact
@email{emacs-devel@@gnu.org} before you start; it might be
possible to suggest ways to make your extension fit in better with the
rest of Emacs.
@ifnothtml
@email{emacs-devel@@gnu.org}
@end ifnothtml
@ifhtml
@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, emacs-devel}
@end ifhtml
before you start; it might be possible to suggest ways to make your
extension fit in better with the rest of Emacs.
The development version of Emacs can be downloaded from the
repository where it is actively maintained by a group of developers.
@ -1164,10 +1181,17 @@ ways to find it:
@itemize @bullet
@item
Send a message to the mailing list
@email{help-gnu-emacs@@gnu.org}, or post your request on
newsgroup @code{gnu.emacs.help}. (This mailing list and newsgroup
interconnect, so it does not matter which one you use.)
Send a message to
@ifnothtml
the mailing list @email{help-gnu-emacs@@gnu.org},
@end ifnothtml
@ifhtml
@url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, the
help-gnu-emacs mailing list},
@end ifhtml
or post your request on newsgroup @code{gnu.emacs.help}. (This
mailing list and newsgroup interconnect, so it does not matter which
one you use.)
@item
Look in the service directory for someone who might help you for a fee.

20
doc/emacs/xresources.texi
View File

@ -27,7 +27,7 @@ system registry (@pxref{MS-Windows Registry}).
* Resources:: Using X resources with Emacs (in general).
* Table of Resources:: Table of specific X resources that affect Emacs.
* Lucid Resources:: X resources for Lucid menus.
* LessTif Resources:: X resources for LessTif and Motif menus.
* Motif Resources:: X resources for Motif and LessTif menus.
* GTK resources:: Resources for GTK widgets.
@end menu
@ -260,7 +260,7 @@ compiled with GTK+ support.
@ifnottex
@item @code{selectionFont} (class @code{SelectionFont})
Font name for pop-up menu items, in non-toolkit versions of Emacs. (For
toolkit versions, see @ref{Lucid Resources}, also see @ref{LessTif
toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
Resources}.)
@item @code{selectionTimeout} (class @code{SelectionTimeout})
@ -370,15 +370,15 @@ elements. Default is 1.
Margin of the menu bar, in characters. Default is 1.
@end table
@node LessTif Resources
@appendixsec LessTif Menu X Resources
@cindex Menu X Resources (LessTif widgets)
@cindex LessTif Widget X Resources
@node Motif Resources
@appendixsec Motif Menu X Resources
@cindex Menu X Resources (Motif widgets)
@cindex Motif Widget X Resources
If Emacs is compiled with the X toolkit support using LessTif or
Motif widgets, you can use X resources to customize the appearance of
the menu bar, pop-up menus, and dialog boxes. However, the resources
are organized differently from Lucid widgets.
If Emacs is compiled with the X toolkit support using Motif or
LessTif widgets, you can use X resources to customize the appearance
of the menu bar, pop-up menus, and dialog boxes. However, the
resources are organized differently from Lucid widgets.
The resource names for the menu bar are in the @samp{pane.menubar}
class, and they must be specified in this form:

47
doc/lispintro/ChangeLog
View File

@ -1,3 +1,50 @@
2013-09-01 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi (beginning-of-buffer complete):
Put back a version of the removed paragraph about raw prefix arg.
2013-09-01 Dani Moncayo <dmoncayo@gmail.com>
* emacs-lisp-intro.texi (beginning-of-buffer complete):
Update function details. (Bug#15085)
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-08-12 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi (Complete copy-region-as-kill): Fix typo.
* emacs-lisp-intro.texi (Thank You): Avoid mailto: in html output.
* Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(emacs-lisp-intro.ps): Remove explicit rule.
(emacs-lisp-intro.html): Use HTML_OPTS.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
2013-08-07 Eli Zaretskii <eliz@gnu.org>
* emacs-lisp-intro.texi (Beginning init File): Rename from
"Beginning a .emacs File", since a node name cannot include a
period.
(Top, Emacs Initialization, Change a defun): All references
changed. (Bug#15038)
2013-08-02 Xue Fuqiao <xfq.free@gmail.com>
* emacs-lisp-intro.texi (zap-to-char): Remove obsolete stuff.

93
doc/lispintro/Makefile.in
View File

@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
SHELL = /bin/sh
SHELL = @SHELL@
# NB If you add any more configure variables,
# update the sed rules in the dist target below.
@ -30,12 +30,29 @@ texinfodir = $(srcdir)/../misc
# Directory with emacsver.texi.
emacsdir = $(srcdir)/../emacs
prefix = @prefix@
datarootdir = @datarootdir@
datadir = @datadir@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
docdir = @docdir@
dvidir = @dvidir@
htmldir = @htmldir@
pdfdir = @pdfdir@
psdir = @psdir@
MKDIR_P = @MKDIR_P@
GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
INFO_OPTS=@INFO_OPTS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MAKEINFO = @MAKEINFO@
MAKEINFO_OPTS = --force -I $(emacsdir) -I $(srcdir)
TEXI2DVI = texi2dvi
@ -45,6 +62,11 @@ DVIPS = dvips
ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
DVI_TARGETS = emacs-lisp-intro.dvi
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 \
@ -52,12 +74,17 @@ srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
.PHONY: info dvi html pdf ps
.SUFFIXES: .ps .dvi
.dvi.ps:
$(DVIPS) -o $@ $<
info: ${buildinfodir}/eintr$(INFO_EXT)
dvi: emacs-lisp-intro.dvi
html: emacs-lisp-intro.html
pdf: emacs-lisp-intro.pdf
ps: emacs-lisp-intro.ps
dvi: $(DVI_TARGETS)
html: $(HTML_TARGETS)
pdf: $(PDF_TARGETS)
ps: $(PS_TARGETS)
# The file name eintr must fit within 5 characters, to allow for
# -NN extensions to fit into DOS 8+3 limits without clashing.
@ -69,14 +96,11 @@ ${buildinfodir}/eintr$(INFO_EXT): ${srcs}
emacs-lisp-intro.dvi: ${srcs}
$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi
emacs-lisp-intro.ps: emacs-lisp-intro.dvi
$(DVIPS) -o $@ emacs-lisp-intro.dvi
emacs-lisp-intro.pdf: ${srcs}
$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi
emacs-lisp-intro.html: ${srcs}
$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ ${srcdir}/emacs-lisp-intro.texi
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
.PHONY: mostlyclean clean distclean maintainer-clean infoclean
@ -85,8 +109,7 @@ mostlyclean:
*.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
clean: mostlyclean
rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf emacs-lisp-intro.ps
rm -rf emacs-lisp-intro.html/
rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
rm -f emacs-lispintro-${version}.tar*
distclean: clean
@ -118,4 +141,52 @@ dist:
tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
rm -rf emacs-lispintro-${version}
.PHONY: install-dvi install-html install-pdf install-ps install-doc
install-dvi: dvi
umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir)
$(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir)
install-html: html
umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir)
$(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir)
install-pdf: pdf
umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir)
$(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir)
install-ps: ps
umask 022; $(MKDIR_P) $(DESTDIR)$(psdir)
for file in $(PS_TARGETS); do \
$(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \
[ -n "${GZIP_PROG}" ] || continue; \
rm -f $(DESTDIR)$(psdir)/$${file}.gz; \
${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \
done
## Top-level Makefile installs the info pages.
install-doc: install-dvi install-html install-pdf install-ps
.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps uninstall-doc
uninstall-dvi:
for file in $(DVI_TARGETS); do \
rm -f $(DESTDIR)$(dvidir)/$${file}; \
done
uninstall-html:
for file in $(HTML_TARGETS); do \
rm -f $(DESTDIR)$(htmldir)/$${file}; \
done
uninstall-ps:
ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
for file in $(PS_TARGETS); do \
rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \
done
uninstall-pdf:
for file in $(PDF_TARGETS); do \
rm -f $(DESTDIR)$(pdfdir)/$${file}; \
done
uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
### Makefile ends here

31
doc/lispintro/emacs-lisp-intro.texi
View File

@ -648,7 +648,7 @@ Your @file{.emacs} File
* Default Configuration::
* Site-wide Init:: You can write site-wide init files.
* defcustom:: Emacs will write code for you.
* Beginning a .emacs File:: How to write a @code{.emacs file}.
* Beginning init File:: How to write a @file{.emacs} init file.
* Text and Auto-fill:: Automatically wrap lines.
* Mail Aliases:: Use abbreviations for email addresses.
* Indent Tabs Mode:: Don't use tabs with @TeX{}
@ -954,7 +954,12 @@ encouragement. My mistakes are my own.
@flushright
Robert J. Chassell
@ifnothtml
@email{bob@@gnu.org}
@end ifnothtml
@ifhtml
bob@@gnu.org
@end ifhtml
@end flushright
@c ================ Beginning of main text ================
@ -3260,7 +3265,7 @@ line that follows a semicolon is a comment. The end of the line is the
end of the comment. To stretch a comment over two or more lines, begin
each line with a semicolon.
@xref{Beginning a .emacs File, , Beginning a @file{.emacs}
@xref{Beginning init File, , Beginning a @file{.emacs}
File}, and @ref{Comments, , Comments, elisp, The GNU Emacs Lisp
Reference Manual}, for more about comments.
@ -6318,7 +6323,7 @@ and avoids clobbering the mark."
(/ (+ 10 (* size (prefix-numeric-value arg)))
10)))
(point-min))))
(if arg (forward-line 1)))
(if (and arg (not (consp arg))) (forward-line 1)))
@end group
@end smallexample
@ -6385,7 +6390,7 @@ to move point to the beginning of the next line if the command is
invoked with an argument:
@smallexample
(if arg (forward-line 1)))
(if (and arg (not (consp arg))) (forward-line 1))
@end smallexample
@noindent
@ -6394,14 +6399,10 @@ appropriate tenths position in the buffer. This is a flourish that
means that the cursor is always located @emph{at least} the requested
tenths of the way through the buffer, which is a nicety that is,
perhaps, not necessary, but which, if it did not occur, would be sure
to draw complaints.
On the other hand, it also means that if you specify the command with
a @kbd{C-u}, but without a number, that is to say, if the `raw prefix
argument' is simply a cons cell, then the command puts you at the
beginning of the second line @dots{} I don't know whether this is
intended or whether no one has dealt with the code to avoid this
happening.
to draw complaints. (The @code{(not (consp arg))} portion is so that
if you specify the command with a @kbd{C-u}, but without a number,
that is to say, if the `raw prefix argument' is simply a cons cell,
the command does not put you at the beginning of the second line.)
@node Second Buffer Related Review
@section Review
@ -8312,7 +8313,7 @@ As usual, this function can be divided into its component parts:
The arguments are @code{beg} and @code{end} and the function is
interactive with @code{"r"}, so the two arguments must refer to the
beginning and end of the region. If you have been reading though this
beginning and end of the region. If you have been reading through this
document from the beginning, understanding these parts of a function is
almost becoming routine.
@ -16706,7 +16707,7 @@ expressions in Emacs Lisp you can change or extend Emacs.
* Default Configuration::
* Site-wide Init:: You can write site-wide init files.
* defcustom:: Emacs will write code for you.
* Beginning a .emacs File:: How to write a @code{.emacs file}.
* Beginning init File:: How to write a @file{.emacs} init file.
* Text and Auto-fill:: Automatically wrap lines.
* Mail Aliases:: Use abbreviations for email addresses.
* Indent Tabs Mode:: Don't use tabs with @TeX{}
@ -16977,7 +16978,7 @@ intent is that neither programs nor users should ever change a value
set by @code{defconst}. (You can change it; the value set is a
variable; but please do not.)
@node Beginning a .emacs File
@node Beginning init File
@section Beginning a @file{.emacs} File
@cindex @file{.emacs} file, beginning of

110
doc/lispref/ChangeLog
View File

@ -1,3 +1,113 @@
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-08-26 Stefan Monnier <monnier@iro.umontreal.ca>
* variables.texi (File Local Variables): Don't recommend quoting! Ever!
2013-08-20 Eli Zaretskii <eliz@gnu.org>
* files.texi (Information about Files): Mention file names with
trailing blanks on MS-Windows. (Bug#15130)
2013-08-18 Xue Fuqiao <xfq.free@gmail.com>
* positions.texi (Positions): Improve indexing.
2013-08-18 Eli Zaretskii <eliz@gnu.org>
* markers.texi (The Region): Improve indexing.
2013-08-17 Xue Fuqiao <xfq.free@gmail.com>
* modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes.
* text.texi (Maintaining Undo): Mention interactive call of
buffer-disable-undo.
(Filling): Add cross-reference for hard newlines.
(Sorting): Fix indentation.
(Columns): Comment out undefined behavior.
(Case Changes): Fix an `args-out-of-range' error in the example.
2013-08-16 Xue Fuqiao <xfq.free@gmail.com>
* text.texi (Insertion): Refine.
(Margins): Add an index.
(Undo): Doc fix for `buffer-undo-list'.
* positions.texi (Character Motion):
* markers.texi (Moving Markers):
(Creating Markers): Comment out undefined behavior.
2013-08-15 Xue Fuqiao <xfq.free@gmail.com>
* markers.texi (The Region): Add/move indexes.
2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* display.texi (ImageMagick Images): Mention :content-type and
`image-content-type-suffixes'.
2013-08-13 Xue Fuqiao <xfq.free@gmail.com>
* positions.texi (Word Motion): Remove redundant sentence.
2013-08-13 Glenn Morris <rgm@gnu.org>
* lists.texi (List Elements):
Undocument behavior of nth and nthcdr with n < 0. (Bug#15059)
2013-08-13 Xue Fuqiao <xfq.free@gmail.com>
* frames.texi (Display Feature Testing): Add indexes.
2013-08-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
New variables.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(dvi, html, pdf, ps): Use *_TARGETS variables.
(elisp.html): Use HTML_OPTS.
(elisp.ps): Remove explicit rule.
(.PHONY): install-dvi, install-html, install-pdf, install-ps
,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(install-dvi, install-html, install-pdf, install-ps, install-doc)
(uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
(uninstall-doc): New rules.
(clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
2013-08-10 Xue Fuqiao <xfq.free@gmail.com>
* edebug.texi (Instrumenting Macro Calls): Use @defmac for macros.
2013-08-09 Xue Fuqiao <xfq.free@gmail.com>
* control.texi (Error Symbols): Minor fix for previous change.
2013-08-09 Stefan Monnier <monnier@iro.umontreal.ca>
* errors.texi (Standard Errors): Don't refer to `error-conditions'.
* control.texi (Signaling Errors): Refer to define-error.
(Error Symbols): Add `define-error'.
2013-08-06 Dmitry Antipov <dmantipov@yandex.ru>
* positions.texi (Motion by Screen Lines):
* display.texi (Truncation): Rename `cache-long-line-scans'
to `cache-long-scans'.
2013-08-05 Xue Fuqiao <xfq.free@gmail.com>
* windows.texi (Window Start and End): Add an index.
2013-08-02 Xue Fuqiao <xfq.free@gmail.com>
* display.texi (Face Functions): Add an index.

92
doc/lispref/Makefile.in
View File

@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
SHELL = /bin/sh
SHELL = @SHELL@
# NB If you add any more configure variables,
# update the sed rules in the dist target below.
@ -33,12 +33,29 @@ texinfodir = $(srcdir)/../misc
# Directory with emacsver.texi.
emacsdir = $(srcdir)/../emacs
prefix = @prefix@
datarootdir = @datarootdir@
datadir = @datadir@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
docdir = @docdir@
dvidir = @dvidir@
htmldir = @htmldir@
pdfdir = @pdfdir@
psdir = @psdir@
MKDIR_P = @MKDIR_P@
GZIP_PROG = @GZIP_PROG@
HTML_OPTS = --no-split --html
INFO_EXT=@INFO_EXT@
# Options used only when making info output.
INFO_OPTS=@INFO_OPTS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MAKEINFO = @MAKEINFO@
MAKEINFO_OPTS = --force --enable-encoding -I $(emacsdir) -I $(srcdir)
TEXI2DVI = texi2dvi
@ -48,6 +65,11 @@ DVIPS = dvips
ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
DVI_TARGETS = elisp.dvi
HTML_TARGETS = elisp.html
PDF_TARGETS = elisp.pdf
PS_TARGETS = elisp.ps
# List of all the texinfo files in the manual:
srcs = \
@ -108,11 +130,16 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
.PHONY: info dvi pdf ps
.SUFFIXES: .ps .dvi
.dvi.ps:
$(DVIPS) -o $@ $<
info: $(buildinfodir)/elisp$(INFO_EXT)
dvi: elisp.dvi
html: elisp.html
pdf: elisp.pdf
ps: elisp.ps
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)
@ -123,10 +150,7 @@ elisp.dvi: $(srcs)
$(ENVADD) $(TEXI2DVI) $(srcdir)/elisp.texi
elisp.html: $(srcs)
$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $(srcdir)/elisp.texi
elisp.ps: elisp.dvi
$(DVIPS) -o $@ elisp.dvi
$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $(srcdir)/elisp.texi
elisp.pdf: $(srcs)
$(ENVADD) $(TEXI2PDF) $(srcdir)/elisp.texi
@ -140,9 +164,8 @@ mostlyclean:
rm -f elisp[12]* vol[12].tmp
clean: mostlyclean
rm -f elisp.dvi elisp.pdf elisp.ps
rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
rm -f vol[12].dvi vol[12].pdf vol[12].ps
rm -rf elisp.html
rm -f emacs-lispref-${version}.tar*
distclean: clean
@ -175,4 +198,51 @@ dist:
tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
rm -rf emacs-lispref-${version}
.PHONY: install-dvi install-html install-pdf install-ps install-doc
install-dvi: dvi
umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir)
$(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir)
install-html: html
umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir)
$(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir)
install-pdf: pdf
umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir)
$(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir)
install-ps: ps
umask 022; $(MKDIR_P) $(DESTDIR)$(psdir)
for file in $(PS_TARGETS); do \
$(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \
[ -n "${GZIP_PROG}" ] || continue; \
rm -f $(DESTDIR)$(psdir)/$${file}.gz; \
${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \
done
## Top-level Makefile installs the info pages.
install-doc: install-dvi install-html install-pdf install-ps
.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps uninstall-doc
uninstall-dvi:
for file in $(DVI_TARGETS); do \
rm -f $(DESTDIR)$(dvidir)/$${file}; \
done
uninstall-html:
for file in $(HTML_TARGETS); do \
rm -f $(DESTDIR)$(htmldir)/$${file}; \
done
uninstall-ps:
ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
for file in $(PS_TARGETS); do \
rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \
done
uninstall-pdf:
for file in $(PDF_TARGETS); do \
rm -f $(DESTDIR)$(pdfdir)/$${file}; \
done
uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
### Makefile ends here

56
doc/lispref/control.texi
View File

@ -890,9 +890,8 @@ argument @var{data} is a list of additional Lisp objects relevant to
the circumstances of the error.
The argument @var{error-symbol} must be an @dfn{error symbol}---a symbol
bearing a property @code{error-conditions} whose value is a list of
condition names. This is how Emacs Lisp classifies different sorts of
errors. @xref{Error Symbols}, for a description of error symbols,
defined with @code{define-error}. This is how Emacs Lisp classifies different
sorts of errors. @xref{Error Symbols}, for a description of error symbols,
error conditions and condition names.
If the error is not handled, the two arguments are used in printing
@ -1118,8 +1117,8 @@ Here are examples of handlers:
@end example
Each error that occurs has an @dfn{error symbol} that describes what
kind of error it is. The @code{error-conditions} property of this
symbol is a list of condition names (@pxref{Error Symbols}). Emacs
kind of error it is, and which describes also a list of condition names
(@pxref{Error Symbols}). Emacs
searches all the active @code{condition-case} forms for a handler that
specifies one or more of these condition names; the innermost matching
@code{condition-case} handles the error. Within this
@ -1259,6 +1258,7 @@ should be robust if one does occur. Note that this macro uses
@cindex condition name
@cindex user-defined error
@kindex error-conditions
@kindex define-error
When you signal an error, you specify an @dfn{error symbol} to specify
the kind of error you have in mind. Each error has one and only one
@ -1275,42 +1275,38 @@ Thus, each error has one or more condition names: @code{error}, the
error symbol if that is distinct from @code{error}, and perhaps some
intermediate classifications.
In order for a symbol to be an error symbol, it must have an
@code{error-conditions} property which gives a list of condition names.
This list defines the conditions that this kind of error belongs to.
(The error symbol itself, and the symbol @code{error}, should always be
members of this list.) Thus, the hierarchy of condition names is
defined by the @code{error-conditions} properties of the error symbols.
Because quitting is not considered an error, the value of the
@code{error-conditions} property of @code{quit} is just @code{(quit)}.
@defun define-error name message &optional parent
In order for a symbol to be an error symbol, it must be defined with
@code{define-error} which takes a parent condition (defaults to @code{error}).
This parent defines the conditions that this kind of error belongs to.
The transitive set of parents always includes the error symbol itself, and the
symbol @code{error}. Because quitting is not considered an error, the set of
parents of @code{quit} is just @code{(quit)}.
@end defun
@cindex peculiar error
In addition to the @code{error-conditions} list, the error symbol
should have an @code{error-message} property whose value is a string to
be printed when that error is signaled but not handled. If the
error symbol has no @code{error-message} property or if the
@code{error-message} property exists, but is not a string, the error
message @samp{peculiar error} is used. @xref{Definition of signal}.
In addition to its parents, the error symbol has a @var{message} which
is a string to be printed when that error is signaled but not handled. If that
message is not valid, the error message @samp{peculiar error} is used.
@xref{Definition of signal}.
Internally, the set of parents is stored in the @code{error-conditions}
property of the error symbol and the message is stored in the
@code{error-message} property of the error symbol.
Here is how we define a new error symbol, @code{new-error}:
@example
@group
(put 'new-error
'error-conditions
'(error my-own-errors new-error))
@result{} (error my-own-errors new-error)
@end group
@group
(put 'new-error 'error-message "A new error")
@result{} "A new error"
(define-error 'new-error "A new error" 'my-own-errors)
@end group
@end example
@noindent
This error has three condition names: @code{new-error}, the narrowest
This error has several condition names: @code{new-error}, the narrowest
classification; @code{my-own-errors}, which we imagine is a wider
classification; and @code{error}, which is the widest of all.
classification; and all the conditions of @code{my-own-errors} which should
include @code{error}, which is the widest of all.
The error string should start with a capital letter but it should
not end with a period. This is for consistency with the rest of Emacs.
@ -1326,7 +1322,7 @@ your code can do this:
@end group
@end example
This error can be handled through any of the three condition names.
This error can be handled through any of its condition names.
This example handles @code{new-error} and any other errors in the class
@code{my-own-errors}:

13
doc/lispref/display.texi
View File

@ -217,9 +217,9 @@ over the @code{line-prefix} variable. @xref{Special Properties}.
continuation to display them, computing the continuation lines can
make redisplay slow. The column computation and indentation functions
also become slow. Then you might find it advisable to set
@code{cache-long-line-scans} to @code{t}.
@code{cache-long-scans} to @code{t}.
@defvar cache-long-line-scans
@defvar cache-long-scans
If this variable is non-@code{nil}, various indentation and motion
functions, and Emacs redisplay, cache the results of scanning the
buffer, and consult the cache to avoid rescanning regions of the buffer
@ -1243,6 +1243,7 @@ Type RET when done reading
@node Overlays
@section Overlays
@cindex overlays
@c FIXME: mention intervals in this section?
You can use @dfn{overlays} to alter the appearance of a buffer's text on
the screen, for the sake of presentation features. An overlay is an
@ -4663,6 +4664,14 @@ and if @code{:height} is set it will have precedence over
wish. @code{:max-width} and @code{:max-height} will always preserve
the aspect ratio.
@item :format
ImageMagick tries to auto-detect the image type, but it isn't always
able to. By using @code{:format-type}, we can give ImageMagick a hint
to try to help it. It's used in conjunction with the
@code{image-format-suffixes} variable, which provides a mapping from
content types to file name suffixes. This is then given to
ImageMagick as a file name hint.
@item :rotation
Specifies a rotation angle in degrees.

4
doc/lispref/edebug.texi
View File

@ -1132,14 +1132,14 @@ from the macro definition with @code{def-edebug-spec}. Adding
definitions in Lisp, but @code{def-edebug-spec} makes it possible to
define Edebug specifications for special forms implemented in C.
@deffn Macro def-edebug-spec macro specification
@defmac def-edebug-spec macro specification
Specify which expressions of a call to macro @var{macro} are forms to be
evaluated. @var{specification} should be the edebug specification.
Neither argument is evaluated.
The @var{macro} argument can actually be any symbol, not just a macro
name.
@end deffn
@end defmac
Here is a table of the possibilities for @var{specification} and how each
directs processing of arguments.

11
doc/lispref/errors.texi
View File

@ -7,12 +7,11 @@
@appendix Standard Errors
@cindex standard errors
Here is a list of the more important error symbols in standard Emacs,
grouped by concept. The list includes each symbol's message (on the
@code{error-message} property of the symbol) and a cross reference to a
description of how the error can occur.
Here is a list of the more important error symbols in standard Emacs, grouped
by concept. The list includes each symbol's message and a cross reference
to a description of how the error can occur.
Each error symbol has an @code{error-conditions} property that is a
Each error symbol has an set of parent error conditions that is a
list of symbols. Normally this list includes the error symbol itself
and the symbol @code{error}. Occasionally it includes additional
symbols, which are intermediate classifications, narrower than
@ -24,8 +23,6 @@ conditions, that means it has none.
As a special exception, the error symbol @code{quit} does not have the
condition @code{error}, because quitting is not considered an error.
@c You can grep for "(put 'foo 'error-conditions ...) to find
@c examples defined in Lisp. E.g., soap-client.el, sasl.el.
Most of these error symbols are defined in C (mainly @file{data.c}),
but some are defined in Lisp. For example, the file @file{userlock.el}
defines the @code{file-locked} and @code{file-supersession} errors.

8
doc/lispref/files.texi
View File

@ -776,6 +776,14 @@ return information about actual files or directories, so their
arguments must all exist as actual files or directories unless
otherwise noted.
@cindex file names, trailing whitespace
@cindex trailing blanks in file names
Be careful with file names that end in blanks: some filesystems
(notably, MS-Windows) will ignore trailing whitespace in file names,
and return information about the file after stripping those blanks
from the name, not about the file whose name you passed to the
functions described in this section.
@menu
* Testing Accessibility:: Is a given file readable? Writable?
* Kinds of Files:: Is it a directory? A symbolic link?

6
doc/lispref/frames.texi
View File

@ -446,7 +446,7 @@ default parameters by supplying their own parameters.
If you invoke Emacs with command-line options that specify frame
appearance, those options take effect by adding elements to either
@code{initial-frame-alist} or @code{default-frame-alist}. Options
which affect just the initial frame, such as @samp{-geometry} and
which affect just the initial frame, such as @samp{--geometry} and
@samp{--maximized}, add to @code{initial-frame-alist}; the others add
to @code{default-frame-alist}. @pxref{Emacs Invocation,, Command Line
Arguments for Emacs Invocation, emacs, The GNU Emacs Manual}.
@ -1362,7 +1362,7 @@ Terminals}.
@node Input Focus
@section Input Focus
@cindex input focus
@c @cindex selected frame Duplicates selected-frame
@c @cindex selected frame Duplicates selected-frame, same for selected-window.
At any time, one frame in Emacs is the @dfn{selected frame}. The selected
window always resides on the selected frame.
@ -2391,6 +2391,7 @@ displays returned by @code{display-mm-height} and
@code{display-mm-width} in case the system provides incorrect values.
@end defopt
@cindex backing store
@defun display-backing-store &optional display
This function returns the backing store capability of the display.
Backing store means recording the pixels of windows (and parts of
@ -2402,6 +2403,7 @@ Values can be the symbols @code{always}, @code{when-mapped}, or
when the question is inapplicable to a certain kind of display.
@end defun
@cindex SaveUnder feature
@defun display-save-under &optional display
This function returns non-@code{nil} if the display supports the
SaveUnder feature. That feature is used by pop-up windows

15
doc/lispref/lists.texi
View File

@ -270,8 +270,10 @@ are numbered starting with zero, so the @sc{car} of @var{list} is
element number zero. If the length of @var{list} is @var{n} or less,
the value is @code{nil}.
If @var{n} is negative, @code{nth} returns the first element of
@var{list}.
@c Behavior for -ve n undefined since 2013/08; see bug#15059.
@ignore
If @var{n} is negative, @code{nth} returns the first element of @var{list}.
@end ignore
@example
@group
@ -281,10 +283,6 @@ If @var{n} is negative, @code{nth} returns the first element of
@group
(nth 10 '(1 2 3 4))
@result{} nil
@end group
@group
(nth -3 '(1 2 3 4))
@result{} 1
(nth n x) @equiv{} (car (nthcdr n x))
@end group
@ -300,7 +298,8 @@ This function returns the @var{n}th @sc{cdr} of @var{list}. In other
words, it skips past the first @var{n} links of @var{list} and returns
what follows.
If @var{n} is zero or negative, @code{nthcdr} returns all of
@c "or negative" removed 2013/08; see bug#15059.
If @var{n} is zero, @code{nthcdr} returns all of
@var{list}. If the length of @var{list} is @var{n} or less,
@code{nthcdr} returns @code{nil}.
@ -314,7 +313,7 @@ If @var{n} is zero or negative, @code{nthcdr} returns all of
@result{} nil
@end group
@group
(nthcdr -3 '(1 2 3 4))
(nthcdr 0 '(1 2 3 4))
@result{} (1 2 3 4)
@end group
@end example

26
doc/lispref/markers.texi
View File

@ -216,11 +216,14 @@ new marker that points to the same place and the same buffer as does
The new marker's insertion type is specified by the argument
@var{insertion-type}. @xref{Marker Insertion Types}.
@c This behavior used to be documented until 2013/08.
@ignore
If passed an integer argument less than 1, @code{copy-marker} returns a
new marker that points to the beginning of the current buffer. If
passed an integer argument greater than the length of the buffer,
@code{copy-marker} returns a new marker that points to the end of the
buffer.
@end ignore
@example
@group
@ -279,6 +282,8 @@ This function returns the position that @var{marker} points to, or
This function returns the buffer that @var{marker} points into, or
@code{nil} if it points nowhere.
@c FIXME: The `buffer' argument of `set-marker' already defaults to
@c the current buffer, why use `(current-buffer)' explicitly here?
@example
@group
(setq m (make-marker))
@ -349,11 +354,15 @@ This function moves @var{marker} to @var{position}
in @var{buffer}. If @var{buffer} is not provided, it defaults to
the current buffer.
@c This behavior used to be documented until 2013/08.
@ignore
If @var{position} is less than 1, @code{set-marker} moves @var{marker}
to the beginning of the buffer. If @var{position} is greater than the
size of the buffer (@pxref{Point}), @code{set-marker} moves marker to
the end of the buffer. If @var{position} is @code{nil} or a marker
that points nowhere, then @var{marker} is set to point nowhere.
the end of the buffer.
@end ignore
If @var{position} is @code{nil} or a marker that points nowhere, then
@var{marker} is set to point nowhere.
The value returned is @var{marker}.
@ -384,7 +393,7 @@ This is another name for @code{set-marker}.
@node The Mark
@section The Mark
@cindex mark, the
@cindex mark ring
@c @cindex the mark?
Each buffer has a special marker, which is designated @dfn{the
mark}. When a buffer is newly created, this marker exists but does
@ -423,6 +432,7 @@ the mark is active. This is the main motivation for using Transient
Mark mode. (Another is that this enables highlighting of the region
when the mark is active. @xref{Display}.)
@cindex mark ring
In addition to the mark, each buffer has a @dfn{mark ring} which is a
list of markers containing previous values of the mark. When editing
commands change the mark, they should normally save the old value of the
@ -644,7 +654,12 @@ more marks than this are pushed onto the @code{mark-ring},
@node The Region
@section The Region
@cindex region (between point and mark)
@c The index entry must be just ``region'' to make it the first hit
@c when the user types ``i region RET'', because otherwise the Info
@c reader will present substring matches in alphabetical order,
@c putting this one near the end, with something utterly unrelated as
@c the first hit.
@cindex region
The text between point and the mark is known as @dfn{the region}.
Various functions operate on text delimited by point and the mark, but
@ -668,6 +683,7 @@ integer). This is the position of either point or the mark, whichever is
larger.
@end defun
@c FIXME: Mention it in tips.texi?
Instead of using @code{region-beginning} and @code{region-end}, a
command designed to operate on a region should normally use
@code{interactive} with the @samp{r} specification to find the
@ -680,6 +696,8 @@ mark is active, and there is a valid region in the buffer. This
function is intended to be used by commands that operate on the
region, instead of on text near point, when the mark is active.
@cindex empty region
@vindex use-empty-active-region
A region is valid if it has a non-zero size, or if the user option
@code{use-empty-active-region} is non-@code{nil} (by default, it is
@code{nil}). The function @code{region-active-p} is similar to

6
doc/lispref/modes.texi
View File

@ -3381,6 +3381,7 @@ of Lisp sexps and adapts it to non-Lisp languages.
@node SMIE
@subsection Simple Minded Indentation Engine
@cindex SMIE
SMIE is a package that provides a generic navigation and indentation
engine. Based on a very simple parser using an ``operator precedence
@ -3548,6 +3549,8 @@ simply ignored.
@node SMIE Grammar
@subsubsection Defining the Grammar of a Language
@cindex SMIE grammar
@cindex grammar, SMIE
The usual way to define the SMIE grammar of a language is by
defining a new global variable that holds the precedence table by
@ -3623,6 +3626,8 @@ formally as left associative.
@node SMIE Lexer
@subsubsection Defining Tokens
@cindex SMIE lexer
@cindex defining tokens, SMIE
SMIE comes with a predefined lexical analyzer which uses syntax tables
in the following way: any sequence of characters that have word or
@ -3757,6 +3762,7 @@ surrounding text to find ad-hoc clues.
@node SMIE Indentation
@subsubsection Specifying Indentation Rules
@cindex indentation rules, SMIE
Based on the provided grammar, SMIE will be able to provide automatic
indentation without any extra effort. But in practice, this default

3
doc/lispref/nonascii.texi
View File

@ -248,6 +248,7 @@ unibyte string, it is returned unchanged. Use this function for
characters.
@end defun
@c FIXME: Should `@var{character}' be `@var{byte}'?
@defun byte-to-string byte
@cindex byte to string
This function returns a unibyte string containing a single byte of
@ -401,6 +402,8 @@ specifies how the character behaves and how it should be handled
during text processing and display. Thus, character properties are an
important part of specifying the character's semantics.
@c FIXME: Use the latest URI of this chapter?
@c http://www.unicode.org/versions/latest/ch04.pdf
On the whole, Emacs follows the Unicode Standard in its implementation
of character properties. In particular, Emacs supports the
@uref{http://www.unicode.org/reports/tr23/, Unicode Character Property

21
doc/lispref/positions.texi
View File

@ -5,6 +5,7 @@
@node Positions
@chapter Positions
@cindex position (in buffer)
@cindex buffer position
A @dfn{position} is the index of a character in the text of a buffer.
More precisely, a position identifies the place between two characters
@ -146,9 +147,13 @@ that.
@deffn Command goto-char position
This function sets point in the current buffer to the value
@var{position}. If @var{position} is less than 1, it moves point to the
beginning of the buffer. If @var{position} is greater than the length
of the buffer, it moves point to the end.
@var{position}.
@c This behavior used to be documented until 2013/08.
@ignore
If @var{position} is less than 1, it moves point to the beginning of
the buffer. If @var{position} is greater than the length of the
buffer, it moves point to the end.
@end ignore
If narrowing is in effect, @var{position} still counts from the
beginning of the buffer, but point cannot go outside the accessible
@ -191,8 +196,8 @@ whether a given character is part of a word. @xref{Syntax Tables}.
@deffn Command forward-word &optional count
This function moves point forward @var{count} words (or backward if
@var{count} is negative). If @var{count} is @code{nil}, it moves
forward one word.
@var{count} is negative). If @var{count} is omitted or @code{nil}, it
defaults to 1.
``Moving one word'' means moving until point crosses a
word-constituent character and then encounters a word-separator
@ -210,7 +215,7 @@ If @code{inhibit-field-text-motion} is non-@code{nil},
this function ignores field boundaries.
In an interactive call, @var{count} is specified by the numeric prefix
argument. If @var{count} is omitted or @code{nil}, it defaults to 1.
argument.
@end deffn
@deffn Command backward-word &optional count
@ -483,7 +488,7 @@ Display}.
These functions scan text to determine where screen lines break, and
thus take time proportional to the distance scanned. If you intend to
use them heavily, Emacs provides caches which may improve the
performance of your code. @xref{Truncation, cache-long-line-scans}.
performance of your code. @xref{Truncation, cache-long-scans}.
@defun vertical-motion count &optional window
This function moves point to the start of the screen line @var{count}
@ -805,7 +810,7 @@ thousands of times in the Lisp sources of Emacs.
buffer, use @code{save-current-buffer} or @code{with-current-buffer}
instead (@pxref{Current Buffer}). If you need to save or restore
window configurations, see the forms described in @ref{Window
Configurations} and in @ref{Frame Configurations}.
Configurations} and in @ref{Frame Configurations}. @c frameset?
@defspec save-excursion body@dots{}
@cindex mark excursion

45
doc/lispref/text.texi
View File

@ -240,6 +240,7 @@ Major and minor modes can add functions to
copied out of the buffer.
@end defun
@c FIXME: `filter-buffer-substring-function' should be documented.
@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},
@ -365,7 +366,8 @@ not relocate the marker, depending on the marker's insertion type
the inserted text, regardless of the markers' insertion type.
Insertion functions signal an error if the current buffer is
read-only or if they insert within read-only text.
read-only (@pxref{Read Only Buffers}) or if they insert within
read-only text (@pxref{Special Properties}).
These functions copy text characters from strings and buffers along
with their properties. The inserted characters have exactly the same
@ -421,10 +423,10 @@ insertion point. @xref{Sticky Properties}.
@defun insert-buffer-substring from-buffer-or-name &optional start end
This function inserts a portion of buffer @var{from-buffer-or-name}
(which must already exist) into the current buffer before point. The
text inserted is the region between @var{start} and @var{end}. (These
arguments default to the beginning and end of the accessible portion of
that buffer.) This function returns @code{nil}.
into the current buffer before point. The text inserted is the region
between @var{start} (inclusive) and @var{end} (exclusive). (These
arguments default to the beginning and end of the accessible portion
of that buffer.) This function returns @code{nil}.
In this example, the form is executed with buffer @samp{bar} as the
current buffer. We assume that buffer @samp{bar} is initially empty.
@ -482,6 +484,7 @@ it except to install it on a keymap.
In an interactive call, @var{count} is the numeric prefix argument.
@c FIXME: This variable is obsolete since 23.1.
Self-insertion translates the input character through
@code{translation-table-for-input}. @xref{Translation of Characters}.
@ -776,6 +779,7 @@ is deleted. If point is on a nonblank line, the command deletes all
blank lines immediately following it.
A blank line is defined as a line containing only tabs and spaces.
@c and the Newline character?
@code{delete-blank-lines} returns @code{nil}.
@end deffn
@ -920,6 +924,7 @@ processes the text according to @code{yank-handled-properties} and
text anyway.)
@end defun
@c FIXME: Add an index for yank-handler.
If you put a @code{yank-handler} text property on all or part of a
string, that alters how @code{insert-for-yank} inserts the string. If
different parts of the string have different @code{yank-handler}
@ -1284,8 +1289,8 @@ This is an extensible undo item, which is undone by calling
@item (apply @var{delta} @var{beg} @var{end} @var{funname} . @var{args})
This is an extensible undo item, which records a change limited to the
range @var{beg} to @var{end}, which increased the size of the buffer
by @var{delta}. It is undone by calling @var{funname} with arguments
@var{args}.
by @var{delta} characters. It is undone by calling @var{funname} with
arguments @var{args}.
This kind of element enables undo limited to a region to determine
whether the element pertains to that region.
@ -1376,7 +1381,8 @@ possible to undo either previous changes or any subsequent changes. If
the undo list of @var{buffer-or-name} is already disabled, this function
has no effect.
This function returns @code{nil}.
In an interactive call, BUFFER-OR-NAME is the current buffer. You
cannot specify any other buffer. This function returns @code{nil}.
@end deffn
As editing continues, undo lists get longer and longer. To prevent
@ -1493,6 +1499,7 @@ the header lines. If @var{citation-regexp} is a string, it is used as
a regular expression; if it matches the beginning of a line, that line
is treated as a citation marker.
@c FIXME: "That mode" is confusing. It isn't a major/minor mode.
Ordinarily, @code{fill-individual-paragraphs} regards each change in
indentation as starting a new paragraph. If
@code{fill-individual-varying-indent} is non-@code{nil}, then only
@ -1606,11 +1613,13 @@ Manual}.
@defvar use-hard-newlines
If this variable is non-@code{nil}, the filling functions do not delete
newlines that have the @code{hard} text property. These ``hard
newlines'' act as paragraph separators.
newlines'' act as paragraph separators. @xref{Hard and Soft
Newlines,, Hard and Soft Newlines, emacs, The GNU Emacs Manual}.
@end defvar
@node Margins
@section Margins for Filling
@cindex margins, filling
@defopt fill-prefix
This buffer-local variable, if non-@code{nil}, specifies a string of
@ -1800,6 +1809,7 @@ prefix or @code{nil}, meaning it has failed to determine a prefix.
@cindex filling, automatic
@cindex Auto Fill mode
@c FIXME: I don't think any of the variables below is a/an normal/abnormal hook.
Auto Fill mode is a minor mode that fills lines automatically as text
is inserted. This section describes the hook used by Auto Fill mode.
For a description of functions that you can call explicitly to fill and
@ -1941,10 +1951,10 @@ its @code{sort-subr} call looks like this:
@group
(sort-subr reverse
(function
(lambda ()
(while (and (not (eobp))
(looking-at paragraph-separate))
(forward-line 1))))
(lambda ()
(while (and (not (eobp))
(looking-at paragraph-separate))
(forward-line 1))))
'forward-paragraph)
@end group
@end example
@ -2130,9 +2140,12 @@ line and point.
When called interactively, @var{column} is the value of prefix numeric
argument. If @var{column} is not an integer, an error is signaled.
@c This behavior used to be documented until 2013/08.
@ignore
If column @var{column} is beyond the end of the line, point moves to
the end of the line. If @var{column} is negative, point moves to the
beginning of the line.
@end ignore
If it is impossible to move to column @var{column} because that is in
the middle of a multicolumn character such as a tab, point moves to the
@ -2341,6 +2354,8 @@ code.
For example, if @var{count} is 3, this command adds 3 columns of
indentation to each of the lines beginning in the region specified.
@c FIXME: I suggest using message-indent-citation as the example, or
@c just remove this paragraph. --xfq
In Mail mode, @kbd{C-c C-y} (@code{mail-yank-original}) uses
@code{indent-rigidly} to indent the text copied from the message being
replied to.
@ -2518,7 +2533,7 @@ This is the contents of the 5th foo.
@end group
@group
(capitalize-region 1 44)
(capitalize-region 1 37)
@result{} nil
---------- Buffer: foo ----------
@ -3024,6 +3039,7 @@ Point}.
@table @code
@cindex property category of text character
@c FIXME: Isn't @kindex for keyboard commands?
@kindex category @r{(text property)}
@item category
If a character has a @code{category} property, we call it the
@ -4012,6 +4028,7 @@ A rectangle is represented by a list of strings.
This represents a window configuration to restore in one frame, and a
position to jump to in the current buffer.
@c FIXME: Mention frameset here.
@item @code{(@var{frame-configuration} @var{position})}
This represents a frame configuration to restore, and a position
to jump to in the current buffer.

3
doc/lispref/variables.texi
View File

@ -1649,8 +1649,7 @@ non-@code{nil} given that value. Many commonly-encountered file
variables have @code{safe-local-variable} properties; these include
@code{fill-column}, @code{fill-prefix}, and @code{indent-tabs-mode}.
For boolean-valued variables that are safe, use @code{booleanp} as the
property value. Lambda expressions should be quoted so that
@code{describe-variable} can display the predicate.
property value.
When defining a user option using @code{defcustom}, you can set its
@code{safe-local-variable} property by adding the arguments

2
doc/lispref/windows.texi
View File

@ -2569,6 +2569,7 @@ so @code{window-point} will stay behind text inserted there.
@node Window Start and End
@section The Window Start and End Positions
@cindex window start position
@cindex display-start position
Each window maintains a marker used to keep track of a buffer position
that specifies where in the buffer display should start. This position
@ -3194,6 +3195,7 @@ The value returned is @var{columns}.
Here is how you can determine whether a given position @var{position}
is off the screen due to horizontal scrolling:
@c FIXME: Maybe hscroll-on-screen-p is a better name?
@example
@group
(defun hscroll-on-screen (window position)

4
doc/man/ChangeLog
View File

@ -1,3 +1,7 @@
2013-08-31 Ulrich Müller <ulm@gentoo.org>
* emacs.1: Update manual links.
2013-04-20 Petr Hracek <phracek@redhat.com> (tiny change)
* emacs.1: Add some more command-line options. (Bug#14165)

4
doc/man/emacs.1
View File

@ -445,7 +445,7 @@ Gives frames menu bars if
.IR on ;
don't have menu bars if
.IR off .
See the Emacs manual, sections "Lucid Resources" and "LessTif
See the Emacs manual, sections "Lucid Resources" and "Motif
Resources", for how to control the appearance of the menu bar
if you have one.
.TP
@ -492,7 +492,7 @@ The scroll bar width in pixels, equivalent to the frame parameter
Font name for pop-up menu items, in non-toolkit versions of
.IR Emacs .
(For toolkit versions, see the Emacs manual, sections
"Lucid Resources" and "LessTif Resources".)
"Lucid Resources" and "Motif Resources".)
.TP
.BR selectionTimeout " (class " SelectionTimeout )
Number of milliseconds to wait for a selection reply.

167
doc/misc/ChangeLog
View File

@ -1,3 +1,168 @@
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-08-28 Stefan Monnier <monnier@iro.umontreal.ca>
Try to reduce redundancy in doc/misc/Makefile.in.
* Makefile.in (DOCMISC_W32): New var to replace DOCMISC_*_W32.
(TARGETS): New intermediate variable.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS): Use it.
2013-08-27 Glenn Morris <rgm@gnu.org>
* efaq.texi (Emacs for MS-Windows): Update location of MS FAQ.
* efaq.texi: Rename from faq.texi, to match its output files.
* Makefile.in: Update for faq.texi name change.
* efaq-w32.texi (EMACSVER): Get it from emacsver.texi.
* Makefile.in (webhack): Remove; it's nothing to do with Emacs.
* efaq-w32.texi: Move here from the web-pages repository.
* Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-19 Katsumi Yamaoka <yamaoka@jpl.org>
* emacs-mime.texi (Encoding Customization): Exclude iso-2022-jp-2 and
shift_jis from the default value set to mm-coding-system-priorities for
Japanese users.
2013-08-13 Glenn Morris <rgm@gnu.org>
* reftex.texi (LaTeX xr Package, Options - Table of Contents)
(Options - Defining Label Environments, Options - Creating Labels)
(Options - Referencing Labels, Options - Creating Citations)
(Options - Index Support, Options - Viewing Cross-References)
(Options - Finding Files, Options - Optimizations)
(Options - Fontification, Options - Misc):
* cc-mode.texi (Sample Init File):
* edt.texi (Init file):
* epa.texi (Encrypting/decrypting gpg files):
* mairix-el.texi (About, Setting up the mairix interface, Using)
(Extending):
Rename nodes to avoid characters that can cause Texinfo problems.
2013-08-12 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus.texi (Mail Source Specifiers): Fix description for pop3's :leave.
2013-08-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (ada_mode_deps, auth_deps, autotype_deps)
(bovine_deps, calc_deps, ccmode_deps, cl_deps, dbus_deps)
(dired_x_deps, ebrowse_deps, ede_deps, ediff_deps, edt_deps)
(eieio_deps, emacs_gnutls_deps, emacs_mime_deps, epa_deps)
(erc_deps, ert_deps, eshell_deps, eudc_deps, faq_deps)
(flymake_deps, forms_deps, gnus_deps, htmlfontify_deps)
(idlwave_deps, ido_deps, info_deps, mairix_el_deps, message_deps)
(mh_e_deps, newsticker_deps, nxml_mode_deps, org_deps)
(pcl_cvs_deps, pgg_deps, rcirc_deps, reftex_deps, remember_deps)
(sasl_deps, sc_deps, semantic_deps, ses_deps, sieve_deps)
(smtpmail_deps, speedbar_deps, srecode_deps, todo_mode_deps)
(tramp_deps, url_deps, vip_deps, viper_deps, widget_deps)
(wisent_deps, woman_deps): New variables. Use to reduce duplication.
* woman.texi (Top): Avoid mailto: in html output.
* Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
(docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
(INSTALL_DATA): New, set by configure.
(HTML_OPTS, HTML_TARGETS, PS_TARGETS, DVIPS): New variables.
(.PHONY): Add html, ps, install-dvi, install-html, install-pdf,
install-ps ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
uninstall-ps, and uninstall-doc.
(.SUFFIXES): Add .ps and .dvi.
(.dvi.ps): New suffix rule.
(html, ps, ada-mode.html, auth.html, autotype.html, bovine.html)
(calc.html, cc-mode.html, cl.html, dbus.html, dired-x.html)
(ebrowse.html, ede.html, ediff.html, edt.html, eieio.html)
(emacs-gnutls.html, emacs-mime.html, epa.html, erc.html)
(ert.html, eshell.html, eudc.html, faq.html, flymake.html)
(forms.html, gnus.html, htmlfontify.html, idlwave.html)
(ido.html, mairix-el.html, message.html, mh-e.html)
(newsticker.html, nxml-mode.html, org.html, pgg.html)
(rcirc.html, reftex.html, remember.html, sasl.html, sc.html)
(semantic.html, sieve.html, smtpmail.html, speedbar.html)
(srecode.html, todo-mode.html, tramp.html, url.html, vip.html)
(viper.html, widget.html, wisent.html, woman.html, install-dvi)
(install-html, install-pdf, install-ps, install-doc, uninstall-dvi)
(uninstall-html, uninstall-ps, uninstall-pdf, uninstall-doc):
New rules.
(clean): Remove HTML_TARGETS and PS_TARGETS.
2013-08-10 Xue Fuqiao <xfq.free@gmail.com>
* ido.texi (Working Directories):
(Flexible Matching, Regexp Matching, Find File At Point)
(Ignoring, Misc Customization): Use @defopt for user options.
2013-08-09 Xue Fuqiao <xfq.free@gmail.com>
* htmlfontify.texi (Customization): Remove documentation of
`hfy-fast-lock-save'. Minor fixes.
2013-08-08 Xue Fuqiao <xfq.free@gmail.com>
* ido.texi (Top): Insert node "Working Directories" in menu.
(Working Directories): New node.
(Misc Customization): Add documentation of
`ido-confirm-unique-completion' and some other user options.
2013-08-07 Eli Zaretskii <eliz@gnu.org>
* todo-mode.texi: Update @dircategory.
(Overview, Todo Items as Diary Entries, Todo Mode Entry Points)
(File Editing, Marked Items, Item Prefix): Fix usage of @xref and
@ref.
2013-08-07 Xue Fuqiao <xfq.free@gmail.com>
* sc.texi (Introduction): Fix index.
(Usage Overview):
(Citations, Citation Elements, Recognizing Citations)
(Information Keys and the Info Alist, Reference Headers)
(The Built-in Header Rewrite Functions)
(Electric References, Reply Buffer Initialization)
(Filling Cited Text, Selecting an Attribution)
(Attribution Preferences)
(Anonymous Attributions, Author Names)
(Using Regi, Post-yank Formatting Commands)
(Citing Commands, Insertion Commands)
(Mail Field Commands)
(Hints to MUA Authors, Thanks and History): Change from one space
between sentences to two.
(What Supercite Does): Typo fix.
* newsticker.texi (Usage): Use @key for RET.
* cl.texi (Argument Lists):
(For Clauses):
(Macros): Add indexes.
2013-08-05 Xue Fuqiao <xfq.free@gmail.com>
* cl.texi (Blocks and Exits): Add an index.
2013-08-04 Stephen Berman <stephen.berman@gmx.net>
* Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add todo-mode.
(todo-mode, $(buildinfodir)/todo-mode$(INFO_EXT)):
(todo-mode.dvi, todo-mode.pdf): New rules.
* todo-mode.texi: New file.
2013-08-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Basic Usage): Mention that warp means jump here.
@ -185,7 +350,7 @@
2013-05-25 Xue Fuqiao <xfq.free@gmail.com>
* flymake.texi: Changing from one space between sentences to two.
* flymake.texi: Change from one space between sentences to two.
2013-05-04 Stefan Monnier <monnier@iro.umontreal.ca>

853
doc/misc/Makefile.in
View File

File diff suppressed because it is too large Load Diff

22
doc/misc/cc-mode.texi
View File

@ -241,7 +241,7 @@ functions, classes, etc.; there are other packages for that.
* Customizing Indentation::
* Custom Macros::
* Odds and Ends::
* Sample .emacs File::
* Sample Init File::
* Performance Issues::
* Limitations and Known Bugs::
* FAQ::
@ -1113,7 +1113,7 @@ valid.}.
This function is not bound to a key by default, but it's intended to be
used on the @kbd{RET} key. If you like the behavior of
@code{newline-and-indent} on @kbd{RET}, you should consider switching to
this function. @xref{Sample .emacs File}.
this function. @xref{Sample Init File}.
@item @kbd{M-x c-context-open-line}
@findex c-context-open-line
@ -1170,7 +1170,7 @@ and @ref{Indentation Engine Basics}.
You can toggle each of these minor modes on and off, and you can
configure @ccmode{} so that it starts up with your favorite
combination of them (@pxref{Sample .emacs File}). By default, when
combination of them (@pxref{Sample Init File}). By default, when
you initialize a buffer, electric mode and syntactic-indentation mode
are enabled but the other two modes are disabled.
@ -2378,7 +2378,7 @@ those set by @code{c-default-style}.
@vindex initialization-hook (c-)
Hook run only once per Emacs session, when @ccmode{} is initialized.
This is a good place to change key bindings (or add new ones) in any
of the @ccmode{} key maps. @xref{Sample .emacs File}.
of the @ccmode{} key maps. @xref{Sample Init File}.
@end defvar
@defvar c-mode-common-hook
@ -2406,7 +2406,7 @@ overwritten when @ccmode{} gets loaded.
Here's a simplified example of what you can add to your @file{.emacs}
file to do things whenever any @ccmode{} language is edited. See the
Emacs manuals for more information on customizing Emacs via hooks.
@xref{Sample .emacs File}, for a more complete sample @file{.emacs}
@xref{Sample Init File}, for a more complete sample @file{.emacs}
file.
@example
@ -2685,7 +2685,7 @@ create a new @dfn{style definition}, possibly based on an existing
style. To do this, put the new style's settings into a list with the
following format; the list can then be passed as an argument to the
function @code{c-add-style}. You can see an example of a style
definition in @ref{Sample .emacs File}.
definition in @ref{Sample Init File}.
@cindex style definition
@c @defvr {List} style definition
@ -2753,7 +2753,7 @@ deprecated and it might be removed from @ccmode{} in a future release.
You should use @code{c-set-style} instead.
The sample @file{.emacs} file provides a concrete example of how a new
style can be added and automatically set. @xref{Sample .emacs File}.
style can be added and automatically set. @xref{Sample Init File}.
@end defun
@defvar c-style-alist
@ -6760,7 +6760,7 @@ initialization code.
@end defun
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@node Odds and Ends, Sample .emacs File, Custom Macros, Top
@node Odds and Ends, Sample Init File, Custom Macros, Top
@comment node-name, next, previous, up
@chapter Odds and Ends
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@ -6804,9 +6804,9 @@ anchoring position to indent the line in that case.
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@node Sample .emacs File, Performance Issues, Odds and Ends, Top
@node Sample Init File, Performance Issues, Odds and Ends, Top
@comment node-name, next, previous, up
@appendix Sample .emacs File
@appendix Sample Init File
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Here's a sample .emacs file fragment that might help you along the way.
@ -6863,7 +6863,7 @@ to change some of the actual values.
@end verbatim
@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@node Performance Issues, Limitations and Known Bugs, Sample .emacs File, Top
@node Performance Issues, Limitations and Known Bugs, Sample Init File, Top
@comment node-name, next, previous, up
@chapter Performance Issues
@cindex performance

5
doc/misc/cl.texi
View File

@ -461,6 +461,7 @@ matter of stylistic taste:
@var{body}))
@end example
@cindex destructuring, in argument list
Argument lists support @dfn{destructuring}. In Common Lisp,
destructuring is only allowed with @code{defmacro}; this package
allows it with @code{cl-defun} and other argument lists as well.
@ -1492,6 +1493,7 @@ simply returning @code{nil}.
@node Blocks and Exits
@section Blocks and Exits
@cindex block
@noindent
Common Lisp @dfn{blocks} provide a non-local exit mechanism very
@ -2139,6 +2141,7 @@ that was just set by the previous clause; in the second loop,
based on the value of @code{x} left over from the previous time
through the loop.
@cindex destructuring, in cl-loop
Another feature of the @code{cl-loop} macro is @emph{destructuring},
similar in concept to the destructuring provided by @code{defmacro}
(@pxref{Argument Lists}).
@ -2503,6 +2506,8 @@ if @var{expr} returns a list of the wrong number of arguments
or with incorrect keyword arguments.
@end defmac
@cindex compiler macros
@cindex define compiler macros
This package also includes the Common Lisp @code{define-compiler-macro}
facility, which allows you to define compile-time expansions and
optimizations for your functions.

4
doc/misc/edt.texi
View File

@ -789,13 +789,13 @@ so the above directions may need some modification if your site has such
special needs.
@menu
* edt-user.el:: Creating your own @file{edt-user.el} file.
* Init file:: Creating your own @file{edt-user.el} file.
* Words:: Specifying word entities.
* Control keys:: Enabling EDT control key sequence bindings.
* Scroll margins:: Setting scroll margins.
@end menu
@node edt-user.el
@node Init file
@section Creating your own @file{edt-user.el} File
A sample @file{edt-user.el} file is provided in the Emacs @file{etc/}

2365
doc/misc/efaq-w32.texi Normal file
View File

File diff suppressed because it is too large Load Diff

5
doc/misc/faq.texi → doc/misc/efaq.texi
View File

@ -3452,8 +3452,9 @@ lack certain features, such as the Emacs Lisp extension language.
@cindex Emacs for MS-Windows
@cindex Microsoft Windows, Emacs for
There is a @uref{http://www.gnu.org/software/emacs/windows/ntemacs.html,
separate FAQ} for Emacs on MS-Windows. For MS-DOS, @pxref{Emacs for MS-DOS}.
There is a separate FAQ for Emacs on MS-Windows,
@pxref{Top,,,efaq-w32,FAQ for Emacs on MS Windows}.
For MS-DOS, @pxref{Emacs for MS-DOS}.
@node Emacs for GNUstep

2
doc/misc/eieio.texi
View File

@ -256,7 +256,7 @@ concepts. Therefore, it is highly recommended to learn these from a
textbook or tutorial first, especially if you only know OOP from
languages like C++ or Java. If on the other hand you are already
familiar with CLOS, you should be aware that @eieio{} does not implement
the full CLOS specificiation and also differs in some other aspects
the full CLOS specification and also differs in some other aspects
(@xref{Introduction}, and @ref{CLOS compatibility}).
A @dfn{class} is a definition for organizing data and methods

20
doc/misc/emacs-mime.texi
View File

@ -871,15 +871,15 @@ by using the @code{encoding} @acronym{MML} tag (@pxref{MML Definition}).
@vindex mm-coding-system-priorities
Prioritize coding systems to use for outgoing messages. The default
is @code{nil}, which means to use the defaults in Emacs, but is
@code{(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)} when
running Emacs in the Japanese language environment. It is a list of
coding system symbols (aliases of coding systems are also allowed, use
@kbd{M-x describe-coding-system} to make sure you are specifying correct
coding system names). For example, if you have configured Emacs
to prefer UTF-8, but wish that outgoing messages should be sent in
ISO-8859-1 if possible, you can set this variable to
@code{(iso-8859-1)}. You can override this setting on a per-message
basis by using the @code{charset} @acronym{MML} tag (@pxref{MML Definition}).
@code{(iso-8859-1 iso-2022-jp utf-8)} when running Emacs in the Japanese
language environment. It is a list of coding system symbols (aliases of
coding systems are also allowed, use @kbd{M-x describe-coding-system} to
make sure you are specifying correct coding system names). For example,
if you have configured Emacs to prefer UTF-8, but wish that outgoing
messages should be sent in ISO-8859-1 if possible, you can set this
variable to @code{(iso-8859-1)}. You can override this setting on a
per-message basis by using the @code{charset} @acronym{MML} tag
(@pxref{MML Definition}).
As different hierarchies prefer different charsets, you may want to set
@code{mm-coding-system-priorities} according to the hierarchy in Gnus.
@ -904,7 +904,7 @@ Here's an example:
(mm-coding-system-priorities '(iso-8859-15 iso-8859-1 utf-8)))
("^fj\\." ;; Japanese
(mm-coding-system-priorities
'(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))
'(iso-8859-1 iso-2022-jp utf-8)))
("^ru\\." ;; Cyrillic
(mm-coding-system-priorities
'(koi8-r iso-8859-5 iso-8859-1 utf-8))))

8
doc/misc/epa.texi
View File

@ -106,7 +106,7 @@ This chapter introduces various commands for typical use cases.
* Cryptographic operations on files::
* Dired integration::
* Mail-mode integration::
* Encrypting/decrypting *.gpg files::
* Encrypting/decrypting gpg files::
@end menu
@node Key management
@ -346,8 +346,8 @@ key in the recipient list, use @samp{encrypt-to} option in
@end table
@node Encrypting/decrypting *.gpg files
@section Encrypting/decrypting *.gpg files
@node Encrypting/decrypting gpg files
@section Encrypting/decrypting gpg files
By default, every file whose name ends with @samp{.gpg} will be
treated as encrypted. That is, when you open such a file, the
decrypted text is inserted in the buffer rather than encrypted one.
@ -464,7 +464,7 @@ To set up gpg-agent, follow the instruction in GnuPG manual.
To set up elisp passphrase cache, set
@code{epa-file-cache-passphrase-for-symmetric-encryption}.
@xref{Encrypting/decrypting *.gpg files}.
@xref{Encrypting/decrypting gpg files}.
@node Bug Reports
@chapter Bug Reports

16
doc/misc/gnus.texi
View File

@ -14796,14 +14796,16 @@ and says what authentication scheme to use. The default is
@item :leave
Non-@code{nil} if the mail is to be left on the @acronym{POP} server
after fetching. Mails once fetched will never be fetched again by the
@acronym{UIDL} control. Only the built-in @code{pop3-movemail} program
(the default) supports this keyword.
after fetching. Only the built-in @code{pop3-movemail} program (the
default) supports this keyword.
If this is neither @code{nil} nor a number, all mails will be left on
the server. If this is a number, leave mails on the server for this
many days since you first checked new mails. If this is @code{nil}
(the default), mails will be deleted on the server right after fetching.
If this is a number, leave mails on the server for this many days since
you first checked new mails. In that case, mails once fetched will
never be fetched again by the @acronym{UIDL} control. If this is
@code{nil} (the default), mails will be deleted on the server right
after fetching. If this is neither @code{nil} nor a number, all mails
will be left on the server, and you will end up getting the same mails
again and again.
@vindex pop3-uidl-file
The @code{pop3-uidl-file} variable specifies the file to which the

30
doc/misc/htmlfontify.texi
View File

@ -1275,6 +1275,7 @@ normally be applied.
@vindex hfy-html-quote-regex
@anchor{hfy-html-quote-regex}
@c FIXME: the cross-reference below looks ugly
Regex to match (with a single back-reference per match) strings in HTML
which should be quoted with @ref{hfy-html-quote}
(and @pxref{hfy-html-quote-map}) to make them safe.
@ -1340,31 +1341,6 @@ See also: @ref{hfy-page-footer}
String to add to the @samp{<style> a} variant of an Htmlfontify CSS class.
@item hfy-fast-lock-save
@vindex hfy-fast-lock-save
@anchor{hfy-fast-lock-save}
Minimum size of a buffer for cached fontification.
This value is temporarily assigned to @code{fast-lock-minimum-size} during
html-fontification.
Only buffers more than this can have associated Font Lock cache files saved.
If nil, means cache files are never created.
If a list, each element should be a cons pair of the form
@code{(@var{major-mode} . @var{size})}, where @var{major-mode}
is a symbol or t (meaning the default). For example:
@lisp
((c-mode . 25600 )
(c++-mode . 25600 )
(rmail-mode . 1048576))
@end lisp
means that the minimum size is 25K for buffers in C or C++ modes, one megabyte
for buffers in Rmail mode, and size is irrelevant (i.e., no saves) otherwise.
@item hfy-split-index
@vindex hfy-split-index
@anchor{hfy-split-index}
@ -1383,7 +1359,7 @@ be large and take a long time to render or be difficult to navigate.
@vindex hfy-extn
@anchor{hfy-extn}
File extension used for output files
File extension used for output files.
@item hfy-default-face-def
@vindex hfy-default-face-def
@ -1464,7 +1440,7 @@ which can never slow you down, but may result in incomplete fontification.
@vindex hfy-src-doc-link-unstyle
@anchor{hfy-src-doc-link-unstyle}
Regex to remove from the <style> a variant of an Htmlfontify CSS class.
Regex to remove from the @samp{<style> a} variant of an Htmlfontify CSS class.
@item hfy-link-extn
@vindex hfy-link-extn

319
doc/misc/ido.texi
View File

@ -53,45 +53,46 @@ modify this GNU manual.''
@end ifnottex
@menu
* Overview:: Basics, activation.
* Matching:: Interactivity, matching, scrolling.
* Highlighting:: Highlighting of matching items.
* Hidden Buffers and Files:: Hidden buffers, files, and directories.
* Customization:: Change the Ido functionality.
* Misc:: Various other features.
* Overview:: Basics, activation.
* Matching:: Interactivity, matching, scrolling.
* Highlighting:: Highlighting of matching items.
* Hidden Buffers and Files:: Hidden buffers, files, and directories.
* Customization:: Change the Ido functionality.
* Misc:: Various other features.
Appendices
* GNU Free Documentation License:: The license for this documentation.
* GNU Free Documentation License:: The license for this documentation.
Indexes
* Variable Index:: An entry for each documented variable.
* Variable Index:: An entry for each documented variable.
@detailmenu
--- The Detailed Node Listing ---
Overview
* Activation:: How to use this package.
* Activation:: How to use this package.
* Working Directories:: Where files have most recently been opened.
Matching
* Interactive Substring Matching:: Interactivity, matching, scrolling.
* Prefix Matching:: Standard completion.
* Flexible Matching:: More flexible matching.
* Regexp Matching:: Matching using regular expression.
* Interactive Substring Matching:: Interactivity, matching, scrolling.
* Prefix Matching:: Standard completion.
* Flexible Matching:: More flexible matching.
* Regexp Matching:: Matching using regular expression.
Customization
* Changing List Order:: Changing the list of files.
* Find File At Point:: Make Ido guess the context.
* Ignoring:: Ignorance is bliss.
* Misc Customization:: Miscellaneous customization for Ido.
* Changing List Order:: Changing the list of files.
* Find File At Point:: Make Ido guess the context.
* Ignoring:: Ignorance is bliss.
* Misc Customization:: Miscellaneous customization for Ido.
Miscellaneous
* All Matching:: Seeing all the matching buffers or files.
* Replacement:: Replacement for @code{read-buffer} and @code{read-file-name}.
* Other Packages:: Don't want to depend on @code{ido-everywhere}?
* All Matching:: Seeing all the matching buffers or files.
* Replacement:: Replacement for @code{read-buffer} and @code{read-file-name}.
* Other Packages:: Don't want to depend on @code{ido-everywhere}?
@end detailmenu
@end menu
@ -116,7 +117,8 @@ This package was originally written by Kim F. Storm, based on the
@file{iswitchb.el} package by Stephen Eglen.
@menu
* Activation:: How to use this package.
* Activation:: How to use this package.
* Working Directories:: Where files have most recently been opened.
@end menu
@node Activation
@ -140,9 +142,48 @@ package.
(ido-mode t)
@end example
@c @node Working Directories
@c @section Working Directories
@c @cindex working directories
@node Working Directories
@section Working Directories
@cindex working directories
@vindex ido-work-directory-list
@noindent
@dfn{Working directories} are directories where files have most
recently been opened. The current directory is inserted at the front
of this @code{ido-work-directory-list} whenever a file is opened with
@code{ido-find-file} and other file-related functions.
@c @cindex merge
@c or maybe a new node for ``merge''
@c @deffn Command ido-merge-work-directories
@c @deffn Command ido-prev-work-directory
@c @deffn Command ido-next-work-directory
@c @deffn Command ido-forget-work-directory
@c @defvar ido-use-merged-list
@c @defvar ido-try-merged-list
@c @defvar ido-pre-merge-state
@defopt ido-max-work-directory-list
This user option specifies maximum number of working directories to
record.
@end defopt
@c see (info "(elisp) File Name Completion")
@defopt ido-max-dir-file-cache
This user option specifies maximum number of working directories to be
cached. This is the size of the cache of
@code{file-name-all-completions} results. Each cache entry is time
stamped with the modification time of the directory. Some systems,
like MS-Windows, have unreliable directory modification times, so you
may choose to disable caching on such systems, or explicitly refresh
the cache contents using the command @code{ido-reread-directory}
(usually @kbd{C-l}) in the minibuffer.
@end defopt
@node Matching
@chapter Matching
@ -153,10 +194,10 @@ This section describes features of this package that have to
do with various kinds of @emph{matching}: among buffers, files, and directories.
@menu
* Interactive Substring Matching:: Interactivity, matching, scrolling.
* Prefix Matching:: Standard completion.
* Flexible Matching:: More flexible matching.
* Regexp Matching:: Matching using regular expression.
* Interactive Substring Matching:: Interactivity, matching, scrolling.
* Prefix Matching:: Standard completion.
* Flexible Matching:: More flexible matching.
* Regexp Matching:: Matching using regular expression.
@end menu
@node Interactive Substring Matching
@ -265,7 +306,7 @@ of the list and hit @key{RET}.
To go up to the parent directory, delete any partial file name already
specified (e.g. using @key{DEL}) and hit @key{DEL}.
@c @defun ido-delete-backward-updir
@c @deffn Command ido-delete-backward-updir
@cindex root directory
@cindex home directory
@ -279,11 +320,11 @@ directory, enter @samp{~/}. To enter Dired for this directory, use
@cindex ftp hosts
You can also visit files on other hosts using the ange-ftp
notations @samp{/host:} and @samp{/user@@host:}.
@c @defvr {User Option} ido-record-ftp-work-directories
@c @defvr {User Option} ido-merge-ftp-work-directories
@c @defvr {User Option} ido-cache-ftp-work-directory-time
@c @defvr {User Option} ido-slow-ftp-hosts
@c @defvr {User Option} ido-slow-ftp-host-regexps
@c @defopt ido-record-ftp-work-directories
@c @defopt ido-merge-ftp-work-directories
@c @defopt ido-cache-ftp-work-directory-time
@c @defopt ido-slow-ftp-hosts
@c @defopt ido-slow-ftp-host-regexps
You can type @kbd{M-p} and @kbd{M-n} to change to previous/next
directories from the history, @kbd{M-s} to search for a file matching
@ -295,22 +336,20 @@ If for some reason you cannot specify the proper file using
@code{ido-switch-buffer}.
@c @kindex C-x b
@c @findex ido-switch-buffer
@c @defun ido-switch-buffer
@c @deffn Command ido-switch-buffer
@c This command switch to another buffer interactively.
@c @end defun
@c @end deffn
@c @kindex C-x C-f
@c @findex ido-find-file
@c @defun ido-find-file
@c @deffn Command ido-find-file
@c Edit file with name obtained via minibuffer.
@c @end defun
@c @end deffn
@c @kindex C-x d
@c @findex ido-dired
@c @defun ido-dired
@c @deffn Command ido-dired
@c Call Dired the Ido way.
@c @end defun
@c @end deffn
@node Prefix Matching
@section Prefix Matching
@ -338,12 +377,12 @@ of the buffer names.
@section Flexible Matching
@cindex flexible matching
@defvr {User Option} ido-enable-flex-matching
@defopt ido-enable-flex-matching
If non-@code{nil}, Ido will do flexible string matching. Flexible
matching means that if the entered string does not match any item, any
item containing the entered characters in the given sequence will
match.
@end defvr
@end defopt
@noindent
If @code{ido-enable-flex-matching} is non-@code{nil}, Ido will do a
@ -371,11 +410,11 @@ through @code{ido-enable-regexp} (toggle with @kbd{C-t}). This allows
you to type @samp{[ch]$} for example and see all file names ending in
@samp{c} or @samp{h}.
@defvr {User Option} ido-enable-regexp
@defopt ido-enable-regexp
If the value of this user option is non-@code{nil}, Ido will do regexp
matching. The value of this user option can be toggled within
ido-mode using @code{ido-toggle-regexp}.
@end defvr
@end defopt
@strong{Please notice:} Ido-style completion is inhibited when you
enable regexp matching.
@ -405,7 +444,7 @@ buffers or files.
You can toggle display of the hidden buffers and files with @kbd{C-a}
(@code{ido-toggle-ignore}).
@c @defun ido-toggle-ignore
@c @deffn Command ido-toggle-ignore
@node Customization
@chapter Customization
@ -435,6 +474,9 @@ To modify the keybindings, use the @code{ido-setup-hook}. For example:
(define-key ido-completion-map " " 'ido-next-match))
@end example
@c @defopt ido-setup-hook
@c a new node for Ido hooks?
@menu
* Changing List Order:: Changing the list of files.
* Find File At Point:: Make Ido guess the context.
@ -479,17 +521,17 @@ The following expression will make Ido guess the context:
(setq ido-use-filename-at-point 'guess)
@end example
@c @defvr {User Option} ido-use-filename-at-point
@c @defopt ido-use-filename-at-point
@c If the value of this user option is non-@code{nil}, ...
@c @end defvr
@c @end defopt
You can disable URL ffap support by toggling
@code{ido-use-url-at-point}.
@defvr {User Option} ido-use-url-at-point
@defopt ido-use-url-at-point
If the value of this user option is non-@code{nil}, Ido will look for
a URL at point. If found, call @code{find-file-at-point} to visit it.
@end defvr
@end defopt
@node Ignoring
@section Ignoring Buffers and Files
@ -500,28 +542,29 @@ a URL at point. If found, call @code{find-file-at-point} to visit it.
Ido is capable of ignoring buffers, directories, files and extensions
using regular expression.
@defvr {User Option} ido-ignore-buffers
@defopt ido-ignore-buffers
This variable takes a list of regular expressions for buffers to
ignore in @code{ido-switch-buffer}.
@end defvr
@end defopt
@defvr {User Option} ido-ignore-directories
@defopt ido-ignore-directories
This variable takes a list of regular expressions for (sub)directories
names to ignore in @code{ido-dired} and @code{ido-find-file}.
@end defvr
@end defopt
@defvr {User Option} ido-ignore-files
@defopt ido-ignore-files
This variable takes a list of regular expressions for files to ignore
in @code{ido-find-file}.
@end defvr
@end defopt
@defvr {User Option} ido-ignore-unc-host-regexps
@defopt ido-ignore-unc-host-regexps
This variable takes a list of regular expressions matching UNC hosts
to ignore. The letter case will be ignored if
@code{ido-downcase-unc-hosts} is non-@code{nil}.
@end defvr
@end defopt
@c @defvr {User Option} ido-work-directory-list-ignore-regexps
@c FIXME: Where to add this variable? This node or ``working directory''?
@c @defopt ido-work-directory-list-ignore-regexps
To make Ido use @code{completion-ignored-extensions} you need to
enable it:
@ -542,69 +585,117 @@ the name of an ignored file, Ido will still let you open it just fine.
@section Miscellaneous Customization
@cindex miscellaneous customization for Ido
@defvr {User Option} ido-mode
@c Variables described in this sections may be moved to new nodes in
@c the future.
@defopt ido-mode
This user option determines for which functional group (buffer and
files) Ido behavior should be enabled.
@end defvr
@end defopt
@defvr {User Option} ido-case-fold
@defopt ido-case-fold
If the value of this user option is non-@code{nil}, searching of
buffer and file names should ignore case.
@end defvr
@end defopt
@defvr {User Option} ido-show-dot-for-dired
If the value of this user option is non-@code{nil} , always put
@defopt ido-show-dot-for-dired
If the value of this user option is non-@code{nil}, always put
@samp{.} as the first item in file name lists. This allows the
current directory to be opened immediately with Dired
@end defvr
@end defopt
@defvr {User Option} ido-enable-dot-prefix
@defopt ido-enable-dot-prefix
If the value of this user option is non-@code{nil}, Ido will match
leading dot as prefix. I.e., hidden files and buffers will match only
if you type a dot as first char (even if @code{ido-enable-prefix} is
@code{nil}).
@end defvr
@end defopt
@c @defvr {User Option} ido-confirm-unique-completion
@c @defvr {User Option} ido-cannot-complete-command
@c @defvr {User Option} ido-record-commands
@c @defvr {User Option} ido-max-file-prompt-width
@c @defvr {User Option} ido-max-window-height
@c @defvr {User Option} ido-enable-last-directory-history
@c @defvr {User Option} ido-max-work-directory-list
@c @defvr {User Option} ido-enable-tramp-completion
@c @defvr {User Option} ido-unc-hosts
@c @defvr {User Option} ido-downcase-unc-hosts
@c @defvr {User Option} ido-cache-unc-host-shares-time
@c @defvr {User Option} ido-max-work-file-list
@c @defvr {User Option} ido-work-directory-match-only
@c @defvr {User Option} ido-auto-merge-work-directories-length
@c @defvr {User Option} ido-auto-merge-delay-time
@c @defvr {User Option} ido-auto-merge-inhibit-characters-regexp
@c @defvr {User Option} ido-merged-indicator
@c @defvr {User Option} ido-max-dir-file-cache
@c @defvr {User Option} ido-max-directory-size
@c @defvr {User Option} ido-rotate-file-list-default
@c @defvr {User Option} ido-enter-matching-directory
@c @defvr {User Option} ido-create-new-buffer
@c @defvr {User Option} ido-setup-hook
@c @defvr {User Option} ido-separator
@c @defvr {User Option} ido-decorations
@c @defvr {User Option} ido-use-virtual-buffers
@c @defvr {User Option} ido-use-faces
@c @defvr {User Option} ido-make-file-list-hook
@c @defvr {User Option} ido-make-dir-list-hook
@c @defvr {User Option} ido-make-buffer-list-hook
@c @defvr {User Option} ido-rewrite-file-prompt-functions
@c @defvr {User Option} ido-completion-buffer
@c @defvr {User Option} ido-completion-buffer-all-completions
@c @defvr {User Option} ido-all-frames
@c @defvr {User Option} ido-minibuffer-setup-hook
@c @defvr {User Option} ido-save-directory-list-file
@c @defvr {User Option} ido-read-file-name-as-directory-commands
@c @defvr {User Option} ido-read-file-name-non-ido
@c @defvr {User Option} ido-before-fallback-functions
@c @defvr {User Option} ido-buffer-disable-smart-matches
@defopt ido-confirm-unique-completion
If the value of this user option is non-@code{nil}, even a unique
completion must be confirmed. This means that @code{ido-complete}
(@key{TAB}) must always be followed by @code{ido-exit-minibuffer}
(@key{RET}) even when there is only one unique completion.
@end defopt
@defopt ido-cannot-complete-command
When @code{ido-complete} can't complete any more, it will run the
command specified by this user option. The most useful values are
@code{ido-completion-help}, which pops up a window with completion
alternatives, or @code{ido-next-match} or @code{ido-prev-match}, which
cycle the buffer list.
@end defopt
@defopt ido-max-file-prompt-width
This user option specifies the upper limit of the prompt string. If
its value is an integer, it specifies the number of characters of the
string. If its value is a floating point number, it specifies a
fraction of the frame width.
@end defopt
@defopt ido-max-window-height
If the value of this user option is non-@code{nil}, its value will
override the variable @code{max-mini-window-height}, which is the
maximum height for resizing mini-windows (the minibuffer and the echo
area). If it's a floating point number, it specifies a fraction of
the mini-window frame's height. If it's an integer, it specifies the
number of lines.
@end defopt
@defopt ido-record-commands
If the value of this user option is non-@code{nil}, Ido will record
commands in the variable @code{command-history}. Note that non-Ido
equivalent is recorded.
@end defopt
@defopt ido-all-frames
This user option will be passed to @code{walk-windows} as its
@var{all-frames} argument when Ido is finding buffers. @xref{Cyclic
Window Ordering, , Cyclic Ordering of Windows, elisp, GNU Emacs Lisp
Reference Manual}.
@end defopt
@defopt ido-minibuffer-setup-hook
This hook variable contains Ido-specific customization of minibuffer
setup. It is run during minibuffer setup if Ido is active, and is
intended for use in customizing ido for interoperation with other
packages.
@end defopt
@c @defopt ido-enable-tramp-completion
@c cross-reference to tramp.texi
@c @cindex UNC host names, completion
@c @defopt ido-unc-hosts
@c @defopt ido-downcase-unc-hosts
@c @defopt ido-cache-unc-host-shares-time
@c @defopt ido-enable-last-directory-history
@c @defopt ido-max-work-file-list
@c @defopt ido-work-directory-match-only
@c @defopt ido-auto-merge-work-directories-length
@c @defopt ido-auto-merge-delay-time
@c @defopt ido-auto-merge-inhibit-characters-regexp
@c @defopt ido-merged-indicator
@c @defopt ido-max-directory-size
@c @defopt ido-rotate-file-list-default
@c @defopt ido-enter-matching-directory
@c @defopt ido-create-new-buffer
@c @defopt ido-separator
@c @defopt ido-decorations
@c @defopt ido-use-virtual-buffers
@c @defopt ido-use-faces
@c @defopt ido-make-file-list-hook
@c @defopt ido-make-dir-list-hook
@c @defopt ido-make-buffer-list-hook
@c @defopt ido-rewrite-file-prompt-functions
@c @defopt ido-completion-buffer
@c @defopt ido-completion-buffer-all-completions
@c @defopt ido-save-directory-list-file
@c @defopt ido-read-file-name-as-directory-commands
@c @defopt ido-read-file-name-non-ido
@c @defopt ido-before-fallback-functions
@c @defopt ido-buffer-disable-smart-matches
@node Misc
@chapter Miscellaneous
@ -624,8 +715,8 @@ and you find that the file you are after is not in any buffer, you can
press @kbd{C-f} to immediately drop into @code{ido-find-file}. And
you can switch back to buffer selection with @kbd{C-b}.
@c @defun ido-magic-forward-char
@c @defun ido-magic-backward-char
@c @deffn Command ido-magic-forward-char
@c @deffn Command ido-magic-backward-char
You can also use Ido in your Emacs Lisp programs:
@ -657,7 +748,7 @@ Also, to improve the responsiveness of Ido, the maximum number of
matching items is limited to 12, but you can increase or removed this
limit via the @code{ido-max-prospects} user option.
@c @defvr {User Option} ido-max-prospects
@c @defopt ido-max-prospects
To see a full list of all matching buffers in a separate buffer, hit
@kbd{?} or press @key{TAB} when there are no further completions to
@ -675,8 +766,8 @@ functions @code{read-buffer} and @code{read-file-name}.
To use ido for all buffer and file selections in Emacs, customize the
variable @code{ido-everywhere}.
@c @defun ido-everywhere
@c @defvr {User Option} ido-everywhere
@c @deffn Command ido-everywhere
@c @defopt ido-everywhere
@node Other Packages
@section Other Packages

29
doc/misc/mairix-el.texi
View File

@ -55,15 +55,15 @@ database.
@end ifnottex
@menu
* About mairix and mairix.el:: About the mairix search engine and mairix.el
* Configuring mairix:: How to configure mairix
* Setting up mairix.el:: Set up mairix.el
* Using mairix.el:: List of interactive functions
* Extending mairix.el:: Support your favorite mail reader!
* About:: About the mairix search engine and mairix.el.
* Configuring mairix:: How to configure mairix.
* Setting up the mairix interface:: Set up mairix.el.
* Using:: List of interactive functions
* Extending:: Support your favorite mail reader!
* GNU Free Documentation License:: The license for this documentation.
@end menu
@node About mairix and mairix.el
@node About
@chapter About mairix and mairix.el
Mairix is a tool for indexing and searching words in locally stored
@ -98,7 +98,7 @@ Currently, @code{mairix.el} is only tested with mbox output together
with RMail, Gnus, or VM as the Emacs mail program. However, it should
also work with Maildir or MH, and it should be very easy to integrate
other Emacs mail programs into @code{mairix.el}
(@pxref{Extending mairix.el}).
(@pxref{Extending}).
If you use Gnus with maildir or MH, you should really use the native
Gnus back end @code{nnmairix} instead, since it is more tightly
@ -165,8 +165,8 @@ Now simply call @code{mairix} to create the index for the first time.
Note that this may take a few minutes, but every following index will do
the updates incrementally and hence is very fast.
@node Setting up mairix.el
@chapter Setting up mairix.el
@node Setting up the mairix interface
@chapter Setting up the mairix interface
First, put @code{mairix.el} in your Emacs search path and put
@code{(require 'mairix)} into your @file{.emacs} file. Then, use
@ -179,13 +179,12 @@ If you use Gnus with maildir or mh, use the native Gnus back end
nnmairix instead.
If you use another Emacs mail program which is not yet supported by
mairix.el, it is pretty easy to integrate it. @xref{Extending
mairix.el}, on how to integrate it into mairix.el.
mairix.el, it is pretty easy to integrate it. @xref{Extending},
on how to integrate it into mairix.el.
Now you should be ready to go. @xref{Using mairix.el}, for the available
commands.
Now you should be ready to go. @xref{Using}, for the available commands.
@node Using mairix.el
@node Using
@chapter Using mairix.el
There are currently no default key bindings for mairix.el, since those
@ -314,7 +313,7 @@ will still be usable while the update is done.
@end table
@node Extending mairix.el
@node Extending
@chapter Extending mairix.el
Your favorite Emacs mail program is not supported? Shame on me. But

6
doc/misc/newsticker.texi
View File

@ -169,9 +169,9 @@ single buffer, called @samp{*newsticker*}. The modeline in the
@samp{*newsticker*} buffer informs you whenever new headlines have
arrived.
@end itemize
In both views clicking mouse-button 2 or pressing RET on a headline
will call @code{browse-url} to load the corresponding news story in
your favorite web browser.
In both views clicking mouse-button 2 or pressing @key{RET} on a
headline will call @code{browse-url} to load the corresponding news
story in your favorite web browser.
@findex newsticker-start-ticker
@findex newsticker-stop-ticker

117
doc/misc/reftex.texi
View File

@ -153,7 +153,7 @@ Labels and References
* Defining Label Environments:: ... and environments it doesn't.
* Reference Info:: View the label corresponding to a \ref.
* Reference Styles:: Macros to be used instead of \ref.
* xr (LaTeX package):: References to external documents.
* LaTeX xr Package:: References to external documents.
Defining Label Environments
@ -196,17 +196,17 @@ AUCTeX
Options, Keymaps, Hooks
* Options (Table of Contents)::
* Options (Defining Label Environments)::
* Options (Creating Labels)::
* Options (Referencing Labels)::
* Options (Creating Citations)::
* Options (Index Support)::
* Options (Viewing Cross-References)::
* Options (Finding Files)::
* Options (Optimizations)::
* Options (Fontification)::
* Options (Misc)::
* Options - Table of Contents::
* Options - Defining Label Environments::
* Options - Creating Labels::
* Options - Referencing Labels::
* Options - Creating Citations::
* Options - Index Support::
* Options - Viewing Cross-References::
* Options - Finding Files::
* Options - Optimizations::
* Options - Fontification::
* Options - Misc::
@end detailmenu
@end menu
@ -581,8 +581,8 @@ called.
@item mouse-2
@vindex reftex-highlight-selection
Clicking with mouse button 2 on a line has the same effect as @key{RET}.
See also variable @code{reftex-highlight-selection}, @ref{Options
(Fontification)}.
See also variable @code{reftex-highlight-selection},
@ref{Options - Fontification}.
@item f
@vindex reftex-toc-follow-mode
@ -701,9 +701,8 @@ buffer.
@item x
Switch to the @file{*toc*} buffer of an external document. When the
current document is using the @code{xr} package (@pxref{xr (LaTeX
package)}), @RefTeX{} will switch to one of the external
documents.
current document is using the @code{xr} package (@pxref{LaTeX xr Package}),
@RefTeX{} will switch to one of the external documents.
@tablesubheading{Automatic recentering}
@ -796,7 +795,7 @@ equation counter.
* Defining Label Environments:: ... and environments it doesn't.
* Reference Info:: View the label corresponding to a \ref.
* Reference Styles:: Macros to be used instead of \ref.
* xr (LaTeX package):: References to external documents.
* LaTeX xr Package:: References to external documents.
@end menu
@node Creating Labels
@ -859,8 +858,8 @@ this label later.
@vindex reftex-insert-label-flags
If you want to change the way certain labels are created, check out the
variable @code{reftex-insert-label-flags} (@pxref{Options (Creating
Labels)}).
variable @code{reftex-insert-label-flags} (@pxref{Options - Creating
Labels}).
If you are using @AUCTeX{} to write your @LaTeX{} documents, you can
set it up to delegate the creation of labels to
@ -981,7 +980,7 @@ references all marked labels.
@vindex reftex-highlight-selection
Clicking with mouse button 2 on a label will accept it like @key{RET}
would. See also variable @code{reftex-highlight-selection},
@ref{Options (Misc)}.
@ref{Options - Misc}.
@vindex reftex-multiref-punctuation
@item m - + ,
@ -1034,7 +1033,7 @@ buffer.
@tablesubheading{Controlling what gets displayed}
@vindex reftex-label-menu-flags
The defaults for the following flags can be configured with the variable
@code{reftex-label-menu-flags} (@pxref{Options (Referencing Labels)}).
@code{reftex-label-menu-flags} (@pxref{Options - Referencing Labels}).
@item c
Toggle the display of the one-line label definition context in the
@ -1082,8 +1081,7 @@ a menu for that category will be shown.
Reference a label from an external document. With the @LaTeX{} package
@code{xr} it is possible to reference labels defined in another
document. This key will switch to the label menu of an external
document and let you select a label from there (@pxref{xr (LaTeX
package),,xr}).
document and let you select a label from there (@pxref{LaTeX xr Package,,xr}).
@end table
@ -1203,8 +1201,8 @@ them (@pxref{Defining Label Environments}).
@vindex reftex-label-alist
@RefTeX{} can be configured to recognize additional labeled
environments and macros. This is done with the variable
@code{reftex-label-alist} (@pxref{Options (Defining Label
Environments)}). If you are not familiar with Lisp, you can use the
@code{reftex-label-alist} (@pxref{Options - Defining Label
Environments}). If you are not familiar with Lisp, you can use the
@code{custom} library to configure this rather complex variable. To do
this, use
@ -1302,8 +1300,7 @@ a @code{\macro} or after the @code{\begin} statement). @code{t} is
@code{nil} means to use the text right after the label definition.
@item
For more complex ways of getting context, see the variable
@code{reftex-label-alist} (@ref{Options (Defining Label
Environments)}).
@code{reftex-label-alist} (@ref{Options - Defining Label Environments}).
@end itemize
The following list of strings is used to guess the correct label type
@ -1356,9 +1353,8 @@ Reftex Label Alist: [Hide]
Depending on how you would like the label insertion and selection for
the new environments to work, you might want to add the letters @samp{a}
and @samp{h} to some of the flags in the variables
@code{reftex-insert-label-flags} (@pxref{Options (Creating Labels)})
and @code{reftex-label-menu-flags} (@pxref{Options (Referencing
Labels)}).
@code{reftex-insert-label-flags} (@pxref{Options - Creating Labels})
and @code{reftex-label-menu-flags} (@pxref{Options - Referencing Labels}).
@node Quick Equation
@ -1749,7 +1745,7 @@ and @code{reftex-fref-is-default} respectively. While still working,
these variables are deprecated now. Instead of setting them, the
variable @code{reftex-ref-style-default-list} should be adapted now.
@node xr (LaTeX package)
@node LaTeX xr Package
@section @code{xr}: Cross-Document References
@cindex @code{xr}, LaTeX package
@cindex LaTeX packages, @code{xr}
@ -1883,8 +1879,8 @@ which the selection process was started.
@item mouse-2
@vindex reftex-highlight-selection
Clicking with mouse button 2 on a citation will accept it like @key{RET}
would. See also variable @code{reftex-highlight-selection}, @ref{Options
(Misc)}.
would. See also variable @code{reftex-highlight-selection},
@ref{Options - Misc}.
@item m
Mark the current entry. When one or several entries are marked,
@ -2403,8 +2399,9 @@ Abort the indexing process.
The @samp{Find and Index in Document} menu in the phrases buffer also
lists a few options for the indexing process. The options have
associated customization variables to set the defaults (@pxref{Options
(Index Support)}). Here is a short explanation of what the options do:
associated customization variables to set the defaults
(@pxref{Options - Index Support}). Here is a short explanation of
what the options do:
@table @i
@item Match Whole Words
@ -2759,7 +2756,7 @@ variants@footnote{all macros that start with @samp{ref} or end with
@samp{ref} or @samp{refrange}} of the @code{\ref} macro are active for
cross-reference display. This works also for labels defined in an
external document when the current document refers to them through the
@code{xr} interface (@pxref{xr (LaTeX package)}).
@code{xr} interface (@pxref{LaTeX xr Package}).
@item @code{\label}
@cindex @code{\label}
@ -2908,7 +2905,7 @@ the ones defined in @file{font-lock.el}. Therefore, @RefTeX{} will
use faces only when @code{font-lock} is loaded. This seems to be
reasonable because people who like faces will very likely have it
loaded. If you wish to turn off fontification or change the involved
faces, see @ref{Options (Fontification)}.
faces, see @ref{Options - Fontification}.
@node Multifile Documents
@section Multifile Documents
@ -3894,21 +3891,21 @@ Lisp (and even if you are) you might find it more comfortable to use
reftex-customize} will get you there.
@menu
* Options (Table of Contents)::
* Options (Defining Label Environments)::
* Options (Creating Labels)::
* Options (Referencing Labels)::
* Options (Creating Citations)::
* Options (Index Support)::
* Options (Viewing Cross-References)::
* Options (Finding Files)::
* Options (Optimizations)::
* Options (Fontification)::
* Options (Misc)::
* Options - Table of Contents::
* Options - Defining Label Environments::
* Options - Creating Labels::
* Options - Referencing Labels::
* Options - Creating Citations::
* Options - Index Support::
* Options - Viewing Cross-References::
* Options - Finding Files::
* Options - Optimizations::
* Options - Fontification::
* Options - Misc::
* Keymaps and Hooks::
@end menu
@node Options (Table of Contents)
@node Options - Table of Contents
@section Table of Contents
@cindex Options, table of contents
@cindex Table of contents, options
@ -4032,7 +4029,7 @@ The keymap which is active in the @file{*toc*} buffer.
(@pxref{Table of Contents}).
@end deffn
@node Options (Defining Label Environments)
@node Options - Defining Label Environments
@section Defining Label Environments
@cindex Options, defining label environments
@cindex Defining label environments, options
@ -4259,7 +4256,7 @@ labels fn:xxx, you may want to set this variable to the value "^fn:$" or
non-footnote labels.
@end defopt
@node Options (Creating Labels)
@node Options - Creating Labels
@section Creating Labels
@cindex Options, creating labels
@cindex Creating labels, options
@ -4375,7 +4372,7 @@ Character class after abbrev point in word.
@end table
@end defopt
@node Options (Referencing Labels)
@node Options - Referencing Labels
@section Referencing Labels
@cindex Options, referencing labels
@cindex Referencing labels, options
@ -4497,7 +4494,7 @@ The keymap which is active in the labels selection process
(@pxref{Referencing Labels}).
@end deffn
@node Options (Creating Citations)
@node Options - Creating Citations
@section Creating Citations
@cindex Options, creating citations
@cindex Creating citations, options
@ -4676,7 +4673,7 @@ Footer to insert in BibTeX files generated by
@end defopt
@node Options (Index Support)
@node Options - Index Support, Options - Viewing Cross-References, Options - Creating Citations, Options
@section Index Support
@cindex Options, Index support
@cindex Index support, options
@ -4896,7 +4893,7 @@ The keymap which is active in the @file{*Index*} buffer
(@pxref{Index Support}).
@end deffn
@node Options (Viewing Cross-References)
@node Options - Viewing Cross-References
@section Viewing Cross-References
@cindex Options, viewing cross-references
@cindex Viewing cross-references, options
@ -4955,7 +4952,7 @@ saved along with the parsing information. The cache survives document
scans. In order to clear it, use @kbd{M-x reftex-reset-mode}.
@end defopt
@node Options (Finding Files)
@node Options - Finding Files
@section Finding Files
@cindex Options, Finding Files
@cindex Finding files, options
@ -5045,7 +5042,7 @@ non-@code{nil}.
@end defopt
@page
@node Options (Optimizations)
@node Options - Optimizations
@section Optimizations
@cindex Options, optimizations
@cindex Optimizations, options
@ -5154,7 +5151,7 @@ effect when @code{reftex-use-multiple-selection-buffers} is
non-@code{nil}.
@end defopt
@node Options (Fontification)
@node Options - Fontification
@section Fontification
@cindex Options, fontification
@cindex Fontification, options
@ -5252,7 +5249,7 @@ Face name for index names (for multiple indices).
Face name for index entries.
@end defopt
@node Options (Misc)
@node Options - Misc
@section Miscellaneous
@cindex Options, misc

194
doc/misc/sc.texi
View File

@ -84,12 +84,15 @@ into the following chapters.
@node Introduction
@chapter Introduction
Supercite is a GNU Emacs package written entirely in Emacs Lisp. It
@cindex MUA
@cindex NUA
Supercite is a GNU Emacs package written entirely in Emacs Lisp. It
interfaces to most of the commonly used Emacs mail user agents
(@dfn{MUAs}) and news user agents (@dfn{NUAs}), and provides
sophisticated facilities for the citing and attributing of message
replies. Supercite has a very specific and limited role in the process
of composing replies to both USENET network news and electronic mail.
replies. Supercite has a very specific and limited role in the
process of composing replies to both USENET network news and
electronic mail.
The preferred way to spell Supercite is with a capital @samp{S},
lowercase @samp{upercite}.
@ -100,8 +103,7 @@ lowercase @samp{upercite}.
* What Supercite Does::
@end menu
@cindex MUA
@cindex NUA
@c FIXME: move it above the menu? --xfq
Supercite is only useful in conjunction with MUAs and NUAs such as VM,
Gnus, RMAIL, MH-E, etc. Supercite is typically called by the MUA after a
reply buffer has been setup. Thereafter, Supercite's many commands and
@ -118,21 +120,22 @@ sent. Supercite is re-initialized in each new reply buffer.
@cindex cite, citing
@cindex attribute, attributing
Typical usage is as follows. You want to reply or followup to a message
in your MUA@. You will probably hit @kbd{r} (i.e., ``reply'') or @kbd{f}
(i.e., ``forward'') to begin composing the reply. In response, the MUA
will create a reply buffer and initialize the outgoing mail headers
appropriately. The body of the reply will usually be empty at this
point. You now decide that you would like to include part of the
original message in your reply. To do this, you @dfn{yank} the original
message into the reply buffer, typically with a key stroke such as
@kbd{C-c C-y}. This sequence will invoke an MUA-specific function which
fills the body of the reply with the original message and then
@dfn{attributes} this text to its author. This is called @dfn{citing}
and its effect is to prefix every line from the original message with a
special text tag. Most MUAs provide some default style of citing; by
using Supercite you gain a wider flexibility in the look and style of
citations. Supercite's only job is to cite the original message.
Typical usage is as follows. You want to reply or followup to a
message in your MUA@. You will probably hit @kbd{r} (i.e., ``reply'')
or @kbd{f} (i.e., ``forward'') to begin composing the reply. In
response, the MUA will create a reply buffer and initialize the
outgoing mail headers appropriately. The body of the reply will
usually be empty at this point. You now decide that you would like to
include part of the original message in your reply. To do this, you
@dfn{yank} the original message into the reply buffer, typically with
a key stroke such as @kbd{C-c C-y}. This sequence will invoke an
MUA-specific function which fills the body of the reply with the
original message and then @dfn{attributes} this text to its author.
This is called @dfn{citing} and its effect is to prefix every line
from the original message with a special text tag. Most MUAs provide
some default style of citing; by using Supercite you gain a wider
flexibility in the look and style of citations. Supercite's only job
is to cite the original message.
@node What Supercite Does Not Do
@section What Supercite Doesn't Do
@ -183,7 +186,7 @@ string carrying details about the citation it is about to perform.
@cindex modeline
Next, Supercite visits each line in the reply, transforming the line
according to a customizable ``script.'' Lines which were not previously
according to a customizable ``script''. Lines which were not previously
cited in the original message are given a citation, while already cited
lines remain untouched, or are coerced to your preferred style.
Finally, Supercite installs a keymap into the reply buffer so that you
@ -253,10 +256,10 @@ make the message very difficult for the eye to scan.
@cindex non-nested citations
In @dfn{non-nested citations}, each cited line begins with an
informative string attributing that line to the original author. Only
the first level of attribution will be shown; subsequent citations don't
nest the citation strings. The above dialog might look like this when
non-nested citations are used:
informative string attributing that line to the original author. Only
the first level of attribution will be shown; subsequent citations
don't nest the citation strings. The above dialog might look like
this when non-nested citations are used:
@example
John> John originally wrote this
@ -272,19 +275,20 @@ message did not result in a line cited with @samp{Jane>John>}.
@vindex sc-nested-citation-p
@vindex nested-citation-p (sc-)
Supercite supports both styles of citation, and the variable
@code{sc-nested-citation-p} controls which style it will use when citing
previously uncited text. When this variable is @code{nil} (the default),
non-nested citations are used. When non-@code{nil}, nested citations
are used.
@code{sc-nested-citation-p} controls which style it will use when
citing previously uncited text. When this variable is @code{nil} (the
default), non-nested citations are used. When non-@code{nil}, nested
citations are used.
@node Citation Elements
@section Citation Elements
@cindex citation string
@dfn{Citation strings} are composed of one or more elements. Non-nested
citations are composed of four elements, three of which are directly
user definable. The elements are concatenated together, in this order:
@dfn{Citation strings} are composed of one or more elements.
Non-nested citations are composed of four elements, three of which are
directly user definable. The elements are concatenated together, in
this order:
@cindex citation leader
@vindex citation-leader (sc-)
@ -337,10 +341,10 @@ multi-level nested citations.
@section Recognizing Citations
Supercite also recognizes citations in the original article, and can
transform these already cited lines in a number of ways. This is how
transform these already cited lines in a number of ways. This is how
Supercite suppresses the multiple citing of non-nested citations.
Recognition of cited lines is controlled by variables analogous to those
that make up the citation string as mentioned previously.
Recognition of cited lines is controlled by variables analogous to
those that make up the citation string as mentioned previously.
@vindex sc-citation-leader-regexp
@vindex citation-leader-regexp (sc-)
@ -387,16 +391,16 @@ change @code{sc-citation-root-regexp} you should always also change
@dfn{Mail header information keys} are nuggets of information that
Supercite extracts from the various mail headers of the original
message, placed in the reply buffer by the MUA@. Information is kept in
the @dfn{Info Alist} as key-value pairs, and can be retrieved for use in
various places within Supercite, such as in header rewrite functions and
attribution selection. Other bits of data, composed and created by
Supercite, are also kept as key-value pairs in this alist. In the case
of mail fields, the key is the name of the field, omitting the trailing
colon. Info keys are always case insensitive (as are mail headers), and
the value for a corresponding key can be retrieved from the alist with
the @code{sc-mail-field} function. Thus, if the following fields were
present in the original article:@refill
message, placed in the reply buffer by the MUA@. Information is kept
in the @dfn{Info Alist} as key-value pairs, and can be retrieved for
use in various places within Supercite, such as in header rewrite
functions and attribution selection. Other bits of data, composed and
created by Supercite, are also kept as key-value pairs in this alist.
In the case of mail fields, the key is the name of the field, omitting
the trailing colon. Info keys are always case insensitive (as are
mail headers), and the value for a corresponding key can be retrieved
from the alist with the @code{sc-mail-field} function. Thus, if the
following fields were present in the original article:@refill
@example
Date:@: 08 April 1991, 17:32:09 EST
@ -419,7 +423,7 @@ then, the following lisp constructs return:
Since the argument to @code{sc-mail-field} can be any string, it is
possible that the mail field will not be present on the info alist
(possibly because the mail header was not present in the original
message). In this case, @code{sc-mail-field} will return the value of
message). In this case, @code{sc-mail-field} will return the value of
the variable @code{sc-mumble}.
Supercite always places all mail fields found in the yanked original
@ -510,8 +514,8 @@ header.
@vindex sc-rewrite-header-list
@vindex rewrite-header-list (sc-)
There are a number of built-in @dfn{header rewrite functions} supplied
by Supercite, but you can write your own custom header rewrite functions
(perhaps using the built-in ones as examples). The variable
by Supercite, but you can write your own custom header rewrite
functions (perhaps using the built-in ones as examples). The variable
@code{sc-rewrite-header-list} contains the list of such header rewrite
functions. This list is consulted both when inserting the initial
reference header, and when displaying @dfn{electric references}.
@ -521,7 +525,7 @@ reference header, and when displaying @dfn{electric references}.
@vindex preferred-header-style (sc-)
When Supercite is initially run on a reply buffer (via
@code{sc-cite-original}), it will automatically call one of these
functions. The one it uses is defined in the variable
functions. The one it uses is defined in the variable
@code{sc-preferred-header-style}. The value of this variable is an
integer which is an index into the @code{sc-rewrite-header-list},
beginning at zero.
@ -556,9 +560,9 @@ problem either in your MUA or in Supercite's installation).
@findex sc-no-header
@findex no-header (sc-)
@item sc-no-header
This function produces no header. It should be used instead of
@code{nil} to produce a blank header. This header can possibly contain
a blank line after the @code{mail-header-separator} line.
This function produces no header. It should be used instead of
@code{nil} to produce a blank header. This header can possibly
contain a blank line after the @code{mail-header-separator} line.
@item sc-no-blank-line-or-header
@findex sc-no-blank-line-or-header
@ -612,11 +616,11 @@ line after the @code{mail-header-separator} line will be removed.
By default, when Supercite cites the original message for the first
time, it just goes ahead and inserts the reference header indexed by
@code{sc-preferred-header-style}. However, you may want to select
different reference headers based on the type of reply or forwarding you
are doing. You may also want to preview the reference header before
deciding whether to insert it into the reply buffer or not. Supercite
provides an optional @dfn{electric reference} mode which you can drop
into to give you this functionality.
different reference headers based on the type of reply or forwarding
you are doing. You may also want to preview the reference header
before deciding whether to insert it into the reply buffer or
not. Supercite provides an optional @dfn{electric reference} mode
which you can drop into to give you this functionality.
@vindex sc-electric-references-p
@vindex electric-references-p (sc-)
@ -629,7 +633,7 @@ through all the reference header rewrite functions in your
@code{sc-rewrite-header-list}.
You can also set a new preferred header style, jump to any header, or
jump to the preferred header. The header will be shown in the electric
jump to the preferred header. The header will be shown in the electric
reference buffer and the header index and function name will appear in
the echo area.
@ -643,7 +647,7 @@ The following commands are available while in electric reference mode
@kindex n
@vindex sc-electric-circular-p
@vindex electric-circular-p (sc-)
Displays the next reference header in the electric reference buffer. If
Displays the next reference header in the electric reference buffer. If
the variable @code{sc-electric-circular-p} is non-@code{nil}, invoking
@code{sc-eref-next} while viewing the last reference header in the list
will wrap around to the first header.@refill
@ -854,7 +858,7 @@ affect alternative citing styles.
@vindex mail-warn-if-non-rfc822-p (sc-)
All previously retrieved info key-value pairs are deleted from the info
alist, then the mail headers in the body of the yanked message are
scanned. Info key-value pairs are created for each header found. Also,
scanned. Info key-value pairs are created for each header found. Also,
such useful information as the author's name and email address are
extracted. If the variable @code{sc-mail-warn-if-non-rfc822-p} is
non-@code{nil}, then Supercite will warn you if it finds a mail header
@ -931,7 +935,7 @@ in the original message should be cited or not. If this variable is
non-@code{nil}, blank lines will be cited just like non-blank lines.
Otherwise, blank lines will be treated as paragraph separators.
Citing of the original message is highly configurable. Supercite's
Citing of the original message is highly configurable. Supercite's
default setup does a pretty good job of citing many common forms of
previously cited messages. But there are as many citation styles out
there as people on the net, or just about! It would be impossible for
@ -945,8 +949,8 @@ recognize those styles you see often.
@vindex sc-post-hook
@vindex post-hook (sc-)
This variable is very similar to @code{sc-pre-hook}, except that it runs
after @code{sc-cite-original} is finished. This hook is provided mostly
for completeness and backward compatibility. Perhaps it could be used to
after @code{sc-cite-original} is finished. This hook is provided mostly
for completeness and backward compatibility. Perhaps it could be used to
reset certain variables set in @code{sc-pre-hook}.@refill
@end enumerate
@ -1012,7 +1016,7 @@ both of these variables is provided on the key binding
@pxref{Post-yank Formatting Commands}).@refill
You will noticed that the minor mode string will
show the state of these variables as qualifier characters. When both
show the state of these variables as qualifier characters. When both
variables are @code{nil}, the Supercite minor mode string will display
@samp{SC}. When just @code{sc-auto-fill-region-p} is non-@code{nil}, the
string will display @samp{SC:f}, and when just
@ -1036,11 +1040,11 @@ fill cited text.
@vindex preferred-attribution-list (sc-)
As you know, the attribution string is the part of the author's name
that will be used to composed a non-nested citation string. Supercite
that will be used to composed a non-nested citation string. Supercite
scans the various mail headers present in the original article and uses
a number of heuristics to extract strings which it puts into the
@dfn{attribution association list} or @dfn{attribution alist}. This is
analogous, but different than, the info alist previously mentioned. Each
@dfn{attribution association list} or @dfn{attribution alist}. This is
analogous, but different than, the info alist previously mentioned. Each
element in the attribution alist is a key-value pair containing such
information as the author's first name, middle names, and last name, the
author's initials, and the author's email terminus.
@ -1083,7 +1087,7 @@ the author's last name.
the author's first middle name.
@item "sc-lastchoice"
the last attribution string you have selected. This is useful when you
the last attribution string you have selected. This is useful when you
recite paragraphs in the reply.@refill
@item "sc-consult"
@ -1094,7 +1098,7 @@ be used to select special attributions based on the value of any info
key. See below for details.
@item "x-attribution"
the original author's suggestion for attribution string choice. See below
the original author's suggestion for attribution string choice. See below
for details.@refill
@end table
@ -1141,7 +1145,7 @@ Each element in this list contains lists of the following form:
@findex sc-mail-field
@findex mail-field (sc-)
where @var{infokey} is a key for @code{sc-mail-field} and @var{regexp}
is a regular expression to match against the @var{infokey}'s value. If
is a regular expression to match against the @var{infokey}'s value. If
@var{regexp} matches the @var{infokey}'s value, the @var{attribution} is
used as the attribution string. Actually, @var{attribution} can be a
string or a list; if it is a list, it is @code{eval}uated and the return
@ -1166,7 +1170,7 @@ The fallback author name is contained in the variable
@code{sc-default-author-name} and the fallback attribution string is
contained in the variable @code{sc-default-attribution}. Default values
for these variables are @code{"Anonymous"} and @code{"Anon"},
respectively. Note that in most circumstances, getting the default
respectively. Note that in most circumstances, getting the default
author name or attribution is a sign that something is set up
incorrectly.
@ -1174,7 +1178,7 @@ incorrectly.
@vindex use-only-preference-p (sc-)
Also, if the preferred attribution, which you specified in your
@code{sc-preferred-attribution-list} variable cannot be found, a
secondary method can be employed to find a valid attribution string. The
secondary method can be employed to find a valid attribution string. The
variable @code{sc-use-only-preference-p} controls what happens in this
case. If the variable's value is non-@code{nil}, then
@code{sc-default-author-name} and @code{sc-default-attribution} are
@ -1209,11 +1213,11 @@ attribution alist.
@vindex sc-confirm-always-p
@vindex confirm-always-p (sc-)
Once the attribution string has been automatically selected, a number of
things can happen. If the variable @code{sc-confirm-always-p} is
things can happen. If the variable @code{sc-confirm-always-p} is
non-@code{nil}, you are queried for confirmation of the chosen
attribution string. The possible values for completion are those strings
attribution string. The possible values for completion are those strings
in the attribution alist, however you are not limited to these choices.
You can type any arbitrary string at the confirmation prompt. The string
You can type any arbitrary string at the confirmation prompt. The string
you enter becomes the value associated with the @code{"sc-lastchoice"}
key in the attribution alist.
@ -1279,7 +1283,7 @@ author's name proper. Examples include the titles ``Dr.'', ``Mr.'',
Also, some companies prepend or append the name of the division,
organization, or project on the author's name. All of these titles are
noise which should be ignored. The variable @code{sc-name-filter-alist}
is used for this purpose. As implied by its name, this variable is an
is used for this purpose. As implied by its name, this variable is an
association list, where each element is a cons cell of the form:
@example
@ -1290,7 +1294,7 @@ association list, where each element is a cons cell of the form:
where @var{regexp} is a regular expression that is matched (using
@code{string-match}) against each element of the @samp{From:@:} field's
author name. @var{position} is a position indicator, starting at zero.
Thus to strip out all titles of ``Dr.'', ``Mr.'', etc. from the name,
Thus to strip out all titles of ``Dr.'', ``Mr.'', etc. from the name,
@code{sc-name-filter-alist} would have an entry such as:
@example
@ -1380,10 +1384,10 @@ The four special symbol values for @var{pred} are recognized:
@item t
Always produces a true outcome.
@item begin
Always executed before the frame is interpreted. This can be used to
Always executed before the frame is interpreted. This can be used to
initialize some global variables for example.
@item end
Always executed after frame interpreting is completed. This can be used
Always executed after frame interpreting is completed. This can be used
to perform any necessary post-processing.
@item every
Executes whenever the frame is reset, usually after the entire frame has
@ -1406,12 +1410,12 @@ of the following elements:@refill
@table @asis
@item the symbol @code{continue}
This tells Regi to continue processing entries after a match, instead of
resetting the frame and moving @samp{point}. In this way, lines of text
resetting the frame and moving @samp{point}. In this way, lines of text
can have multiple matches, but you have to be careful to avoid entering
infinite loops.
@item the symbol @code{abort}
This tells Regi to terminate frame processing. However, any @code{end}
This tells Regi to terminate frame processing. However, any @code{end}
entry is still processed.
@item the list @code{(frame . @var{newframe})}
@ -1422,7 +1426,7 @@ can be the frame in-lined.@refill
@item the list @code{(step . @var{step})}
Tells Regi to move @var{step} number of lines forward as it continues
processing. By default, Regi moves forward one line. @var{step} can be
processing. By default, Regi moves forward one line. @var{step} can be
zero or negative of course, but watch out for infinite loops.@refill
@end table
@ -1510,12 +1514,12 @@ is not found from the alist, then the appropriate default frame is used.
Once the original message has been yanked into the reply buffer, and
@code{sc-cite-original} has had a chance to do its thing, a number of
useful Supercite commands will be available to you. Since there is wide
useful Supercite commands will be available to you. Since there is wide
variety in the keymaps that MUAs set up in their reply buffers, it is
next to impossible for Supercite to properly sprinkle its commands into
the existing keymap. For this reason Supercite places its commands on a
separate keymap, putting this keymap onto a prefix key in the reply
buffer. You can customize the prefix key Supercite uses by changing the
buffer. You can customize the prefix key Supercite uses by changing the
variable @code{sc-mode-map-prefix}. By default, the
@code{sc-mode-map-prefix} is @kbd{C-c C-p}; granted, not a great choice,
but unfortunately the best general solution so far. In the rest of this
@ -1536,7 +1540,7 @@ prefix.@refill
Probably the three most common post-yank formatting operations that you
will perform will be the manual citing, reciting, and unciting of
regions of text in the reply buffer. Often you may want to recite a
regions of text in the reply buffer. Often you may want to recite a
paragraph to use a nickname, or manually cite a message when setting
@code{sc-cite-region-limit} to @code{nil}. The following commands
perform these functions on the region of text between @samp{point} and
@ -1582,7 +1586,7 @@ cited line in the region by interpreting the selected frame from
@item @code{sc-recite-region} (@kbd{C-c C-p r})
This command recites each line the region by interpreting the selected
frame from @code{sc-recite-frame-alist}, or the default reciting frame
@code{sc-default-recite-frame}. It runs the hook
@code{sc-default-recite-frame}. It runs the hook
@code{sc-pre-recite-hook} before interpreting the frame.
@xref{Configuring the Citation Engine}.@refill
@ -1606,7 +1610,7 @@ These two functions insert various strings into the reply buffer.
@vindex preferred-header-style (sc-)
Inserts a reference header into the reply buffer at @samp{point}. With
no arguments, the header indexed by @code{sc-preferred-header-style} is
inserted. An optional numeric argument is the index into
inserted. An optional numeric argument is the index into
@code{sc-rewrite-header-list} indicating which reference header to
write.@refill
@ -1719,7 +1723,7 @@ Allows you to interactively view, modify, add, and delete info alist
key-value pairs. With no argument, you are prompted (with completion)
for a info key. The value associated with that key is displayed in the
minibuffer. With an argument, this command will first ask if you want
to view, modify, add, or delete an info key. Viewing is identical to
to view, modify, add, or delete an info key. Viewing is identical to
running the command with no arguments.
If you want to modify the value of a key, Supercite will first prompt
@ -1770,7 +1774,7 @@ an optional numeric argument inserts that many new lines.@refill
@chapter Hints to MUA Authors
In June of 1989, some discussion was held between the various MUA
authors, the Supercite author, and other Supercite users. These
authors, the Supercite author, and other Supercite users. These
discussions centered around the need for a standard interface between
MUAs and Supercite (or any future Supercite-like packages). This
interface was formally proposed by Martin Neitzel on Fri, 23 Jun 89, in
@ -1810,14 +1814,14 @@ some default citing when that is the case.@refill
If you are writing a new MUA package, or maintaining an existing MUA
package, you should make it conform to this interface so that your users
will be able to link Supercite easily and seamlessly. To do this, when
will be able to link Supercite easily and seamlessly. To do this, when
setting up a reply or forward buffer, your MUA should follow these
steps:
@enumerate
@item
Insert the original message, including the mail headers into the reply
buffer. At this point you should not modify the raw text in any way
buffer. At this point you should not modify the raw text in any way
(except for any necessary decoding, e.g., of quoted-printable text), and
you should place all the original headers into the body of the reply.
This means that many of the mail headers will be duplicated, one copy
@ -1826,7 +1830,7 @@ there will probably be more headers below this line.@refill
@item
Set @samp{point} to the beginning of the line containing the first mail
header in the body of the reply. Set @samp{mark} at the end of the
header in the body of the reply. Set @samp{mark} at the end of the
message text. It is very important that the region be set around the
text Supercite is to modify and that the mail headers are within this
region. Supercite will not venture outside the region for any reason,
@ -1834,7 +1838,7 @@ and anything within the region is fair game, so don't put anything that
@strong{must} remain unchanged inside the region.@refill
@item
Run the hook @code{mail-citation-hook}. You will probably want to
Run the hook @code{mail-citation-hook}. You will probably want to
provide some kind of default citation functions in cases where the user
does not have Supercite installed. By default, your MUA should
@code{defvar} @code{mail-citation-hook} to @code{nil}, and in your
@ -1853,9 +1857,9 @@ this interface ``out of the box.''
The Supercite package was derived from its predecessor Superyank 1.11
which was inspired by various bits of code and ideas from Martin Neitzel
and Ashwin Ram. They were the folks who came up with the idea of
and Ashwin Ram. They were the folks who came up with the idea of
non-nested citations and implemented some rough code to provide this
style. Superyank and Supercite version 2 evolved to the point where much
style. Superyank and Supercite version 2 evolved to the point where much
of the attribution selection mechanism was automatic, and features have
been continuously added through the comments and suggestions of the
Supercite mailing list participants.

18
doc/misc/texinfo.tex
View File

@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
\def\texinfoversion{2013-06-23.10}
\def\texinfoversion{2013-08-20.10}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@ -281,9 +281,9 @@
\toks6=\expandafter{\prevsectiondefs}%
\toks8=\expandafter{\lastcolordefs}%
\mark{%
\the\toks0 \the\toks2
\noexpand\or \the\toks4 \the\toks6
\noexpand\else \the\toks8
\the\toks0 \the\toks2 % 0: top marks (\last...)
\noexpand\or \the\toks4 \the\toks6 % 1: bottom marks (default, \prev...)
\noexpand\else \the\toks8 % 2: color marks
}%
}
% \topmark doesn't work for the very first chapter (after the title
@ -2377,8 +2377,10 @@
\ifx\next,%
\else\ifx\next-%
\else\ifx\next.%
\else\ifx\next\.%
\else\ifx\next\comma%
\else\ptexslash
\fi\fi\fi
\fi\fi\fi\fi\fi
\aftersmartic
}
@ -2519,7 +2521,9 @@
\ifx\codedashprev\codedash
\else \discretionary{}{}{}\fi
\fi
\global\let\codedashprev=\next
% we need the space after the = for the case when \next itself is a
% space token; it would get swallowed otherwise. As in @code{- a}.
\global\let\codedashprev= \next
}
}
\def\normaldash{-}
@ -5905,7 +5909,7 @@
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
\let\prevsectiondefs=\lastsectiondefs
\global\let\prevsectiondefs=\lastsectiondefs
\domark
%
% Only insert the space after the number if we have a section number.

1760
doc/misc/todo-mode.texi Normal file
View File

File diff suppressed because it is too large Load Diff

5
doc/misc/woman.texi
View File

@ -67,7 +67,12 @@ modify this GNU manual.''
@display
As distributed with Emacs @value{EMACSVER}.
@ifnothtml
@email{F.J.Wright@@qmw.ac.uk, Francis J. Wright}
@end ifnothtml
@ifhtml
Francis J. Wright
@end ifhtml
@uref{http://centaur.maths.qmw.ac.uk/, School of Mathematical Sciences}
Queen Mary and Westfield College (University of London)
Mile End Road, London E1 4NS, UK

38
etc/ChangeLog
View File

@ -1,3 +1,41 @@
2013-08-15 Glenn Morris <rgm@gnu.org>
* refcards/calccard.pdf, refcards/cs-dired-ref.pdf:
* refcards/cs-refcard.pdf, refcards/de-refcard.pdf:
* refcards/dired-ref.pdf, refcards/fr-dired-ref.pdf:
* refcards/fr-refcard.pdf, refcards/gnus-booklet.pdf:
* refcards/gnus-refcard.pdf, refcards/orgcard.pdf:
* refcards/pl-refcard.pdf, refcards/pt-br-refcard.pdf:
* refcards/refcard.pdf, refcards/ru-refcard.pdf:
* refcards/sk-dired-ref.pdf, refcards/sk-refcard.pdf:
Remove generated files from repository.
* refcards/Makefile: Rewrite to use portable Makefile syntax.
Add language-specific targets.
(distclean, extraclean): New rules.
2013-08-13 Glenn Morris <rgm@gnu.org>
* refcards/Makefile (all_pdf, all_ps, fr-survival.ps, dist):
New rules.
(SURVIVAL_CARDS_PDF): Add fr_survival.pdf.
2013-08-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
* NEWS: Mention -lz and `decompress-gzipped-region'.
2013-08-08 Juanma Barranquero <lekktu@gmail.com>
* NEWS: Document new keybinding of `C-x r f' to frameset-to-register.
2013-08-06 Dmitry Antipov <dmantipov@yandex.ru>
* NEWS: Mention `cache-long-scans'.
2013-08-05 Juanma Barranquero <lekktu@gmail.com>
* tutorials/TUTORIAL.es: Fix typo (bug#15027).
2013-08-03 Juanma Barranquero <lekktu@gmail.com>
* NEWS: Document new package frameset.el.

49
etc/NEWS
View File

@ -41,6 +41,11 @@ specially.
** Directories passed to configure option `--enable-locallisppath' are
no longer created during installation.
** Emacs can be compiled with zlib support. If this library is present
(which it normally is on most systems), the function
`zlib-decompress-region' becomes available, which can decompress gzip-
and zlib-format compressed data.
---
** Emacs for NS (OSX, GNUStep) can be built with ImageMagick support.
pkg-config is required to find ImageMagick libraries.
@ -53,6 +58,10 @@ pkg-config is required to find ImageMagick libraries.
** Key ? also describes prefix bindings like C-h.
+++
** `cache-long-line-scans' has been renamed to `cache-long-scans'
because it affects caching of paragraph scanning results as well.
+++
** `apropos-variable' is now `apropos-user-option'
`apropos-user-option' shows all user options while `apropos-variable'
@ -127,6 +136,11 @@ You can change the default by customizing the variable blink-cursor-blinks.
Also timers for blinking are stopped when no blinking is done, so Emacs does
not consume CPU cycles.
** New command `frameset-to-register' is now bound to `C-x r f', replacing
`frame-configuration-to-register'. It offers similar functionality, plus
some enhancements, like the ability to restore deleted frames. Command
`frame-configuration-to-register' is still available, but unbound.
* Editing Changes in Emacs 24.4
@ -229,6 +243,13 @@ The default separator is changed to allow surrounding spaces around the comma.
** Calendar and Diary
*** New faces: `calendar-weekday-header', `calendar-weekend-header',
`calendar-month-header'.
*** New option `calendar-day-header-array'.
*** The variable `calendar-font-lock-keywords' is obsolete.
+++
*** New variable `diary-from-outlook-function', used by the command
`diary-from-outlook'.
@ -274,9 +295,9 @@ on the given date.
auto-saves of the desktop.
*** `desktop-restore-frames', enabled by default, allows saving and
restoring the window/frame configuration. Additional options
restoring the frame/window configuration (frameset). Additional options
`desktop-restore-in-current-display', `desktop-restore-reuses-frames'
and `desktop-restore-forces-onscreen' allow further customization.
and `desktop-restore-forces-onscreen' offer further customization.
** Dired
@ -327,6 +348,8 @@ directory, respectively.
`f' (`image-next-frame') and `b' (`image-previous-frame') visit the
next or previous frame. `F' (`image-goto-frame') shows a specific frame.
*** New commands to speed up, slow down, or reverse animation.
---
*** The command `image-mode-fit-frame' deletes other windows.
When toggling, it restores the frame's previous window configuration.
@ -429,6 +452,7 @@ New features include:
archive files, undoing or unarchiving done items;
- reprioritizing items by inputting a numerical priority;
- extensive customizability of operation and display, including numerous faces.
The Todo mode user manual describes all commands and most user options.
To support some of these features, a new file format is used, which is
incompatible with the old format; however, you can convert old todo and done
item files to the new format on initializing the first new todo file, or at any
@ -583,6 +607,9 @@ in the presence of files with negative time stamps.
* Lisp Changes in Emacs 24.4
+++
** New function `define-error'.
** New hook `tty-setup-hook'.
+++
@ -659,6 +686,8 @@ Emacs uses `image-default-frame-delay'.
*** New functions `image-current-frame' and `image-show-frame' for getting
and setting the current frame of a multi-frame image.
*** You can change the speed of animated images.
** Changes in encoding and decoding of text
---
@ -692,7 +721,7 @@ These attributes are only meaningful for coding-systems of type
with the same interpretation as the returned value of `visited-file-modtime'.
** time-to-seconds is not obsolete any more.
** New function special-form-p.
** New functions special-form-p and macrop.
** Docstrings can be made dynamic by adding a `dynamic-docstring-function'
text-property on the first char.
@ -734,12 +763,10 @@ meant to be used by other packages.
* Changes in Emacs 24.4 on Non-Free Operating Systems
** Emacs for MS-Windows can now be built by running the configure script
using the MSYS environment and MinGW development tools.
This is from now on the preferred method of building Emacs on
MS-Windows. The Windows-specific configure.bat and makefile.w32-in
files are deprecated. See the file nt/INSTALL.MSYS for detailed
instructions.
** The procedure for building Emacs on MS-Windows has changed.
It is now built by running the same configure script as on all other
platforms. This requires the MSYS environment and MinGW development
tools. See the updated instructions in nt/INSTALL for details.
Using the Posix configure script and Makefile's also means a change in
the directory structure of the Emacs installation on Windows. It is
@ -872,6 +899,10 @@ treated as images.
*** ImageMagick images now support the :max-width and :max-height
keywords.
*** Some data types aren't auto-detected by ImageMagick. Adding
:format to `create-image' may help if the content type is in the
new variable `image-format-suffixes'.
** Minibuffer
*** In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the

6
etc/PROBLEMS
View File

@ -3016,9 +3016,9 @@ You can enter M-f6 by typing ESC f6.
*** MS-Windows 95/98/ME: subprocesses do not terminate properly.
This is a limitation of the Operating System, and can cause problems
when shutting down Windows. Ensure that all subprocesses are exited
cleanly before exiting Emacs. For more details, see the FAQ at
http://www.gnu.org/software/emacs/windows/.
when shutting down Windows. Ensure that all subprocesses are exited
cleanly before exiting Emacs. For more details, see the Emacs on MS
Windows FAQ (info manual "efaq-w32").
*** MS-Windows 95/98/ME: crashes when Emacs invokes non-existent programs.

3
etc/TODO
View File

@ -76,7 +76,8 @@ to use it.
** Convert all defvars with leading `*' in the doc-strings into defcustoms
of appropriate :type and :group.
** Remove any leading `*'s from defcustom doc-strings. [done?]
** Remove any leading `*'s from defcustom doc-strings.
[done?] [A lot of them are in CC Mode.]
** Remove unnecessary autoload cookies from defcustoms.
This needs a bit of care, since often people have become used to

384
etc/refcards/Makefile
View File

@ -17,124 +17,321 @@
## You should have received a copy of the GNU General Public License
## along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
### Commentary:
## Top-level targets.
## See README for details.
## PDF files that are included with Emacs.
all: refcards_pdf dired-refcards_pdf misc-refcards_pdf
PDF_ENGLISH = \
calccard.pdf \
dired-ref.pdf \
gnus-booklet.pdf \
gnus-refcard.pdf \
orgcard.pdf \
refcard.pdf \
survival.pdf \
vipcard.pdf \
viperCard.pdf
REFCARDS_PDF = refcard.pdf cs-refcard.pdf de-refcard.pdf fr-refcard.pdf \
pl-refcard.pdf pt-br-refcard.pdf ru-refcard.pdf sk-refcard.pdf
refcards_pdf: ${REFCARDS_PDF}
refcards_ps: ${REFCARDS_PDF:.pdf=.ps}
PDF_CZECH = \
cs-dired-ref.pdf \
cs-refcard.pdf \
cs-survival.pdf
DIRED_REFCARDS_PDF = dired-ref.pdf cs-dired-ref.pdf fr-dired-ref.pdf \
sk-dired-ref.pdf
dired-refcards_pdf: ${DIRED_REFCARDS_PDF}
dired-refcards_ps: ${DIRED_REFCARDS_PDF:.pdf=.ps}
PDF_FRENCH = \
fr-dired-ref.pdf \
fr-refcard.pdf \
fr-survival.pdf \
MISC_REFCARDS_PDF = calccard.pdf gnus-booklet.pdf gnus-refcard.pdf orgcard.pdf
misc-refcards_pdf: ${MISC_REFCARDS_PDF}
misc-refcards_ps: ${MISC_REFCARDS_PDF:.pdf=.ps}
PDF_GERMAN = de-refcard.pdf
PDF_POLISH = pl-refcard.pdf
PDF_PORTUGUESE = pt-br-refcard.pdf
PDF_RUSSIAN = ru-refcard.pdf
PDF_SLOVAKIAN = \
sk-dired-ref.pdf \
sk-refcard.pdf \
sk-survival.pdf
PDF_TARGETS = $(PDF_ENGLISH) $(PDF_CZECH) $(PDF_FRENCH) $(PDF_GERMAN) \
$(PDF_POLISH) $(PDF_PORTUGUESE) $(PDF_RUSSIAN) $(PDF_SLOVAKIAN)
PS_ENGLISH = \
calccard.ps \
dired-ref.ps \
gnus-booklet.ps \
gnus-refcard.ps \
orgcard.ps \
refcard.ps \
survival.ps \
vipcard.ps \
viperCard.ps
PS_CZECH = \
cs-dired-ref.ps \
cs-refcard.ps \
cs-survival.ps
PS_FRENCH = \
fr-dired-ref.ps \
fr-refcard.ps \
fr-survival.ps \
PS_GERMAN = de-refcard.ps
PS_POLISH = pl-refcard.ps
PS_PORTUGUESE = pt-br-refcard.ps
PS_RUSSIAN = ru-refcard.ps
PS_SLOVAKIAN = \
sk-dired-ref.ps \
sk-refcard.ps \
sk-survival.ps
PS_TARGETS = $(PS_ENGLISH) $(PS_CZECH) $(PS_FRENCH) $(PS_GERMAN) \
$(PS_POLISH) $(PS_PORTUGUESE) $(PS_RUSSIAN) $(PS_SLOVAKIAN)
## The following files are not included with Emacs.
SURVIVAL_CARDS_PDF = survival.pdf cs-survival.pdf sk-survival.pdf
survival-cards_pdf: ${SURVIVAL_CARDS_PDF}
survival-cards_ps: ${SURVIVAL_CARDS_PDF:.pdf=.ps}
## For emacsver.tex.
ENVADD = TEXINPUTS=".:$(TEXINPUTS)"
VIPER_CARDS_PDF = vipcard.pdf viperCard.pdf
viper-cards_pdf: ${VIPER_CARDS_PDF}
viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps}
ENVADD = TEXINPUTS=".:"
.PHONY: all pdf ps
## PDF files.
all: pdf
pdf: $(PDF_TARGETS)
ps: $(PS_TARGETS)
## The page layouts (a4/letter) are written directly in the .tex files.
cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \
sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex emacsver.tex
if pdfcsplain --version > /dev/null 2> /dev/null; then \
${ENVADD} pdfcsplain $<; \
.PHONY: english czech french german polish portuguese russian slovakian
english: $(PDF_ENGLISH)
czech: $(PDF_CZECH)
french: $(PDF_FRENCH)
german: $(PDF_GERMAN)
polish: $(PDF_POLISH)
portuguese: $(PDF_PORTUGUESE)
russian: $(PDF_RUSSIAN)
slovakian: $(PDF_SLOVAKIAN)
.PHONY: english-ps czech-ps french-ps german-ps polish-ps portuguese-ps russian-ps slovakian-ps
english-ps: $(PS_ENGLISH)
czech-ps: $(PS_CZECH)
french-ps: $(PS_FRENCH)
german-ps: $(PS_GERMAN)
polish-ps: $(PS_POLISH)
portuguese-ps: $(PS_PORTUGUESE)
russian-ps: $(PS_RUSSIAN)
slovakian-ps: $(PS_SLOVAKIAN)
## Default for file that do not use a different paper size.
.SUFFIXES: .ps .dvi
.dvi.ps:
dvips -t letter -o $@ $<
make_cs=if pdfcsplain --version > /dev/null 2> /dev/null; then \
$(ENVADD) pdfcsplain $$input; \
else \
${ENVADD} csplain "\pdfoutput=1\input $<"; \
$(ENVADD) csplain "\pdfoutput=1\input $$input"; \
fi
## For pdf output, the page layouts (a4/letter) are written directly
## in the .tex files.
## For PostScript output, note that some of the tex files (refcard,
## de-refcard, fr-refcard, pt-br-refcard) have settings for letter or
## a4 paper. The Following are the default paper sizes (letter for English,
## A4 for translations).
## FIXME orgcard.ps does not fit on letter (see orgcard.tex).
## A4, landscape: de-refcard, fr-refcard, pt-br-refcard orgcard
## A4, portrait: cs-*, fr-dired-ref, sk-*, pl-refcard, ru-refcard
## Letter, landscape: calccard, refcard
## Letter, portrait (suffix rule): dired-ref, gnus-*, survival, vip*
calccard_deps = calccard.tex emacsver.tex pdflayout.sty
calccard.pdf: $(calccard_deps)
$(ENVADD) pdftex calccard.tex
calccard.dvi: $(calccard_deps)
$(ENVADD) tex calccard.tex
calccard.ps: calccard.dvi
dvips -t letter -t landscape -o $@ calccard.dvi
cs_dired_ref_deps = cs-dired-ref.tex emacsver.tex pdflayout.sty
cs-dired-ref.pdf: $(cs_dired_ref_deps)
input=cs-dired-ref.tex; $(make_cs)
cs-dired-ref.dvi: $(cs_dired_ref_deps)
$(ENVADD) csplain cs-dired-ref.tex
cs-dired-ref.ps: cs-dired-ref.dvi
dvips -t a4 -o $@ cs-dired-ref.dvi
cs_refcard_deps = cs-refcard.tex emacsver.tex pdflayout.sty
cs-refcard.pdf: $(cs_refcard_deps)
input=cs-refcard.tex; $(make_cs)
cs-refcard.dvi: $(cs_refcard_deps)
$(ENVADD) csplain cs-refcard.tex
cs-refcard.ps: cs-refcard.dvi
dvips -t a4 -o $@ cs-refcard.dvi
cs_survival_deps = cs-survival.tex emacsver.tex pdflayout.sty
cs-survival.pdf: $(cs_survival_deps)
input=cs-survival.tex; $(make_cs)
cs-survival.dvi: $(cs_survival_deps)
$(ENVADD) csplain cs-survival.tex
cs-survival.ps: cs-survival.dvi
dvips -t a4 -o $@ cs-survival.dvi
de_refcard_deps = de-refcard.tex emacsver.tex pdflayout.sty
de-refcard.pdf: $(de_refcard_deps)
$(ENVADD) pdftex de-refcard.tex
de-refcard.dvi: $(de_refcard_deps)
$(ENVADD) tex de-refcard.tex
de-refcard.ps: de-refcard.dvi
dvips -t a4 -t landscape -o $@ de-refcard.dvi
dired_ref_deps = dired-ref.tex emacsver.tex pdflayout.sty
dired-ref.pdf: $(dired_ref_deps)
$(ENVADD) pdftex dired-ref.tex
dired-ref.dvi: $(dired_ref_deps)
$(ENVADD) tex dired-ref.tex
fr_dired_ref_deps = fr-dired-ref.tex emacsver.tex pdflayout.sty
fr-dired-ref.pdf: $(fr_dired_ref_deps)
$(ENVADD) pdftex fr-dired-ref.tex
fr-dired-ref.dvi: $(fr_dired_ref_deps)
$(ENVADD) tex fr-dired-ref.tex
fr-dired-ref.ps: fr-dired-ref.dvi
dvips -t a4 -o $@ fr-dired-ref.dvi
fr_refcard_deps = fr-refcard.tex emacsver.tex pdflayout.sty
fr-refcard.pdf: $(fr_refcard_deps)
$(ENVADD) pdftex fr-refcard.tex
fr-refcard.dvi: $(fr_refcard_deps)
$(ENVADD) tex fr-refcard.tex
fr-refcard.ps: fr-refcard.dvi
dvips -t a4 -t landscape -o $@ fr-refcard.dvi
fr_survival_deps = fr-survival.tex emacsver.tex pdflayout.sty
fr-survival.pdf: $(fr_survival_deps)
$(ENVADD) pdftex fr-survival.tex
fr-survival.dvi: $(fr_survival_deps)
$(ENVADD) tex fr-survival.tex
fr-survival.ps: fr-survival.dvi
dvips -t a4 -o $@ fr-survival.dvi
## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
gnus_booklet_deps = gnus-refcard.tex gnus-logo.pdf
gnus-booklet.pdf: $(gnus_booklet_deps)
pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
gnus-booklet.dvi: gnus-refcard.tex gnus-logo.eps
latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
mv gnus-refcard.dvi $@
###gnus-logo.pdf: gnus-logo.eps
### ps2pdf gnus-logo.eps
## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
gnus_refcard_deps = gnus-refcard.tex gnus-logo.pdf
gnus-refcard.pdf: $(gnus_refcard_deps)
pdflatex gnus-refcard.tex
gnus-refcard.dvi: $(gnus_refcard_deps)
latex gnus-refcard.tex
orgcard_deps = orgcard.tex emacsver.tex pdflayout.sty
orgcard.pdf: $(orgcard_deps)
$(ENVADD) pdftex orgcard.tex
orgcard.dvi: $(orgcard_deps)
$(ENVADD) tex orgcard.tex
orgcard.ps: orgcard.dvi
dvips -t a4 -t landscape -o $@ orgcard.dvi
pl_refcard_deps = pl-refcard.tex emacsver.tex pdflayout.sty
## Some versions of pdfmex seem to create dvi by default, hence output-format.
pl-refcard.pdf: %.pdf: %.tex emacsver.tex
pl-refcard.pdf: $(pl_refcard_deps)
if ! kpsewhich -format=fmt mex > /dev/null && \
! pdfmex --version > /dev/null 2> /dev/null; then \
echo "No mex format found."; false; \
fi
${ENVADD} pdftex -output-format=pdf $<
ru-refcard.pdf: %.pdf: %.tex
pdflatex $<
#gnus-logo.pdf: %.pdf: %.eps
# ps2pdf $<
gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf
pdflatex $<
gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf
pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
## Everything not explicitly listed above.
%.pdf: %.tex emacsver.tex
${ENVADD} pdftex $<
## dvi files.
cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
sk-dired-ref.dvi sk-survival.dvi: %.dvi: %.tex emacsver.tex
${ENVADD} csplain $<
pl-refcard.dvi: %.dvi: %.tex emacsver.tex
$(ENVADD) pdftex -output-format=pdf pl-refcard.tex
pl-refcard.dvi: $(pl_refcard_deps)
if ! kpsewhich -format=fmt mex > /dev/null; then \
echo "No mex format found."; false; \
fi
${ENVADD} tex $<
$(ENVADD) tex pl-refcard.tex
pl-refcard.ps: pl-refcard.dvi
dvips -t a4 -o $@ pl-refcard.dvi
ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
latex $<
pt_br_refcard_deps = pt-br-refcard.tex emacsver.tex pdflayout.sty
pt-br-refcard.pdf: $(pt_br_refcard_deps)
$(ENVADD) pdftex pt-br-refcard.tex
pt-br-refcard.dvi: $(pt_br_refcard_deps)
$(ENVADD) tex pt-br-refcard.tex
pt-br-refcard.ps: pt-br-refcard.dvi
dvips -t a4 -t landscape -o $@ pt-br-refcard.dvi
gnus-booklet.dvi: gnus-refcard.tex
latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
mv gnus-refcard.dvi $@
refcard_deps = refcard.tex emacsver.tex pdflayout.sty
refcard.pdf: $(refcard_deps)
$(ENVADD) pdftex refcard.tex
refcard.dvi: $(refcard_deps)
$(ENVADD) tex refcard.tex
refcard.ps: refcard.dvi
dvips -t letter -t landscape -o $@ refcard.dvi
## Everything not explicitly listed above.
%.dvi: %.tex emacsver.tex
${ENVADD} tex $<
## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
ru_refcard_deps = ru-refcard.tex
ru-refcard.pdf: $(ru_refcard_deps)
pdflatex ru-refcard.tex
ru-refcard.dvi: $(ru_refcard_deps)
latex ru-refcard.tex
ru-refcard.ps: ru-refcard.dvi
dvips -t a4 -o $@ ru-refcard.dvi
sk_dired_ref_deps = sk-dired-ref.tex emacsver.tex pdflayout.sty
sk-dired-ref.pdf: $(sk_dired_ref_deps)
input=sk-dired-ref.tex; $(make_cs)
sk-dired-ref.dvi: $(sk_dired_ref_deps)
$(ENVADD) csplain sk-dired-ref.tex
sk-dired-ref.ps: sk-dired-ref.dvi
dvips -t a4 -o $@ sk-dired-ref.dvi
## PostScript files.
sk_refcard_deps = sk-refcard.tex emacsver.tex pdflayout.sty
sk-refcard.pdf: $(sk_refcard_deps)
input=sk-refcard.tex; $(make_cs)
sk-refcard.dvi: $(sk_refcard_deps)
$(ENVADD) csplain sk-refcard.tex
sk-refcard.ps: sk-refcard.dvi
dvips -t a4 -o $@ sk-refcard.dvi
## Note that some of the tex files (refcard, de-refcard, fr-refcard,
## pt-br-refcard) have settings for letter or a4 paper. Following are
## the default paper sizes (letter for English, A4 for translations).
## FIXME orgcard.ps does not fit on letter (see orgcard.tex).
sk_survival_deps = sk-survival.tex emacsver.tex pdflayout.sty
sk-survival.pdf: $(sk_survival_deps)
input=sk-survival.tex; $(make_cs)
sk-survival.dvi: $(sk_survival_deps)
$(ENVADD) csplain sk-survival.tex
sk-survival.ps: sk-survival.dvi
dvips -t a4 -o $@ sk-survival.dvi
## A4, landscape.
de-refcard.ps fr-refcard.ps pt-br-refcard.ps orgcard.ps: %.ps: %.dvi
dvips -t a4 -t landscape $< -o $@
survival_deps = survival.tex emacsver.tex pdflayout.sty
survival.pdf: $(survival_deps)
$(ENVADD) pdftex survival.tex
survival.dvi: $(survival_deps)
$(ENVADD) tex survival.tex
## A4, portrait.
cs-dired-ref.ps cs-refcard.ps cs-survival.ps fr-dired-ref.ps \
pl-refcard.ps ru-refcard.ps \
sk-dired-ref.ps sk-refcard.ps sk-survival.ps: %.ps: %.dvi
dvips -t a4 $< -o $@
vipcard_deps = vipcard.tex emacsver.tex pdflayout.sty
vipcard.pdf: $(vipcard_deps)
$(ENVADD) pdftex vipcard.tex
vipcard.dvi: $(vipcard_deps)
$(ENVADD) tex vipcard.tex
## letter, landscape.
calccard.ps refcard.ps: %.ps: %.dvi
dvips -t letter -t landscape $< -o $@
## letter, portrait.
dired-ref.ps gnus-booklet.ps gnus-refcard.ps survival.ps vipcard.ps \
viperCard.ps: %.ps: %.dvi
dvips -t letter $< -o $@
vipercard_deps = viperCard.tex emacsver.tex pdflayout.sty
viperCard.pdf: $(vipercard_deps)
$(ENVADD) pdftex viperCard.tex
viperCard.dvi: $(vipercard_deps)
$(ENVADD) tex viperCard.tex
.PHONY: clean
@ -142,4 +339,19 @@ viperCard.ps: %.ps: %.dvi
clean:
-rm -f *.dvi *.log *.aux
distclean: clean
## This should really by maintainer-clean, but the handling of the
## refcards is funny. So abuse extraclean for this.
extraclean: clean
-rm -f $(PDF_TARGETS) $(PS_TARGETS)
## For the Emacs website.
dist:
rm -rf emacs-refcards
mkdir emacs-refcards
cp Makefile README *.tex gnus-logo.* pdflayout.sty emacs-refcards/
tar -cf emacs-refcards.tar emacs-refcards
rm -rf emacs-refcards
### Makefile ends here

36
etc/refcards/README
View File

@ -1,5 +1,11 @@
Copyright (C) 2013 Free Software Foundation, Inc.
See the end of the file for license conditions.
REFERENCE CARDS FOR GNU EMACS
To generate these refcards, you need to install the TeX document
production system. For example, http://www.tug.org/texlive/ .
production system. For example, <http://www.tug.org/texlive/>.
All modern GNU/Linux distributions provide TeX packages, so the
easiest way is just to install those. Your distribution may have
@ -7,7 +13,18 @@ split some of the files needed to process non-English output into
separate, optional packages such as: texlive-lang-cyrillic,
texlive-lang-czechslovak, texlive-lang-german, and texlive-lang-polish.
Type `make all' (or `make pdf') to generate PDF versions of all the cards.
For PostScript format, use `make ps'.
To only generate the cards for a specific language, use e.g.
`make french' or `make french-ps'. As mentioned above, you may need
to install extra TeX packages for some languages.
PDF and PS copies of these cards are also available at
<http://www.gnu.org/software/emacs/refcards>. The FSF online
store <http://shop.fsf.org/> sometimes has printed copies for sale.
COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
The file gnus-logo.eps contains copyright and license information, but
@ -17,3 +34,20 @@ File: gnus-logo.eps, gnus-logo.pdf
Author: Luis Fernandes <elf@ee.ryerson.ca>
Copyright (C) 2001-2013 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.

BIN
etc/refcards/calccard.pdf
View File

Binary file not shown.

BIN
etc/refcards/cs-dired-ref.pdf
View File

Binary file not shown.

BIN
etc/refcards/cs-refcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/de-refcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/dired-ref.pdf
View File

Binary file not shown.

BIN
etc/refcards/fr-dired-ref.pdf
View File

Binary file not shown.

BIN
etc/refcards/fr-refcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/gnus-booklet.pdf
View File

Binary file not shown.

BIN
etc/refcards/gnus-refcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/orgcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/pl-refcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/pt-br-refcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/refcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/ru-refcard.pdf
View File

Binary file not shown.

BIN
etc/refcards/sk-dired-ref.pdf
View File

Binary file not shown.

BIN
etc/refcards/sk-refcard.pdf
View File

Binary file not shown.

BIN
etc/spook.lines
View File

Binary file not shown.

2
etc/tutorials/TUTORIAL.es
View File

@ -974,7 +974,7 @@ diferentes:
>> Teclee C-x 4 C-f seguido del nombre de uno de sus archivos.
Finalice con <Return>. Vea que el archivo especificado aparece en
la ventana inferior. El cursor vá allá también.
la ventana inferior. El cursor va allá también.
>> Teclee C-x o para regresar a la ventana superior, y C-x 1 para
borrar la ventana inferior.

3
info/dir
View File

@ -36,7 +36,7 @@ Emacs editing modes
Java, Pike, AWK, and CORBA IDL code.
* IDLWAVE: (idlwave). Major mode and shell for IDL files.
* nXML Mode: (nxml-mode). XML editing mode with RELAX NG support.
* Org Mode: (org). Outline-based notes management and organizer
* Org Mode: (org). Outline-based notes management and organizer.
Emacs network features
* EUDC: (eudc). Emacs client for directory servers (LDAP, PH).
@ -86,6 +86,7 @@ Emacs misc features
* Wisent: (wisent). Semantic Wisent parser development.
* SES: (ses). Simple Emacs Spreadsheet.
* Speedbar: (speedbar). File/Tag summarizing utility.
* Todo Mode: (todo-mode). Make and maintain todo lists.
* VIP: (vip). An older VI-emulation for Emacs.
* VIPER: (viper). A VI-emulation mode for Emacs.
* WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man".

5
leim/ChangeLog
View File

@ -1,3 +1,8 @@
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-06-21 Juanma Barranquero <lekktu@gmail.com>
* quail/croatian.el ("croatian-prefix"):

5
leim/Makefile.in
View File

@ -21,10 +21,7 @@
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
# Avoid trouble on systems where the `SHELL' variable might be
# inherited from the environment.
SHELL = /bin/sh
SHELL = @SHELL@
# Here are the things that we expect ../configure to edit.
srcdir=@srcdir@

48
lib-src/ChangeLog
View File

@ -1,3 +1,51 @@
2013-08-28 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
for portability to hosts where /bin/sh has problems.
2013-08-10 Eli Zaretskii <eliz@gnu.org>
* update-game-score.exe.manifest: New file.
* Makefile.in (UPDATE_MANIFEST): New variable.
(SCRIPTS): Add $(UPDATE_MANIFEST).
2013-08-05 Stefan Monnier <monnier@iro.umontreal.ca>
* makefile.w32-in (lisp2): Add nadvice.elc.
2013-08-05 Eli Zaretskii <eliz@gnu.org>
* update-game-score.c (read_score): Try reading a character before
probing the stream for EOF. Initialize score->score to zero,
before reading and accumulating the score.
(read_scores): Fix logic that determines which value to return.
Close the input stream when finished reading the scores (avoids
failures in overwriting the file with a new one on MS-Windows,
since a file that is open cannot be deleted).
* ntlib.h (rename): Don't undefine.
* ntlib.c (sys_rename): New function, needed for
update-game-score.
2013-08-04 Eli Zaretskii <eliz@gnu.org>
* ntlib.h: Include fcntl.h.
(mkostemp): Declare prototype.
(mktemp): Don't redefine.
* ntlib.c (mkostemp): New function. (Bug#15015)
2013-08-04 Paul Eggert <eggert@cs.ucla.edu>
Fix some minor races in hosts lacking mkostemp (Bug#15015).
* movemail.c (main):
* update-game-score.c (write_scores):
Use mkostemp (which now works on all platforms, due to changes
in the portability layer) rather than mktemp (which has a race)
or mkstemp (which we no longer bother with).
2013-07-10 Paul Eggert <eggert@cs.ucla.edu>
Port to C89.

8
lib-src/Makefile.in
View File

@ -18,10 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
# Avoid trouble on systems where the `SHELL' variable might be
# inherited from the environment.
SHELL = /bin/sh
SHELL = @SHELL@
# Following ../lisp/Makefile.in.
EMACS = ../src/emacs
@ -40,6 +37,7 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
PROFILING_CFLAGS = @PROFILING_CFLAGS@
WARN_CFLAGS = @WARN_CFLAGS@
WERROR_CFLAGS = @WERROR_CFLAGS@
UPDATE_MANIFEST = @UPDATE_MANIFEST@
# Program name transformation.
TRANSFORM = @program_transform_name@
@ -132,7 +130,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
# Like UTILITIES, but they're not system-dependent, and should not be
# deleted by the distclean target.
SCRIPTS= rcs2log
SCRIPTS= rcs2log $(UPDATE_MANIFEST)
# All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}

1
lib-src/makefile.w32-in
View File

@ -251,6 +251,7 @@ lisp2 = \
$(lispsource)register.elc \
$(lispsource)replace.elc \
$(lispsource)simple.elc \
$(lispsource)emacs-lisp/nadvice.elc \
$(lispsource)minibuffer.elc \
$(lispsource)startup.elc \
$(lispsource)subr.elc \

17
lib-src/movemail.c
View File

@ -304,24 +304,13 @@ main (int argc, char **argv)
memcpy (tempname, inname, inname_dirlen);
strcpy (tempname + inname_dirlen, "EXXXXXX");
#ifdef HAVE_MKSTEMP
desc = mkstemp (tempname);
#else
mktemp (tempname);
if (!*tempname)
desc = -1;
else
{
unlink (tempname);
desc = open (tempname, O_WRONLY | O_CREAT | O_EXCL, 0600);
}
#endif
desc = mkostemp (tempname, 0);
if (desc < 0)
{
int mkstemp_errno = errno;
int mkostemp_errno = errno;
error ("error while creating what would become the lock file",
0, 0);
errno = mkstemp_errno;
errno = mkostemp_errno;
pfatal_with_name (tempname);
}
close (desc);

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