Commit a4b0cca1 authored by Glenn Morris's avatar Glenn Morris
Browse files

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

parents 0e9c7693 160b3852
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.
......
......@@ -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); \
......
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".
......
......@@ -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
......
......@@ -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
......
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',
......
......@@ -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}}.
......
......@@ -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).
......
......@@ -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).
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.
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 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
......
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.
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
 
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment