From: Glenn Morris Date: Sun, 9 Nov 2014 02:06:29 +0000 (-0800) Subject: Merge from emacs-24; up to 117691 X-Git-Tag: emacs-25.0.90~2635^2~525 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da95e2399e068eb87ea90a4617d80980d0601eb4;p=emacs.git Merge from emacs-24; up to 117691 --- da95e2399e068eb87ea90a4617d80980d0601eb4 diff --cc admin/ChangeLog index 9470c933264,7a86773c04f..303da8c020a --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,11 -1,10 +1,17 @@@ + 2014-11-09 Glenn Morris + + * admin.el (make-manuals-dist-output-variables) + (make-manuals-dist--1, make-manuals-dist): New. + Replaces doc/*/Makefile.in `dist' rules. + -2014-10-31 Eli Zaretskii +2014-11-04 Paul Eggert + + Spelling fixes; tweak explanation of commit messages. + * notes/repo: Avoid "DVCS" acronym without first explaining it. + Mention using the first line of a ChangeLog as the topic line, + and that commit messages should use UTF-8. + +2014-11-01 Eli Zaretskii * notes/repo (Notes): Reword the stylistic guidance for commit log messages so that they are in line with Emacs development practices diff --cc doc/emacs/ChangeLog index 9dc3af97788,8eb2083598c..8e85c890285 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,4 -1,10 +1,10 @@@ + 2014-11-09 Glenn Morris + + * Makefile.in (version): Remove variable. + (clean): No longer delete dist tarfile. + (dist): Remove rule; replace with code in admin.el. + -2014-11-01 Glenn Morris +2014-11-03 Glenn Morris * programs.texi (Misc for Programs): Fix typo. diff --cc doc/emacs/Makefile.in index 352768517fa,5a915561744..67c324e1f9d --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@@ -198,51 -195,10 +194,13 @@@ distclean: clea ## In the standalone tarfile, the clean rule runs this. infoclean: - -cd $(buildinfodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9] + rm -f \ + $(buildinfodir)/emacs.info \ + $(buildinfodir)/emacs.info-[1-9] \ + $(buildinfodir)/emacs.info-[1-9][0-9] -maintainer-clean: distclean infoclean +bootstrap-clean maintainer-clean: distclean infoclean - .PHONY: dist - - ## Make a standalone tarfile of the Emacs manual sources. - ## The [c] is a dumb way to prevent configure expanding it. - ## TODO this is getting increasingly lengthy; not sure it is worth keeping. - dist: - rm -rf emacs-manual-${version} - mkdir emacs-manual-${version} - cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \ - ${srcdir}/ChangeLog* emacs-manual-${version}/ - sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \ - -e 's/^\(buildinfodir *=\).*/\1 ./' \ - -e 's/^\(clean:.*\)/\1 infoclean/' \ - -e "s/@ver[s]ion@/${version}/" \ - -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \ - -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \ - -e 's|@SH[E]LL@|/bin/bash|' \ - -e 's|@[p]refix@|/usr/local|' \ - -e 's|@[d]atarootdir@|$${prefix}/share|' \ - -e 's|@[d]atadir@|$${datarootdir}|' \ - -e 's|@[P]ACKAGE_TARNAME@|emacs|' \ - -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \ - -e 's|@[d]vidir@|$${docdir}|' \ - -e 's|@[h]tmldir@|$${docdir}|' \ - -e 's|@[p]dfdir@|$${docdir}|' \ - -e 's|@[p]sdir@|$${docdir}|' \ - -e 's|@[G]ZIP_PROG@|gzip|' \ - -e 's|@IN[S]TALL@|install -c|' \ - -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \ - -e '/@[c]onfigure_input@/d' \ - ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile - @if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \ - echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ - fi - 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 diff --cc doc/lispintro/ChangeLog index 37f8ac9da0e,7dfae71f43d..572875c151a --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@@ -1,6 -1,16 +1,12 @@@ + 2014-11-09 Glenn Morris + + * Makefile.in (version): Remove variable. + (clean): No longer delete dist tarfile. + (dist): Remove rule; replace with code in admin.el. + 2014-10-20 Glenn Morris - * emacs-lisp-intro.texi (Autoload): Update loaddefs.el details. - -2014-10-20 Glenn Morris - - * Version 24.4 released. + * Merge in all changes up to 24.4 release. 2014-10-13 Glenn Morris diff --cc doc/lispintro/Makefile.in index 49d3fe3c957,246de23e26b..4bcbb53ad9a --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@@ -114,49 -112,10 +110,12 @@@ distclean: clea rm -f Makefile infoclean: - -cd $(buildinfodir) && rm -f eintr$(INFO_EXT) eintr$(INFO_EXT)-[1-9] + rm -f \ + $(buildinfodir)/eintr.info \ + $(buildinfodir)/eintr.info-[1-9] -maintainer-clean: distclean infoclean +bootstrap-clean maintainer-clean: distclean infoclean - .PHONY: dist - - dist: - rm -rf emacs-lispintro-${version} - mkdir emacs-lispintro-${version} - cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \ - ${texinfodir}/texinfo.tex ${emacsdir}/emacsver.texi \ - ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/ - sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \ - -e 's/^\(emacsdir *=\).*/\1 ./' \ - -e 's/^\(buildinfodir *=\).*/\1 ./' \ - -e 's/^\(clean:.*\)/\1 infoclean/' \ - -e "s/@ver[s]ion@/${version}/" \ - -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \ - -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \ - -e 's|@SH[E]LL@|/bin/bash|' \ - -e 's|@[p]refix@|/usr/local|' \ - -e 's|@[d]atarootdir@|$${prefix}/share|' \ - -e 's|@[d]atadir@|$${datarootdir}|' \ - -e 's|@[P]ACKAGE_TARNAME@|emacs|' \ - -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \ - -e 's|@[d]vidir@|$${docdir}|' \ - -e 's|@[h]tmldir@|$${docdir}|' \ - -e 's|@[p]dfdir@|$${docdir}|' \ - -e 's|@[p]sdir@|$${docdir}|' \ - -e 's|@[G]ZIP_PROG@|gzip|' \ - -e 's|@IN[S]TALL@|install -c|' \ - -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \ - -e '/@[c]onfigure_input@/d' \ - ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile - @if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \ - echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ - fi - 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 diff --cc doc/lispref/ChangeLog index 9a7a6c8c8a6,9123194d7eb..83a842372a0 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,33 -1,12 +1,39 @@@ + 2014-11-09 Glenn Morris + + * Makefile.in (version): Remove variable. + (clean): No longer delete dist tarfile. + (dist): Remove rule; replace with code in admin.el. + +2014-11-07 Martin Rudalics + + * frames.texi (Size and Position): Rewrite description of + `frame-inhibit-implied-resize'. + +2014-10-22 Martin Rudalics + + * frames.texi (Size Parameters): Replace "frame contents" by + "frame's text area". Add reference to Size and Position + section. + (Size and Position): Major rewrite. Add explanations for + frame's default font, text and display areas. Add descriptions + for `set-frame-font', `frame-text-height', `frame-text-width' + and `frame-inhibit-implied-resize'. + 2014-10-20 Glenn Morris - * Version 24.4 released. + * Merge in all changes up to 24.4 release. + +2014-10-20 Tom Tromey + + * objects.texi (Type Predicates): Don't mention display-table-p. + +2014-10-15 Eli Zaretskii + + * nonascii.texi (Character Properties): Document the new + properties 'bracket-type' and 'paired-bracket'. + + * display.texi (Bidirectional Display): Update the version of the + UBA to which we are conforming. 2014-10-13 Glenn Morris diff --cc doc/lispref/Makefile.in index 22955fb9bae,c120d123c45..11cc0ecc10e --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@@ -170,50 -168,10 +167,13 @@@ distclean: clea rm -f Makefile infoclean: - -cd $(buildinfodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9] + rm -f \ + $(buildinfodir)/elisp.info \ + $(buildinfodir)/elisp.info-[1-9] \ + $(buildinfodir)/elisp.info-[1-9][0-9] -maintainer-clean: distclean infoclean +bootstrap-clean maintainer-clean: distclean infoclean - .PHONY: dist - - ## Note this excludes the two-volume stuff. - dist: - rm -rf emacs-lispref-${version} - mkdir emacs-lispref-${version} - cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \ - $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \ - ${srcdir}/README emacs-lispref-${version}/ - sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \ - -e 's/^\(emacsdir *=\).*/\1 ./' \ - -e 's/^\(buildinfodir *=\).*/\1 ./' \ - -e 's/^\(clean:.*\)/\1 infoclean/' \ - -e "s/@ver[s]ion@/${version}/" \ - -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \ - -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \ - -e 's|@SH[E]LL@|/bin/bash|' \ - -e 's|@[p]refix@|/usr/local|' \ - -e 's|@[d]atarootdir@|$${prefix}/share|' \ - -e 's|@[d]atadir@|$${datarootdir}|' \ - -e 's|@[P]ACKAGE_TARNAME@|emacs|' \ - -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \ - -e 's|@[d]vidir@|$${docdir}|' \ - -e 's|@[h]tmldir@|$${docdir}|' \ - -e 's|@[p]dfdir@|$${docdir}|' \ - -e 's|@[p]sdir@|$${docdir}|' \ - -e 's|@[G]ZIP_PROG@|gzip|' \ - -e 's|@IN[S]TALL@|install -c|' \ - -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \ - -e '/@[c]onfigure_input@/d' \ - ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile - @if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \ - echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ - fi - 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 diff --cc doc/misc/ChangeLog index 58d1a1080df,0a02b733890..8aef62bc6a6 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,15 -1,25 +1,21 @@@ + 2014-11-09 Glenn Morris + + * Makefile.in (version): Remove variable. + (clean): No longer delete dist tarfile. + (dist): Remove rule; replace with code in admin.el. + -2014-11-08 Michael Albinus +2014-11-08 Glenn Morris - Backport Tramp changes from trunk. + * Makefile.in (${buildinfodir}/ccmode.info) + (${buildinfodir}/efaq%.info): Ensure output directory exists. - * tramp.texi (Inline methods): Remove restriction on "telnet". - Recommend sharing ssh connections for "plink". - (External methods): Remove "sftp". Merge "pscp" and "psftp" - descriptions. Recommend sharing ssh connections. Add "nc" method. - (GVFS based methods): Add "sftp". - (Customizing Completion, External packages, Issues): Use @dots{}. - (Remote shell setup): Explain, how to change command line - arguments of remote "nc" listener. +2014-11-07 Tassilo Horn - * trampver.texi: Update release number. + * gnus.texi (HTML): Update section so that it mentions shr and w3m. + Also link the full EWW manual that explains more on shr, too. -2014-11-07 Tassilo Horn + * gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to + increase contrast when displaying HTML mail with shr. * eww.texi (Advanced): Document increasing contrast with shr-color-visible-distance-min and diff --cc doc/misc/Makefile.in index 7a2287af710,6eeec4acadb..40a072a7978 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@@ -19,18 -19,13 +19,16 @@@ SHELL = @SHELL@ -# Where to find the source code. $(srcdir) will be the man-aux -# subdirectory of the source tree. This is -# set by the configure script's `--srcdir' option. +# Where to find the source code. $(srcdir) will be the doc/misc subdirectory +# of the source tree. This is set by configure's `--srcdir' option. srcdir=@srcdir@ - version=@version@ - ## Where the output files go. +## Note that all the Info targets build the Info files in srcdir. +## There is no provision for Info files to exist in the build directory. +## In a tarfile of Emacs, the Info files should be up to date. buildinfodir = $(srcdir)/../../info + ## Directory with emacsver.texi. emacsdir = $(srcdir)/../emacs @@@ -218,62 -856,24 +216,26 @@@ mostlyclean rm -f *.aux *.log *.toc *.c[mp] *.c[mp]s *.fn *.fns \ *.ky *.kys *.op *.ops *.p[gj] *.p[gj]s *.sc *.scs *.ss \ *.t[gp] *.t[gp]s *.vr *.vrs - rm -f gnustmp.* + rm -f gnustmp* clean: mostlyclean - rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS) - rm -f efaq-w32.dvi efaq-w32.html efaq-w32.pdf efaq-w32.ps + rm -f *.dvi *.html *.pdf *.ps - rm -f emacs-misc-${version}.tar* distclean: clean rm -f Makefile ## buildinfodir is relative to srcdir. infoclean: - cd $(buildinfodir); for file in $(INFO_TARGETS); do \ - file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \ - rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \ + for file in $(INFO_TARGETS); do \ + file=`echo $${file} | sed 's/\.info$$//'`.info; \ + rm -f \ + $(buildinfodir)/$${file} \ + $(buildinfodir)/$${file}-[1-9] \ + $(buildinfodir)/$${file}-[1-9][0-9]; \ done -maintainer-clean: distclean infoclean +bootstrap-clean maintainer-clean: distclean infoclean - dist: - rm -rf emacs-misc-${version} - mkdir emacs-misc-${version} - cp ${srcdir}/*.texi ${srcdir}/texinfo.tex \ - $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \ - emacs-misc-${version}/ - sed -e 's/@sr[c]dir@/./' \ - -e 's/^\(emacsdir *=\).*/\1 ./' \ - -e 's/^\(buildinfodir *=\).*/\1 ./' \ - -e 's/^\(clean:.*\)/\1 infoclean/' \ - -e "s/@ver[s]ion@/${version}/" \ - -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \ - -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \ - -e 's|@SH[E]LL@|/bin/bash|' \ - -e 's|@[p]refix@|/usr/local|' \ - -e 's|@[d]atarootdir@|$${prefix}/share|' \ - -e 's|@[d]atadir@|$${datarootdir}|' \ - -e 's|@[P]ACKAGE_TARNAME@|emacs|' \ - -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \ - -e 's|@[d]vidir@|$${docdir}|' \ - -e 's|@[h]tmldir@|$${docdir}|' \ - -e 's|@[p]dfdir@|$${docdir}|' \ - -e 's|@[p]sdir@|$${docdir}|' \ - -e 's|@[G]ZIP_PROG@|gzip|' \ - -e 's|@IN[S]TALL@|install -c|' \ - -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \ - -e '/@[c]onfigure_input@/d' \ - ${srcdir}/Makefile.in > emacs-misc-${version}/Makefile - @if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \ - echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ - fi - tar -cf emacs-misc-${version}.tar emacs-misc-${version} - rm -rf emacs-misc-${version} - - .PHONY: install-dvi install-html install-pdf install-ps install-doc install-dvi: dvi