From: Glenn Morris Date: Sat, 22 Dec 2012 19:09:52 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-02T06:22:32Z!cyd@gnu.org X-Git-Tag: emacs-24.3.90~173^2~7^2~525 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00afe3a454119390e78eaaa319a7d05e5e7723ae;p=emacs.git Merge from emacs-24; up to 2012-12-02T06:22:32Z!cyd@gnu.org --- 00afe3a454119390e78eaaa319a7d05e5e7723ae diff --cc doc/lispintro/ChangeLog index 8e7278ee2ee,b668e965ed8..8e6643d1e4d --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@@ -1,19 -1,9 +1,26 @@@ + 2012-12-22 Glenn Morris + + * Makefile.in (srcs): New variable, adding doclicense.texi. + (${buildinfodir}/eintr$(INFO_EXT), emacs-lisp-intro.dvi) + (emacs-lisp-intro.pdf, emacs-lisp-intro.html): + Use $srcs for dependencies. ++ +2012-12-14 Paul Eggert + + Fix permissions bugs with setgid directories etc. (Bug#13125) + * emacs-lisp-intro.texi (Files List): + directory-files-and-attributes now outputs t for attribute that's + now a placeholder. + +2012-12-06 Paul Eggert + + * doclicense.texi: Update to latest version from FSF. + These are just minor editorial changes. + +2012-11-24 Paul Eggert + + * doclicense.texi: Update to latest version from FSF. + These are just minor editorial changes. 2012-10-24 Paul Eggert diff --cc doc/lispref/ChangeLog index d3182e9bf37,09c70226d5d..b5ad25377a0 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,9 -1,8 +1,14 @@@ + 2012-12-22 Martin Rudalics + + * windows.texi (Selecting Windows): Reword description of + select-window (Bug#13248). + +2012-12-22 Eli Zaretskii + + * files.texi (File Attributes, Changing Files): Remove the details + about the text returned by file-acl. Instead, just document that + it is an opaque string meant to be used by set-file-acl. + 2012-12-21 Chong Yidong * modes.texi (Auto Major Mode): Fix typo (Bug#13230). diff --cc doc/misc/Makefile.in index 6b8c74e93bb,0fa52afe007..95d390fd3ba --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@@ -684,12 -688,12 +687,12 @@@ wisent.pdf: ${srcdir}/wisent.texi ${gfd $(ENVADD) $(TEXI2PDF) ${srcdir}/wisent.texi woman : $(buildinfodir)/woman$(INFO_EXT) - $(buildinfodir)/woman$(INFO_EXT): ${srcdir}/woman.texi $(emacsdir)/emacsver.texi -$(buildinfodir)/woman$(INFO_EXT): ${srcdir}/woman.texi ${gfdl} ++$(buildinfodir)/woman$(INFO_EXT): ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl} $(mkinfodir) $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/woman.texi - woman.dvi: ${srcdir}/woman.texi $(emacsdir)/emacsver.texi -woman.dvi: ${srcdir}/woman.texi ${gfdl} ++woman.dvi: ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl} $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi - woman.pdf: ${srcdir}/woman.texi $(emacsdir)/emacsver.texi -woman.pdf: ${srcdir}/woman.texi ${gfdl} ++woman.pdf: ${srcdir}/woman.texi $(emacsdir)/emacsver.texi ${gfdl} $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi diff --cc doc/misc/mh-e.texi index 7f7c143c36b,7e4cc2fa6f6..5b62f9ba6a5 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@@ -211,10 -212,10 +212,10 @@@ more niceties about GNU Emacs and MH@. them. The MH-E package is distributed with Emacs@footnote{Version -@value{VERSION} of MH-E appeared in Emacs 24.1. It is supported in GNU +@value{VERSION} of MH-E appeared in Emacs 24.4. It is supported in GNU Emacs 23 and higher, as well as XEmacs 21.4.22 and 21.5.31. MH-E is known not to work with GNU Emacs versions 20 and below, and XEmacs - version 21.5.9 - 21.5.16. It is compatible with MH versions 6.8.4 and + version 21.5.9--21.5.16. It is compatible with MH versions 6.8.4 and higher, all versions of nmh, and GNU mailutils 1.0 and higher}, so you shouldn't have to do anything special to use it. Gnus is also required; version 5.10 or higher is recommended. This manual covers diff --cc doc/misc/ses.texi index 87d763b6894,1d020c876eb..1828ebd17be --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@@ -9,9 -9,9 +9,9 @@@ @c %**end of header @copying -This file documents SES: the Simple Emacs Spreadsheet. +This file documents @acronym{SES}: the Simple Emacs Spreadsheet. - Copyright @copyright{} 2002-2012 Free Software Foundation, Inc. + Copyright @copyright{} 2002--2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --cc src/ChangeLog index 19cb4935c7b,e8d5449a99e..f8f0b82d3da --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,8 -1,7 +1,12 @@@ + 2012-12-22 Martin Rudalics + + * window.c (Fselect_window): Reword doc-string (Bug#13248). + +2012-12-22 Eli Zaretskii + + * w32term.c (w32fullscreen_hook): New function. + (w32_create_terminal): Plug it into the terminal's fullscreen_hook. + 2012-12-21 Eli Zaretskii * fileio.c (Finsert_file_contents): Doc fix.