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

Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org

Browse source
This commit is contained in:
Glenn Morris 2012-12-21 11:32:43 -08:00
commit a4b0cca119
75 changed files with 344 additions and 304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-12-21 Akinori MUSHA <knu@iDaemons.org> (tiny change)
* Makefile.in (install-arch-dep): Ignore chmod errors. (Bug#13233)
2012-12-16 Romain Francoise <romain@orebokech.com>
* configure.ac (acl): New option.

2
Makefile.in
View file

@ -445,7 +445,7 @@ install-arch-dep: src install-arch-indep install-doc
INSTALL_STRIP=${INSTALL_STRIP}
if test "${ns_self_contained}" = "no"; then \
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) ; \
chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
if test "x${NO_BIN_LINK}" = x; then \
rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \

10
doc/emacs/ChangeLog
View file

@ -1,3 +1,13 @@
2012-12-21 Glenn Morris <rgm@gnu.org>
* emacs-xtra.texi (copying): The FSF does not sell copies of this.
Simply include doclicense.
2012-12-21 Chong Yidong <cyd@gnu.org>
* frames.texi (Mouse Commands): Fix description of the effect of
mouse dragging (Bug#13049).
2012-12-15 Juri Linkov <juri@jurta.org>
* misc.texi (Recursive Edit): Add a link to "Query Replace".

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

@ -17,19 +17,12 @@ Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU
Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
License'' in the Emacs manual.
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -71,6 +64,7 @@ license to the document, as described in section 6 of the license.
* Fortran:: Fortran mode and its special features.
* MS-DOS:: Using Emacs on MS-DOS.
@end iftex
* GNU Free Documentation License:: The license for this documentation.
* Index::
@end menu
@ -131,6 +125,10 @@ the Emacs manual.
@lowersections
@end iftex
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Index
@unnumbered Index

4
doc/emacs/frames.texi
View file

@ -77,8 +77,8 @@ for doing so on MS-DOS).
Move point to where you click (@code{mouse-set-point}).
@item Drag-Mouse-1
Activate the region around the text selected by dragging, and copy it
to the kill ring (@code{mouse-set-region}).
Activate the region around the text selected by dragging, and put the
text in the primary selection (@code{mouse-set-region}).
@item Mouse-2
Move point to where you click, and insert the contents of the primary

9
doc/lispref/ChangeLog
View file

@ -1,3 +1,12 @@
2012-12-21 Chong Yidong <cyd@gnu.org>
* modes.texi (Auto Major Mode): Fix typo (Bug#13230).
* customize.texi (Simple Types): Document key-sequence type
(Bug#13048).
* strings.texi (Text Comparison): Doc fix for compare-strings.
2012-12-19 Michael Albinus <michael.albinus@gmx.de>
* files.texi (Magic File Names): Add `file-acl',

5
doc/lispref/customize.texi
View file

@ -620,6 +620,11 @@ you can specify that the value must be @code{nil} or @code{t}, but also
specify the text to describe each value in a way that fits the specific
meaning of the alternative.
@item key-sequence
The value is a key sequence. The customization buffer shows the key
sequence using the same syntax as the @kbd{kbd} function. @xref{Key
Sequences}.
@item coding-system
The value must be a coding-system name, and you can do completion with
@kbd{M-@key{TAB}}.

2
doc/lispref/modes.texi
View file

@ -612,7 +612,7 @@ variables section specifying a mode for that particular file. This
should not be applied to the containing tar file. Similarly, a tiff
image file might just happen to contain a first line that seems to
match the @w{@samp{-*-}} pattern. For these reasons, both these file
extensions are members of the list @var{inhibit-local-variables-regexps}.
extensions are members of the list @code{inhibit-local-variables-regexps}.
Add patterns to this list to prevent Emacs searching them for local
variables of any kind (not just mode specifiers).

32
doc/lispref/strings.texi
View file

@ -517,25 +517,29 @@ comparison ignores case differences.
@end defun
@defun compare-strings string1 start1 end1 string2 start2 end2 &optional ignore-case
This function compares the specified part of @var{string1} with the
This function compares a specified part of @var{string1} with a
specified part of @var{string2}. The specified part of @var{string1}
runs from index @var{start1} up to index @var{end1} (@code{nil} means
the end of the string). The specified part of @var{string2} runs from
index @var{start2} up to index @var{end2} (@code{nil} means the end of
the string).
runs from index @var{start1} (inclusive) up to index @var{end1}
(exclusive); @code{nil} for @var{start1} means the start of the
string, while @code{nil} for @var{end1} means the length of the
string. Likewise, the specified part of @var{string2} runs from index
@var{start2} up to index @var{end2}.
The strings are both converted to multibyte for the comparison
(@pxref{Text Representations}) so that a unibyte string and its
conversion to multibyte are always regarded as equal. If
@var{ignore-case} is non-@code{nil}, then case is ignored, so that
upper case letters can be equal to lower case letters.
The strings are compared by the numeric values of their characters.
For instance, @var{str1} is considered ``smaller than'' @var{str2} if
its first differing character has a smaller numeric value. If
@var{ignore-case} is non-@code{nil}, characters are converted to
lower-case before comparing them. Unibyte strings are converted to
multibyte for comparison (@pxref{Text Representations}), so that a
unibyte string and its conversion to multibyte are always regarded as
equal.
If the specified portions of the two strings match, the value is
@code{t}. Otherwise, the value is an integer which indicates how many
leading characters agree, and which string is less. Its absolute value
is one plus the number of characters that agree at the beginning of the
two strings. The sign is negative if @var{string1} (or its specified
portion) is less.
leading characters agree, and which string is less. Its absolute
value is one plus the number of characters that agree at the beginning
of the two strings. The sign is negative if @var{string1} (or its
specified portion) is less.
@end defun
@defun assoc-string key alist &optional case-fold

35
doc/misc/ChangeLog
View file

@ -1,3 +1,34 @@
2012-12-21 Glenn Morris <rgm@gnu.org>
* auth.texi, emacs-gnutls.texi, epa.texi, ert.texi:
* gnus-coding.texi, info.texi, nxml-mode.texi, sasl.texi:
May as well just include doclicense.texi in everything.
* ede.texi, eieio.texi, mairix-el.texi: Include a copy of GFDL,
which @copying says is included.
* ada-mode.texi, auth.texi, autotype.texi, bovine.texi, calc.texi:
* cc-mode.texi, cl.texi, dbus.texi, dired-x.texi, ebrowse.texi:
* ede.texi, ediff.texi, edt.texi, eieio.texi, emacs-gnutls.texi:
* emacs-mime.texi, epa.texi, erc.texi, ert.texi, eshell.texi:
* eudc.texi, flymake.texi, forms.texi, gnus-coding.texi, gnus.texi:
* idlwave.texi, info.texi, mairix-el.texi, message.texi, mh-e.texi:
* newsticker.texi, nxml-mode.texi, pcl-cvs.texi, pgg.texi:
* rcirc.texi, reftex.texi, remember.texi, sasl.texi, sc.texi:
* semantic.texi, ses.texi, sieve.texi, smtpmail.texi, speedbar.texi:
* srecode.texi, tramp.texi, url.texi, vip.texi, viper.texi:
* widget.texi, wisent.texi, woman.texi: Do not mention buying
copies from the FSF, which does not publish these manuals.
* erc.texi: No need to include gpl in this small manual.
* org.texi (copying): Include a copy of the GFDL.
(GNU Free Documentation License): New section.
2012-12-21 Bastien Guerry <bzg@gnu.org>
* org.texi: Fix typos.
2012-12-16 Paul Eggert <eggert@cs.ucla.edu>
* calc.texi (ISO 8601): Rename from ISO-8601,
@ -440,7 +471,7 @@
* org.texi (Moving subtrees): Document the ability to archive to a
datetree.
2012-09-30 Bastien Guerry <bzg@altern.org>
2012-09-30 Bastien Guerry <bzg@gnu.org>
* org.texi (Installation, Feedback, Batch execution): Use
(add-to-list 'load-path ... t) for the contrib dir.
@ -1046,7 +1077,7 @@
* org.texi: Edit :noweb no header argument for correctness.
2012-04-01 Bastien Guerry <bzg@altern.org>
2012-04-01 Bastien Guerry <bzg@gnu.org>
* org.texi (Customization): Update the approximate number of Org
variables.

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

@ -3,7 +3,7 @@
@settitle Ada Mode
@copying
Copyright @copyright{} 1999-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1999-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -14,8 +14,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

22
doc/misc/auth.texi
View file

@ -18,17 +18,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''
in the Emacs manual.
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -68,6 +61,7 @@ It is a way for multiple applications to share a single configuration
* Secret Service API::
* Help for developers::
* GnuPG and EasyPG Assistant Configuration::
* GNU Free Documentation License:: The license for this documentation.
* Index::
* Function Index::
* Variable Index::
@ -522,16 +516,20 @@ 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}.
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Index
@chapter Index
@unnumbered Index
@printindex cp
@node Function Index
@chapter Function Index
@unnumbered Function Index
@printindex fn
@node Variable Index
@chapter Variable Index
@unnumbered Variable Index
@printindex vr
@bye

6
doc/misc/autotype.texi
View file

@ -10,7 +10,8 @@
@c @cindex autotypist
@copying
Copyright @copyright{} 1994-1995, 1999, 2001-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1994-1995, 1999, 2001-2012
Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -21,8 +22,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/bovine.texi
View file

@ -34,8 +34,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/calc.texi
View file

@ -106,8 +106,7 @@ Texts as in (a) below. A copy of the license is included in the section
entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

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

@ -167,8 +167,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/cl.texi
View file

@ -17,8 +17,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/dbus.texi
View file

@ -20,8 +20,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

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

@ -31,8 +31,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/ebrowse.texi
View file

@ -21,8 +21,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

13
doc/misc/ede.texi
View file

@ -5,7 +5,8 @@
@copying
This file describes EDE, the Emacs Development Environment.
Copyright @copyright{} 1998-2001, 2004-2005, 2008-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1998-2001, 2004-2005, 2008-2012
Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -16,8 +17,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying
@ -88,6 +88,7 @@ learn and adopt GNU ways of doing things.
* Building and Debugging:: Initiating a build or debug session.
* Miscellaneous commands:: Other project related commands.
* Extending EDE:: Programming and extending @ede{}.
* GNU Free Documentation License:: The license for this documentation.
@end menu
@node EDE Project Concepts, EDE Mode, top, top
@ -1092,7 +1093,7 @@ You can add your own locate tool but subclassing from
methods. See the code in @file{ede-locate.el} for GNU Global as a
simple example.
@node Extending EDE, , Miscellaneous commands, top
@node Extending EDE, GNU Free Documentation License, Miscellaneous commands, top
@chapter Extending @ede{}
This chapter is intended for users who want to write new parts or fix
@ -4436,4 +4437,8 @@ For example, C code uses .o on unix, and Emacs Lisp uses .elc.
@end table
@end table
@node GNU Free Documentation License, , Extending EDE, Top
@appendix GNU Free Documentation License
@include doclicense.texi
@bye

3
doc/misc/ediff.texi
View file

@ -36,8 +36,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/edt.texi
View file

@ -17,8 +17,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

8
doc/misc/eieio.texi
View file

@ -22,8 +22,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying
@ -77,6 +76,7 @@ Emacs.
* Naming Conventions:: Name your objects in an Emacs friendly way.
* CLOS compatibility:: What are the differences?
* Wish List:: Things about EIEIO that could be improved.
* GNU Free Documentation License:: The license for this documentation.
* Function Index::
@end menu
@ -1950,6 +1950,10 @@ buffers.
Allow method overloading of method-like functions in Emacs.
@end enumerate
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Function Index
@unnumbered Function Index

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

@ -16,17 +16,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''
in the Emacs manual.
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -61,6 +54,7 @@ Emacs Lisp library.
* Overview:: Overview of the GnuTLS integration.
* Help For Users::
* Help For Developers::
* GNU Free Documentation License:: The license for this documentation.
* Function Index::
* Variable Index::
@end menu
@ -185,12 +179,16 @@ Please see @file{gnutls.el} for the @var{spec} details and for usage,
but do not rely on this function's interface if possible.
@end defun
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Function Index
@chapter Function Index
@unnumbered Function Index
@printindex fn
@node Variable Index
@chapter Variable Index
@unnumbered Variable Index
@printindex vr
@bye

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

@ -22,8 +22,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

16
doc/misc/epa.texi
View file

@ -17,17 +17,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''
in the Emacs manual.
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -68,6 +61,7 @@ called EasyPG Library.
* Commands::
* Caching Passphrases::
* Bug Reports::
* GNU Free Documentation License:: The license for this documentation.
@end menu
@node Overview
@ -493,6 +487,10 @@ Before reporting the bug, you should set @code{epg-debug} in the
of the @samp{ *epg-debug*} buffer. Note that the first letter of the
buffer name is a whitespace.
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@bye
@c End:

11
doc/misc/erc.texi
View file

@ -20,8 +20,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
All Emacs Lisp code contained in this document may be used, distributed,
and modified without restriction.
@ -62,10 +61,6 @@ and modified without restriction.
* Advanced Usage:: Cool ways of using ERC.
* Getting Help and Reporting Bugs::
* History:: The history of ERC.
* Copying:: The GNU General Public License gives you
permission to redistribute ERC on
certain terms; it also explains that
there is no warranty.
* GNU Free Documentation License:: The license for this documentation.
* Concept Index:: Search for terms.
@ -855,10 +850,6 @@ is maintained as part of Emacs.
@end itemize
@node Copying
@appendix GNU GENERAL PUBLIC LICENSE
@include gpl.texi
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi

22
doc/misc/ert.texi
View file

@ -18,17 +18,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''
in the Emacs manual.
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -53,6 +46,7 @@ traditional software development methods.
* How to Debug Tests:: What to do if a test fails.
* Extending ERT:: ERT is extensible in several ways.
* Other Testing Concepts:: Features not in ERT.
* GNU Free Documentation License:: The license for this documentation.
@detailmenu
--- The Detailed Node Listing ---
@ -85,6 +79,10 @@ Other Testing Concepts
* Mocks and Stubs:: Stubbing out code that is irrelevant to the test.
* Fixtures and Test Suites:: How ERT differs from tools for other languages.
Appendix
* GNU Free Documentation License:: The license for this documentation.
@end detailmenu
@end menu
@ -759,7 +757,7 @@ meant to be usable by other code. But there is no mature API yet.
Contributions to ERT are welcome.
@node Other Testing Concepts, , Extending ERT, Top
@node Other Testing Concepts, GNU Free Documentation License , Extending ERT, Top
@chapter Other Testing Concepts
For information on mocks, stubs, fixtures, or test suites, see below.
@ -842,6 +840,10 @@ e.g., to run quick tests during interactive development and slow tests less
often. This can be achieved with the @code{:tag} argument to
@code{ert-deftest} and @code{tag} test selectors.
@node GNU Free Documentation License, , Other Testing Concepts, Top
@appendix GNU Free Documentation License
@include doclicense.texi
@bye
@c LocalWords: ERT JUnit namespace docstring ERT's

3
doc/misc/eshell.texi
View file

@ -19,8 +19,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

5
doc/misc/eudc.texi
View file

@ -12,7 +12,7 @@ EUDC is the Emacs Unified Directory Client, a common interface to
directory servers using various protocols such as LDAP or the CCSO white
pages directory system (PH/QI)
Copyright @copyright{} 1998, 2000-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1998, 2000-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -23,8 +23,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

6
doc/misc/flymake.texi
View file

@ -11,8 +11,7 @@
This manual is for GNU Flymake (version @value{VERSION}, @value{UPDATED}),
which is a universal on-the-fly syntax checker for GNU Emacs.
Copyright @copyright{} 2004-2012
Free Software Foundation, Inc.
Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -23,8 +22,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/forms.texi
View file

@ -29,8 +29,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

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

@ -7,26 +7,19 @@
@syncodeindex pg cp
@copying
Copyright @copyright{} 2004-2005, 2007-2012 Free Software
Copyright @copyright{} 2004-2005, 2007-2012 Free Software
Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU
Manual'', and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
License'' in the Gnus manual.
Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -54,6 +47,7 @@ This manual describes @dots{}
@menu
* Gnus Coding Style:: Gnus Coding Style
* Gnus Maintenance Guide:: Gnus Maintenance Guide
* GNU Free Documentation License:: The license for this documentation.
@end menu
@c @ref{Gnus Reference Guide, ,Gnus Reference Guide, gnus, The Gnus Newsreader}
@ -387,6 +381,10 @@ If the variable is new in No Gnus use @code{:version "23.1" ;; No Gnus}.
The same applies for customizable variables when its default value was
changed.
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@c Local Variables:
@c mode: texinfo
@c coding: iso-8859-1

3
doc/misc/gnus.texi
View file

@ -22,8 +22,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/idlwave.texi
View file

@ -33,8 +33,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

20
doc/misc/info.texi
View file

@ -20,19 +20,12 @@ Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU
Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
License'' in the Emacs manual.
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -84,6 +77,7 @@ Started' chapter.
* Getting Started:: Getting started using an Info reader.
* Advanced:: Advanced Info commands.
* Expert Info:: Info commands for experts.
* GNU Free Documentation License:: The license for this documentation.
* Index:: An index of topics, commands, and variables.
@end menu
@ -1504,6 +1498,10 @@ usually few.
To check an Info file, do @kbd{M-x Info-validate} while looking at any
node of the file with Emacs Info mode.
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Index
@unnumbered Index

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

@ -17,8 +17,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying
@ -61,6 +60,7 @@ database.
* Setting up mairix.el:: Set up mairix.el
* Using mairix.el:: List of interactive functions
* Extending mairix.el:: Support your favorite mail reader!
* GNU Free Documentation License:: The license for this documentation.
@end menu
@node About mairix and mairix.el
@ -346,6 +346,8 @@ Then add the functions to @code{mairix-display-functions} and
And that's it!
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@bye

3
doc/misc/message.texi
View file

@ -21,8 +21,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

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

@ -24,7 +24,7 @@
This is version @value{VERSION}@value{EDITION} of @cite{The MH-E
Manual}, last updated @value{UPDATED}.
Copyright @copyright{} 1995, 2001-2003, 2005-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1995, 2001-2003, 2005-2012 Free Software Foundation, Inc.
@c This dual license has been agreed upon by the FSF.
@ -41,8 +41,7 @@ Back-Cover Texts as in (a) below. A copy of the license is included in
the section entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@item
the GNU General Public License as published by the Free Software

3
doc/misc/newsticker.texi
View file

@ -24,8 +24,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

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

@ -14,19 +14,12 @@ Copyright @copyright{} 2007-2012 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU
Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
License'' in the Emacs manual.
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -51,6 +44,7 @@ This manual is not yet complete.
* Locating a schema::
* DTDs::
* Limitations::
* GNU Free Documentation License:: The license for this documentation.
@end menu
@node Introduction
@ -899,4 +893,8 @@ The restrictions on RELAX NG schemas in section 7 of the RELAX NG
specification are not enforced.
@end itemize
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@bye

29
doc/misc/org.texi
View file

@ -262,7 +262,7 @@
@copying
This manual is for Org version @value{VERSION}.
Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -273,13 +273,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -305,6 +299,9 @@ with contributions by David O'Toole, Bastien Guerry, Philip Rooke, Dan Davison,
@contents
@ifnottex
@c FIXME These hand-written next,prev,up node pointers make editing a lot
@c harder. There should be no need for them, makeinfo can do it
@c automatically for any document with a normal structure.
@node Top, Introduction, (dir), (dir)
@top Org Mode Manual
@ -330,6 +327,7 @@ with contributions by David O'Toole, Bastien Guerry, Philip Rooke, Dan Davison,
* Hacking:: How to hack your way around
* MobileOrg:: Viewing and capture on a mobile device
* History and Acknowledgments:: How Org came into being
* GNU Free Documentation License:: The license for this documentation.
* Main Index:: An index of Org's concepts and features
* Key Index:: Key bindings and where they are described
* Command and Function Index:: Command names and some internal functions
@ -14811,7 +14809,7 @@ buffer, most useful for specifying the allowed values of a property.
@item #+SETUPFILE: file
This line defines a file that holds more in-buffer setup. Normally this is
entirely ignored. Only when the buffer is parsed for option-setting lines
(i.e.@: when starting Org mode for a file, when pressing @kbd{C-c C-c} in a
(i.e., when starting Org mode for a file, when pressing @kbd{C-c C-c} in a
settings line, or when exporting), then the contents of this file are parsed
as if they had been included in the buffer. In particular, the file can be
any other Org mode file with internal setup. You can visit the file the
@ -15173,7 +15171,7 @@ example using the color @code{grey90} on a white background.
Things become cleaner still if you skip all the even levels and use only odd
levels 1, 3, 5..., effectively adding two stars to go from one outline level
to the next@footnote{When you need to specify a level for a property search
or refile targets, @samp{LEVEL=2} will correspond to 3 stars, etc@.}. In this
or refile targets, @samp{LEVEL=2} will correspond to 3 stars, etc.}. In this
way we get the outline view shown at the beginning of this section. In order
to make the structure editing and export commands handle this convention
correctly, configure the variable @code{org-odd-levels-only}, or set this on
@ -15264,7 +15262,7 @@ names for natural constants or units. Instead of defining your own
constants in the variable @code{org-table-formula-constants}, install
the @file{constants} package which defines a large number of constants
and units, and lets you use unit prefixes like @samp{M} for
@samp{Mega}, etc@. You will need version 2.0 of this package, available
@samp{Mega}, etc. You will need version 2.0 of this package, available
at @url{http://www.astro.uva.nl/~dominik/Tools}. Org checks for
the function @code{constants-get}, which has to be autoloaded in your
setup. See the installation instructions in the file
@ -16606,7 +16604,7 @@ last pull. This might include a file that is not currently in your list of
agenda files. If you later use @kbd{C-c a ?} to regenerate the view, only
the current agenda files will be searched.} using @kbd{C-c a ?}.
@node History and Acknowledgments, Main Index, MobileOrg, Top
@node History and Acknowledgments, GNU Free Documentation License, MobileOrg, Top
@appendix History and acknowledgments
@cindex acknowledgments
@cindex history
@ -16949,7 +16947,12 @@ and contributed various ideas and code snippets.
@end itemize
@node Main Index, Key Index, History and Acknowledgments, Top
@node GNU Free Documentation License, Main Index, History and Acknowledgments, Top
@appendix GNU Free Documentation License
@include doclicense.texi
@node Main Index, Key Index, GNU Free Documentation License, Top
@unnumbered Concept index
@printindex cp

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

@ -17,8 +17,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

5
doc/misc/pgg.texi
View file

@ -11,7 +11,7 @@
This file describes PGG @value{VERSION}, an Emacs interface to various
PGP implementations.
Copyright @copyright{} 2001, 2003-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2001, 2003-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -22,8 +22,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

6
doc/misc/rcirc.texi
View file

@ -5,8 +5,7 @@
@c %**end of header
@copying
Copyright @copyright{} 2006-2012
Free Software Foundation, Inc.
Copyright @copyright{} 2006-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -17,8 +16,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license is
included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

5
doc/misc/reftex.texi
View file

@ -45,7 +45,7 @@ This manual documents @RefTeX{} (version @value{VERSION}), a package
to do labels, references, citations and indices for LaTeX documents
with Emacs.
Copyright @copyright{} 1997-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1997-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -56,8 +56,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/remember.texi
View file

@ -20,8 +20,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

25
doc/misc/sasl.texi
View file

@ -10,8 +10,7 @@
@copying
This file describes the Emacs SASL library, version @value{VERSION}.
Copyright @copyright{} 2000, 2004-2012
Free Software Foundation, Inc.
Copyright @copyright{} 2000, 2004-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -19,17 +18,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''
in the Emacs manual.
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
separately from the collection, you can do so by adding a copy of the
license to the document, as described in section 6 of the license.
modify this GNU manual.''
@end quotation
@end copying
@ -70,6 +62,7 @@ applications using different protocols.
* How to use:: Adding authentication support to your applications.
* Data types::
* Back end drivers:: Writing your own drivers.
* GNU Free Documentation License:: The license for this documentation.
* Index::
* Function Index::
* Variable Index::
@ -258,16 +251,20 @@ At the first time @var{step} should be set to @code{nil}.
(Not yet written).
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
@node Index
@chapter Index
@unnumbered Index
@printindex cp
@node Function Index
@chapter Function Index
@unnumbered Function Index
@printindex fn
@node Variable Index
@chapter Variable Index
@unnumbered Variable Index
@printindex vr
@summarycontents

3
doc/misc/sc.texi
View file

@ -25,8 +25,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

11
doc/misc/sem-user.texi
View file

@ -1,13 +1,6 @@
@c This file is included by semantic.texi
@c This is part of the Semantic manual.
@c Copyright (C) 1999-2005, 2007, 2009-2012 Free Software Foundation, Inc.
@c Permission is granted to copy, distribute and/or modify this
@c document under the terms of the GNU Free Documentation License,
@c Version 1.3 or any later version published by the Free Software
@c Foundation; with no Invariant Sections, no Front-Cover Texts, and
@c no Back-Cover Texts. A copy of the license is included in the
@c section entitled ``GNU Free Documentation License''.
@c See file semantic.texi for copying conditions.
You can begin using @semantic{} by enabling Semantic mode, a global
minor mode: type @kbd{M-x semantic-mode}, or open the @samp{Tools}

3
doc/misc/semantic.texi
View file

@ -35,8 +35,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/ses.texi
View file

@ -22,8 +22,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

5
doc/misc/sieve.texi
View file

@ -11,7 +11,7 @@
@copying
This file documents the Emacs Sieve package, for server-side mail filtering.
Copyright @copyright{} 2001-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2001-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -22,8 +22,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

6
doc/misc/smtpmail.texi
View file

@ -3,8 +3,7 @@
@settitle Emacs SMTP Library
@syncodeindex vr fn
@copying
Copyright @copyright{} 2003-2012
Free Software Foundation, Inc.
Copyright @copyright{} 2003-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -15,8 +14,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

5
doc/misc/speedbar.texi
View file

@ -4,7 +4,7 @@
@syncodeindex fn cp
@copying
Copyright @copyright{} 1999-2012 Free Software Foundation, Inc.
Copyright @copyright{} 1999-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -15,8 +15,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/srecode.texi
View file

@ -26,8 +26,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/tramp.texi
View file

@ -48,8 +48,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to
copy and modify this GNU manual. Buying copies from the FSF
supports it in developing GNU and promoting software freedom.''
copy and modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/url.texi
View file

@ -31,8 +31,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/vip.texi
View file

@ -14,8 +14,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/viper.texi
View file

@ -18,8 +18,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

5
doc/misc/widget.texi
View file

@ -8,7 +8,7 @@
@c %**end of header
@copying
Copyright @copyright{} 2000-2012 Free Software Foundation, Inc.
Copyright @copyright{} 2000-2012 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@ -19,8 +19,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

3
doc/misc/wisent.texi
View file

@ -43,8 +43,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License''.
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

5
doc/misc/woman.texi
View file

@ -4,7 +4,7 @@
@settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
@c FIXME
@c Manual last updated:
@set UPDATED Time-stamp: <Thu 24-Jun-2010 00:06:54 gm on grasmoor>
@set UPDATED Time-stamp: <Fri 21-Dec-2012 10:15:12 gm on skiddaw>
@c Software version:
@set VERSION 0.54 (beta)
@afourpaper
@ -29,8 +29,7 @@ and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation License.''
(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
modify this GNU manual. Buying copies from the FSF supports it in
developing GNU and promoting software freedom.''
modify this GNU manual.''
@end quotation
@end copying

8
lisp/ChangeLog
View file

@ -1,3 +1,11 @@
2012-12-21 Chong Yidong <cyd@gnu.org>
* sort.el (sort-subr): Doc fix (Bug#13056).
2012-12-21 Bastien Guerry <bzg@gnu.org>
* progmodes/etags.el (tags-search): Fix typo. Bug #13232.
2012-12-21 Michael Albinus <michael.albinus@gmx.de>
* simple.el (process-file): Overwrite stderr file, if exists.

2
lisp/ldefs-boot.el
View file

@ -9735,7 +9735,7 @@ If FILE-LIST-FORM is non-nil, it should be a form that, when
evaluated, will return a list of file names. The search will be
restricted to these files.
Aleso see the documentation of the `tags-file-name' variable.
Also see the documentation of the `tags-file-name' variable.
\(fn REGEXP &optional FILE-LIST-FORM)" t nil)

2
lisp/progmodes/etags.el
View file

@ -1869,7 +1869,7 @@ If FILE-LIST-FORM is non-nil, it should be a form that, when
evaluated, will return a list of file names. The search will be
restricted to these files.
Aleso see the documentation of the `tags-file-name' variable."
Also see the documentation of the `tags-file-name' variable."
(interactive "sTags search (regexp): ")
(if (and (equal regexp "")
(eq (car tags-loop-scan) 're-search-forward)

9
lisp/sort.el
View file

@ -77,8 +77,13 @@ ENDKEYFUN moves from the start of the sort key to the end of the sort key.
ENDKEYFUN may be nil if STARTKEYFUN returns a value or if it would be the
same as ENDRECFUN.
PREDICATE is the function to use to compare keys. If keys are numbers,
it defaults to `<', otherwise it defaults to `string<'."
PREDICATE, if non-nil, is the predicate function for comparing
keys; it is called with two arguments, the keys to compare, and
should return non-nil if the first key should sort before the
second key. If PREDICATE is nil, comparison is done with `<' if
the keys are numbers, with `compare-buffer-substrings' if the
keys are cons cells (the car and cdr of each cons cell are taken
as start and end positions), and with `string<' otherwise."
;; Heuristically try to avoid messages if sorting a small amt of text.
(let ((messages (> (- (point-max) (point-min)) 50000)))
(save-excursion

28
src/ChangeLog
View file

@ -1,3 +1,31 @@
2012-12-21 Eli Zaretskii <eliz@gnu.org>
* fileio.c (Finsert_file_contents): Doc fix.
* w32proc.c (new_child, delete_child, find_child_pid): For a
subprocess, consider its slot being in use as long as its process
handle (procinfo.hProcess) is not NULL. This avoids reusing the
slot when a new process is started immediately after killing
another one, without waiting enough time for the first process to
be reaped and resources allocated for it be orderly freed.
(Bug#13086)
Suggested by Fabrice Popineau <fabrice.popineau@supelec.fr>.
2012-12-21 Chong Yidong <cyd@gnu.org>
* buffer.c (Fset_buffer_major_mode): Doc fix (Bug#13231).
* fns.c (Fcompare_strings): Doc fix (Bug#13081).
2012-12-21 Eli Zaretskii <eliz@gnu.org>
* w32.c (get_name_and_id): Always pass NULL as the first argument
of lookup_account_sid. Avoids crashes with UNC file names that
refer to DFS domains, not to specific machine names. (Bug#12621)
Remove now unused argument FNAME; all callers changed.
(get_file_owner_and_group): Remove now unused argument FNAME; all
callers changed.
2012-12-21 Chong Yidong <cyd@gnu.org>
* editfns.c (Finsert_char): Since read-char-by-name now signals an

2
src/buffer.c
View file

@ -2049,7 +2049,7 @@ DEFUN ("bury-buffer-internal", Fbury_buffer_internal, Sbury_buffer_internal,
DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
doc: /* Set an appropriate major mode for BUFFER.
For the *scratch* buffer, use `initial-major-mode', otherwise choose a mode
according to `default-major-mode'.
according to the default value of `major-mode'.
Use this function before selecting the buffer, since it may need to inspect
the current buffer's major mode. */)
(Lisp_Object buffer)

5
src/fileio.c
View file

@ -3417,7 +3417,10 @@ the number of characters that replace previous buffer contents.
This function does code conversion according to the value of
`coding-system-for-read' or `file-coding-system-alist', and sets the
variable `last-coding-system-used' to the coding system actually used. */)
variable `last-coding-system-used' to the coding system actually used.
In addition, this function decodes the inserted text from known formats
by calling `format-decode', which see. */)
(Lisp_Object filename, Lisp_Object visit, Lisp_Object beg, Lisp_Object end, Lisp_Object replace)
{
struct stat st;

16
src/fns.c
View file

@ -211,12 +211,18 @@ Symbols are also allowed; their print names are used instead. */)
DEFUN ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0,
doc: /* Compare the contents of two strings, converting to multibyte if needed.
In string STR1, skip the first START1 characters and stop at END1.
In string STR2, skip the first START2 characters and stop at END2.
END1 and END2 default to the full lengths of the respective strings.
The arguments START1, END1, START2, and END2, if non-nil, are
positions specifying which parts of STR1 or STR2 to compare. In
string STR1, compare the part between START1 (inclusive) and END1
\(exclusive). If START1 is nil, it defaults to 0, the beginning of
the string; if END1 is nil, it defaults to the length of the string.
Likewise, in string STR2, compare the part between START2 and END2.
Case is significant in this comparison if IGNORE-CASE is nil.
Unibyte strings are converted to multibyte for comparison.
The strings are compared by the numeric values of their characters.
For instance, STR1 is "less than" STR2 if its first differing
character has a smaller numeric value. If IGNORE-CASE is non-nil,
characters are converted to lower-case before comparing them. Unibyte
strings are converted to multibyte for comparison.
The value is t if the strings (or specified portions) match.
If string STR1 is less, the value is a negative number N;

7
src/search.c
View file

@ -1313,8 +1313,11 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
non-nil, we can use boyer-moore search only if TRT can be
represented by the byte array of 256 elements. For that,
all non-ASCII case-equivalents of all case-sensitive
characters in STRING must belong to the same charset and
row. */
characters in STRING must belong to the same character
group (two characters belong to the same group iff their
multibyte forms are the same except for the last byte;
i.e. every 64 characters form a group; U+0000..U+003F,
U+0040..U+007F, U+0080..U+00BF, ...). */
while (--len >= 0)
{

39
src/w32.c
View file

@ -3644,8 +3644,7 @@ w32_add_to_cache (PSID sid, unsigned id, char *name)
#define GID 2
static int
get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
unsigned *id, char *nm, int what)
get_name_and_id (PSECURITY_DESCRIPTOR psd, unsigned *id, char *nm, int what)
{
PSID sid = NULL;
char machine[MAX_COMPUTERNAME_LENGTH+1];
@ -3655,7 +3654,6 @@ get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
DWORD name_len = sizeof (name);
char domain[1024];
DWORD domain_len = sizeof (domain);
char *mp = NULL;
int use_dflt = 0;
int result;
@ -3670,22 +3668,7 @@ get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
use_dflt = 1;
else if (!w32_cached_id (sid, id, nm))
{
/* If FNAME is a UNC, we need to lookup account on the
specified machine. */
if (IS_DIRECTORY_SEP (fname[0]) && IS_DIRECTORY_SEP (fname[1])
&& fname[2] != '\0')
{
const char *s;
char *p;
for (s = fname + 2, p = machine;
*s && !IS_DIRECTORY_SEP (*s); s++, p++)
*p = *s;
*p = '\0';
mp = machine;
}
if (!lookup_account_sid (mp, sid, name, &name_len,
if (!lookup_account_sid (NULL, sid, name, &name_len,
domain, &domain_len, &ignore)
|| name_len > UNLEN+1)
use_dflt = 1;
@ -3700,9 +3683,7 @@ get_name_and_id (PSECURITY_DESCRIPTOR psd, const char *fname,
}
static void
get_file_owner_and_group (PSECURITY_DESCRIPTOR psd,
const char *fname,
struct stat *st)
get_file_owner_and_group (PSECURITY_DESCRIPTOR psd, struct stat *st)
{
int dflt_usr = 0, dflt_grp = 0;
@ -3713,9 +3694,9 @@ get_file_owner_and_group (PSECURITY_DESCRIPTOR psd,
}
else
{
if (get_name_and_id (psd, fname, &st->st_uid, st->st_uname, UID))
if (get_name_and_id (psd, &st->st_uid, st->st_uname, UID))
dflt_usr = 1;
if (get_name_and_id (psd, fname, &st->st_gid, st->st_gname, GID))
if (get_name_and_id (psd, &st->st_gid, st->st_gname, GID))
dflt_grp = 1;
}
/* Consider files to belong to current user/group, if we cannot get
@ -3939,23 +3920,23 @@ stat_worker (const char * path, struct stat * buf, int follow_symlinks)
If getting security by handle fails, and we don't need to
resolve symlinks, we try getting security by name. */
if (!w32_stat_get_owner_group || is_windows_9x () == TRUE)
get_file_owner_and_group (NULL, name, buf);
get_file_owner_and_group (NULL, buf);
else
{
psd = get_file_security_desc_by_handle (fh);
if (psd)
{
get_file_owner_and_group (psd, name, buf);
get_file_owner_and_group (psd, buf);
LocalFree (psd);
}
else if (!(is_a_symlink && follow_symlinks))
{
psd = get_file_security_desc_by_name (name);
get_file_owner_and_group (psd, name, buf);
get_file_owner_and_group (psd, buf);
xfree (psd);
}
else
get_file_owner_and_group (NULL, name, buf);
get_file_owner_and_group (NULL, buf);
}
CloseHandle (fh);
}
@ -4064,7 +4045,7 @@ stat_worker (const char * path, struct stat * buf, int follow_symlinks)
else
buf->st_mode = S_IFREG;
get_file_owner_and_group (NULL, name, buf);
get_file_owner_and_group (NULL, buf);
}
#if 0

10
src/w32proc.c
View file

@ -800,7 +800,7 @@ new_child (void)
DWORD id;
for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
if (!CHILD_ACTIVE (cp))
if (!CHILD_ACTIVE (cp) && cp->procinfo.hProcess == NULL)
goto Initialize;
if (child_proc_count == MAX_CHILDREN)
return NULL;
@ -859,7 +859,7 @@ delete_child (child_process *cp)
if (fd_info[i].cp == cp)
emacs_abort ();
if (!CHILD_ACTIVE (cp))
if (!CHILD_ACTIVE (cp) && cp->procinfo.hProcess == NULL)
return;
/* Delete the child's temporary input file, if any, that is pending
@ -918,7 +918,8 @@ delete_child (child_process *cp)
if (cp == child_procs + child_proc_count - 1)
{
for (i = child_proc_count-1; i >= 0; i--)
if (CHILD_ACTIVE (&child_procs[i]))
if (CHILD_ACTIVE (&child_procs[i])
|| child_procs[i].procinfo.hProcess != NULL)
{
child_proc_count = i + 1;
break;
@ -935,7 +936,8 @@ find_child_pid (DWORD pid)
child_process *cp;
for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
if (CHILD_ACTIVE (cp) && pid == cp->pid)
if ((CHILD_ACTIVE (cp) || cp->procinfo.hProcess != NULL)
&& pid == cp->pid)
return cp;
return NULL;
}