[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111289: Merge from emacs-24; up to r
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111289: Merge from emacs-24; up to r111057 |
|
Date: |
Fri, 21 Dec 2012 11:32:43 -0800 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111289 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-12-21 11:32:43 -0800
message:
Merge from emacs-24; up to r111057
modified:
ChangeLog
Makefile.in
doc/emacs/ChangeLog
doc/emacs/emacs-xtra.texi
doc/emacs/frames.texi
doc/lispref/ChangeLog
doc/lispref/customize.texi
doc/lispref/modes.texi
doc/lispref/strings.texi
doc/misc/ChangeLog
doc/misc/ada-mode.texi
doc/misc/auth.texi
doc/misc/autotype.texi
doc/misc/bovine.texi
doc/misc/calc.texi
doc/misc/cc-mode.texi
doc/misc/cl.texi
doc/misc/dbus.texi
doc/misc/dired-x.texi
doc/misc/ebrowse.texi
doc/misc/ede.texi
doc/misc/ediff.texi
doc/misc/edt.texi
doc/misc/eieio.texi
doc/misc/emacs-gnutls.texi
doc/misc/emacs-mime.texi
doc/misc/epa.texi
doc/misc/erc.texi
doc/misc/ert.texi
doc/misc/eshell.texi
doc/misc/eudc.texi
doc/misc/flymake.texi
doc/misc/forms.texi
doc/misc/gnus-coding.texi
doc/misc/gnus.texi
doc/misc/idlwave.texi
doc/misc/info.texi
doc/misc/mairix-el.texi
doc/misc/message.texi
doc/misc/mh-e.texi
doc/misc/newsticker.texi
doc/misc/nxml-mode.texi
doc/misc/org.texi
doc/misc/pcl-cvs.texi
doc/misc/pgg.texi
doc/misc/rcirc.texi
doc/misc/reftex.texi
doc/misc/remember.texi
doc/misc/sasl.texi
doc/misc/sc.texi
doc/misc/sem-user.texi
doc/misc/semantic.texi
doc/misc/ses.texi
doc/misc/sieve.texi
doc/misc/smtpmail.texi
doc/misc/speedbar.texi
doc/misc/srecode.texi
doc/misc/tramp.texi
doc/misc/url.texi
doc/misc/vip.texi
doc/misc/viper.texi
doc/misc/widget.texi
doc/misc/wisent.texi
doc/misc/woman.texi
lisp/ChangeLog
lisp/ldefs-boot.el
lisp/progmodes/etags.el
lisp/sort.el
src/ChangeLog
src/buffer.c
src/fileio.c
src/fns.c
src/search.c
src/w32.c
src/w32proc.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-12-16 18:22:27 +0000
+++ b/ChangeLog 2012-12-21 19:32:43 +0000
@@ -1,3 +1,7 @@
+2012-12-21 Akinori MUSHA <address@hidden> (tiny change)
+
+ * Makefile.in (install-arch-dep): Ignore chmod errors. (Bug#13233)
+
2012-12-16 Romain Francoise <address@hidden>
* configure.ac (acl): New option.
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-12-13 05:29:15 +0000
+++ b/Makefile.in 2012-12-21 19:32:43 +0000
@@ -445,7 +445,7 @@
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); \
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2012-12-15 12:10:12 +0000
+++ b/doc/emacs/ChangeLog 2012-12-21 19:32:43 +0000
@@ -1,3 +1,13 @@
+2012-12-21 Glenn Morris <address@hidden>
+
+ * emacs-xtra.texi (copying): The FSF does not sell copies of this.
+ Simply include doclicense.
+
+2012-12-21 Chong Yidong <address@hidden>
+
+ * frames.texi (Mouse Commands): Fix description of the effect of
+ mouse dragging (Bug#13049).
+
2012-12-15 Juri Linkov <address@hidden>
* misc.texi (Recursive Edit): Add a link to "Query Replace".
=== modified file 'doc/emacs/emacs-xtra.texi'
--- a/doc/emacs/emacs-xtra.texi 2012-02-21 19:56:14 +0000
+++ b/doc/emacs/emacs-xtra.texi 2012-12-21 19:08:32 +0000
@@ -17,19 +17,12 @@
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 @@
* 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 @@
@lowersections
@end iftex
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@node Index
@unnumbered Index
=== modified file 'doc/emacs/frames.texi'
--- a/doc/emacs/frames.texi 2012-12-05 22:27:56 +0000
+++ b/doc/emacs/frames.texi 2012-12-21 03:04:38 +0000
@@ -77,8 +77,8 @@
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
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2012-12-19 21:25:58 +0000
+++ b/doc/lispref/ChangeLog 2012-12-21 19:32:43 +0000
@@ -1,3 +1,12 @@
+2012-12-21 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* files.texi (Magic File Names): Add `file-acl',
=== modified file 'doc/lispref/customize.texi'
--- a/doc/lispref/customize.texi 2012-12-10 02:00:42 +0000
+++ b/doc/lispref/customize.texi 2012-12-21 19:32:43 +0000
@@ -620,6 +620,11 @@
specify the text to describe each value in a way that fits the specific
meaning of the alternative.
address@hidden 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
@address@hidden
=== modified file 'doc/lispref/modes.texi'
--- a/doc/lispref/modes.texi 2012-12-05 22:27:56 +0000
+++ b/doc/lispref/modes.texi 2012-12-21 07:56:47 +0000
@@ -612,7 +612,7 @@
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 @address@hidden 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).
=== modified file 'doc/lispref/strings.texi'
--- a/doc/lispref/strings.texi 2012-09-30 09:18:38 +0000
+++ b/doc/lispref/strings.texi 2012-12-15 13:44:41 +0000
@@ -517,25 +517,29 @@
@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
address@hidden 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
address@hidden is address@hidden, 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
address@hidden is address@hidden, 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
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2012-12-16 22:51:03 +0000
+++ b/doc/misc/ChangeLog 2012-12-21 19:32:43 +0000
@@ -1,3 +1,34 @@
+2012-12-21 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
+
+ * org.texi: Fix typos.
+
2012-12-16 Paul Eggert <address@hidden>
* 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 <address@hidden>
+2012-09-30 Bastien Guerry <address@hidden>
* 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 <address@hidden>
+2012-04-01 Bastien Guerry <address@hidden>
* org.texi (Customization): Update the approximate number of Org
variables.
=== modified file 'doc/misc/ada-mode.texi'
--- a/doc/misc/ada-mode.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/ada-mode.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/auth.texi'
--- a/doc/misc/auth.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/auth.texi 2012-12-21 19:01:24 +0000
@@ -18,17 +18,10 @@
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 @@
* 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 elisp passphrase cache, set
@code{epa-file-cache-passphrase-for-symmetric-encryption}.
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@node Index
address@hidden Index
address@hidden Index
@printindex cp
@node Function Index
address@hidden Function Index
address@hidden Function Index
@printindex fn
@node Variable Index
address@hidden Variable Index
address@hidden Variable Index
@printindex vr
@bye
=== modified file 'doc/misc/autotype.texi'
--- a/doc/misc/autotype.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/autotype.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/bovine.texi'
--- a/doc/misc/bovine.texi 2012-12-13 04:25:50 +0000
+++ b/doc/misc/bovine.texi 2012-12-21 18:36:41 +0000
@@ -34,8 +34,7 @@
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
=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi 2012-12-16 22:51:03 +0000
+++ b/doc/misc/calc.texi 2012-12-21 19:32:43 +0000
@@ -106,8 +106,7 @@
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
=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/cc-mode.texi 2012-12-21 18:36:41 +0000
@@ -167,8 +167,7 @@
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
=== modified file 'doc/misc/cl.texi'
--- a/doc/misc/cl.texi 2012-12-13 05:33:36 +0000
+++ b/doc/misc/cl.texi 2012-12-21 19:32:43 +0000
@@ -17,8 +17,7 @@
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
=== modified file 'doc/misc/dbus.texi'
--- a/doc/misc/dbus.texi 2012-10-23 15:06:07 +0000
+++ b/doc/misc/dbus.texi 2012-12-21 18:36:41 +0000
@@ -20,8 +20,7 @@
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
=== modified file 'doc/misc/dired-x.texi'
--- a/doc/misc/dired-x.texi 2012-05-28 23:35:09 +0000
+++ b/doc/misc/dired-x.texi 2012-12-21 18:36:41 +0000
@@ -31,8 +31,7 @@
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
=== modified file 'doc/misc/ebrowse.texi'
--- a/doc/misc/ebrowse.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/ebrowse.texi 2012-12-21 18:36:41 +0000
@@ -21,8 +21,7 @@
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
=== modified file 'doc/misc/ede.texi'
--- a/doc/misc/ede.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/ede.texi 2012-12-21 18:55:16 +0000
@@ -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 @@
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 @@
* 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 @@
methods. See the code in @file{ede-locate.el} for GNU Global as a
simple example.
address@hidden Extending EDE, , Miscellaneous commands, top
address@hidden 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 @@
@end table
@end table
address@hidden GNU Free Documentation License, , Extending EDE, Top
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@bye
=== modified file 'doc/misc/ediff.texi'
--- a/doc/misc/ediff.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/ediff.texi 2012-12-21 18:36:41 +0000
@@ -36,8 +36,7 @@
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
=== modified file 'doc/misc/edt.texi'
--- a/doc/misc/edt.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/edt.texi 2012-12-21 18:36:41 +0000
@@ -17,8 +17,7 @@
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
=== modified file 'doc/misc/eieio.texi'
--- a/doc/misc/eieio.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/eieio.texi 2012-12-21 18:55:16 +0000
@@ -22,8 +22,7 @@
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 @@
* 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 @@
Allow method overloading of method-like functions in Emacs.
@end enumerate
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@node Function Index
@unnumbered Function Index
=== modified file 'doc/misc/emacs-gnutls.texi'
--- a/doc/misc/emacs-gnutls.texi 2012-05-02 07:33:52 +0000
+++ b/doc/misc/emacs-gnutls.texi 2012-12-21 19:01:24 +0000
@@ -16,17 +16,10 @@
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 @@
* 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 @@
but do not rely on this function's interface if possible.
@end defun
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@node Function Index
address@hidden Function Index
address@hidden Function Index
@printindex fn
@node Variable Index
address@hidden Variable Index
address@hidden Variable Index
@printindex vr
@bye
=== modified file 'doc/misc/emacs-mime.texi'
--- a/doc/misc/emacs-mime.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/emacs-mime.texi 2012-12-21 18:36:41 +0000
@@ -22,8 +22,7 @@
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
=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/epa.texi 2012-12-21 19:01:24 +0000
@@ -17,17 +17,10 @@
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 @@
* Commands::
* Caching Passphrases::
* Bug Reports::
+* GNU Free Documentation License:: The license for this documentation.
@end menu
@node Overview
@@ -493,6 +487,10 @@
of the @samp{ *epg-debug*} buffer. Note that the first letter of the
buffer name is a whitespace.
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@bye
@c End:
=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2012-12-07 02:37:20 +0000
+++ b/doc/misc/erc.texi 2012-12-21 19:32:43 +0000
@@ -20,8 +20,7 @@
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 @@
* 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 @@
@end itemize
address@hidden Copying
address@hidden GNU GENERAL PUBLIC LICENSE
address@hidden gpl.texi
-
@node GNU Free Documentation License
@appendix GNU Free Documentation License
@include doclicense.texi
=== modified file 'doc/misc/ert.texi'
--- a/doc/misc/ert.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/ert.texi 2012-12-21 19:01:24 +0000
@@ -18,17 +18,10 @@
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 @@
* 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 @@
* 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 @@
Contributions to ERT are welcome.
address@hidden Other Testing Concepts, , Extending ERT, Top
address@hidden 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 @@
often. This can be achieved with the @code{:tag} argument to
@code{ert-deftest} and @code{tag} test selectors.
address@hidden GNU Free Documentation License, , Other Testing Concepts, Top
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@bye
@c LocalWords: ERT JUnit namespace docstring ERT's
=== modified file 'doc/misc/eshell.texi'
--- a/doc/misc/eshell.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/eshell.texi 2012-12-21 18:36:41 +0000
@@ -19,8 +19,7 @@
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
=== modified file 'doc/misc/eudc.texi'
--- a/doc/misc/eudc.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/eudc.texi 2012-12-21 18:36:41 +0000
@@ -12,7 +12,7 @@
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 @@
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
=== modified file 'doc/misc/flymake.texi'
--- a/doc/misc/flymake.texi 2012-12-12 18:37:52 +0000
+++ b/doc/misc/flymake.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/forms.texi'
--- a/doc/misc/forms.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/forms.texi 2012-12-21 18:36:41 +0000
@@ -29,8 +29,7 @@
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
=== modified file 'doc/misc/gnus-coding.texi'
--- a/doc/misc/gnus-coding.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/gnus-coding.texi 2012-12-21 19:01:24 +0000
@@ -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 @@
@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 @@
The same applies for customizable variables when its default value was
changed.
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@c Local Variables:
@c mode: texinfo
@c coding: iso-8859-1
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2012-12-06 18:30:38 +0000
+++ b/doc/misc/gnus.texi 2012-12-21 19:32:43 +0000
@@ -22,8 +22,7 @@
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
=== modified file 'doc/misc/idlwave.texi'
--- a/doc/misc/idlwave.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/idlwave.texi 2012-12-21 18:36:41 +0000
@@ -33,8 +33,7 @@
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
=== modified file 'doc/misc/info.texi'
--- a/doc/misc/info.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/info.texi 2012-12-21 19:01:24 +0000
@@ -20,19 +20,12 @@
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 @@
* 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 @@
To check an Info file, do @kbd{M-x Info-validate} while looking at any
node of the file with Emacs Info mode.
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@node Index
@unnumbered Index
=== modified file 'doc/misc/mairix-el.texi'
--- a/doc/misc/mairix-el.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/mairix-el.texi 2012-12-21 18:55:16 +0000
@@ -17,8 +17,7 @@
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 @@
* 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 @@
And that's it!
-
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
@bye
=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/message.texi 2012-12-21 18:36:41 +0000
@@ -21,8 +21,7 @@
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
=== modified file 'doc/misc/mh-e.texi'
--- a/doc/misc/mh-e.texi 2012-12-06 06:17:10 +0000
+++ b/doc/misc/mh-e.texi 2012-12-21 19:32:43 +0000
@@ -24,7 +24,7 @@
This is version @address@hidden 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 @@
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
=== modified file 'doc/misc/newsticker.texi'
--- a/doc/misc/newsticker.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/newsticker.texi 2012-12-21 18:36:41 +0000
@@ -24,8 +24,7 @@
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
=== modified file 'doc/misc/nxml-mode.texi'
--- a/doc/misc/nxml-mode.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/nxml-mode.texi 2012-12-21 19:01:24 +0000
@@ -14,19 +14,12 @@
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 @@
* Locating a schema::
* DTDs::
* Limitations::
+* GNU Free Documentation License:: The license for this documentation.
@end menu
@node Introduction
@@ -899,4 +893,8 @@
specification are not enforced.
@end itemize
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@bye
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-12-14 20:05:03 +0000
+++ b/doc/misc/org.texi 2012-12-21 19:32:43 +0000
@@ -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 @@
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 @@
@contents
@ifnottex
address@hidden FIXME These hand-written next,prev,up node pointers make editing
a lot
address@hidden harder. There should be no need for them, makeinfo can do it
address@hidden automatically for any document with a normal structure.
@node Top, Introduction, (dir), (dir)
@top Org Mode Manual
@@ -330,6 +327,7 @@
* 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 @@
@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 @@
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 address@hidden you need to specify a level for a property search
-or refile targets, @samp{LEVEL=2} will correspond to 3 stars, address@hidden
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 @@
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
address@hidden, address@hidden You will need version 2.0 of this package,
available
address@hidden, 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 @@
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 ?}.
address@hidden History and Acknowledgments, Main Index, MobileOrg, Top
address@hidden History and Acknowledgments, GNU Free Documentation License,
MobileOrg, Top
@appendix History and acknowledgments
@cindex acknowledgments
@cindex history
@@ -16949,7 +16947,12 @@
@end itemize
address@hidden Main Index, Key Index, History and Acknowledgments, Top
address@hidden GNU Free Documentation License, Main Index, History and
Acknowledgments, Top
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
+
address@hidden Main Index, Key Index, GNU Free Documentation License, Top
@unnumbered Concept index
@printindex cp
=== modified file 'doc/misc/pcl-cvs.texi'
--- a/doc/misc/pcl-cvs.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/pcl-cvs.texi 2012-12-21 18:36:41 +0000
@@ -17,8 +17,7 @@
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
=== modified file 'doc/misc/pgg.texi'
--- a/doc/misc/pgg.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/pgg.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/rcirc.texi'
--- a/doc/misc/rcirc.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/rcirc.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/reftex.texi'
--- a/doc/misc/reftex.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/reftex.texi 2012-12-21 18:36:41 +0000
@@ -45,7 +45,7 @@
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 @@
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
=== modified file 'doc/misc/remember.texi'
--- a/doc/misc/remember.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/remember.texi 2012-12-21 18:36:41 +0000
@@ -20,8 +20,7 @@
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
=== modified file 'doc/misc/sasl.texi'
--- a/doc/misc/sasl.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/sasl.texi 2012-12-21 19:01:24 +0000
@@ -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 @@
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 @@
* 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 @@
(Not yet written).
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
@node Index
address@hidden Index
address@hidden Index
@printindex cp
@node Function Index
address@hidden Function Index
address@hidden Function Index
@printindex fn
@node Variable Index
address@hidden Variable Index
address@hidden Variable Index
@printindex vr
@summarycontents
=== modified file 'doc/misc/sc.texi'
--- a/doc/misc/sc.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/sc.texi 2012-12-21 18:36:41 +0000
@@ -25,8 +25,7 @@
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
=== modified file 'doc/misc/sem-user.texi'
--- a/doc/misc/sem-user.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/sem-user.texi 2012-12-18 08:32:46 +0000
@@ -1,13 +1,6 @@
address@hidden This file is included by semantic.texi
-
address@hidden This is part of the Semantic manual.
@c Copyright (C) 1999-2005, 2007, 2009-2012 Free Software Foundation, Inc.
-
address@hidden Permission is granted to copy, distribute and/or modify this
address@hidden document under the terms of the GNU Free Documentation License,
address@hidden Version 1.3 or any later version published by the Free Software
address@hidden Foundation; with no Invariant Sections, no Front-Cover Texts, and
address@hidden no Back-Cover Texts. A copy of the license is included in the
address@hidden section entitled ``GNU Free Documentation License''.
address@hidden 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}
=== modified file 'doc/misc/semantic.texi'
--- a/doc/misc/semantic.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/semantic.texi 2012-12-21 18:36:41 +0000
@@ -35,8 +35,7 @@
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
=== modified file 'doc/misc/ses.texi'
--- a/doc/misc/ses.texi 2012-12-06 06:17:10 +0000
+++ b/doc/misc/ses.texi 2012-12-21 19:32:43 +0000
@@ -22,8 +22,7 @@
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
=== modified file 'doc/misc/sieve.texi'
--- a/doc/misc/sieve.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/sieve.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/smtpmail.texi'
--- a/doc/misc/smtpmail.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/smtpmail.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/speedbar.texi'
--- a/doc/misc/speedbar.texi 2012-01-19 07:21:25 +0000
+++ b/doc/misc/speedbar.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/srecode.texi'
--- a/doc/misc/srecode.texi 2012-12-14 20:05:03 +0000
+++ b/doc/misc/srecode.texi 2012-12-21 19:32:43 +0000
@@ -26,8 +26,7 @@
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
=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi 2012-12-14 15:37:27 +0000
+++ b/doc/misc/tramp.texi 2012-12-21 19:32:43 +0000
@@ -48,8 +48,7 @@
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
=== modified file 'doc/misc/url.texi'
--- a/doc/misc/url.texi 2012-12-06 06:17:10 +0000
+++ b/doc/misc/url.texi 2012-12-21 19:32:43 +0000
@@ -31,8 +31,7 @@
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
=== modified file 'doc/misc/vip.texi'
--- a/doc/misc/vip.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/vip.texi 2012-12-21 18:36:41 +0000
@@ -14,8 +14,7 @@
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
=== modified file 'doc/misc/viper.texi'
--- a/doc/misc/viper.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/viper.texi 2012-12-21 18:36:41 +0000
@@ -18,8 +18,7 @@
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
=== modified file 'doc/misc/widget.texi'
--- a/doc/misc/widget.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/widget.texi 2012-12-21 18:36:41 +0000
@@ -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 @@
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
=== modified file 'doc/misc/wisent.texi'
--- a/doc/misc/wisent.texi 2012-12-14 20:05:03 +0000
+++ b/doc/misc/wisent.texi 2012-12-21 19:32:43 +0000
@@ -43,8 +43,7 @@
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
=== modified file 'doc/misc/woman.texi'
--- a/doc/misc/woman.texi 2012-12-05 22:27:56 +0000
+++ b/doc/misc/woman.texi 2012-12-21 18:36:41 +0000
@@ -4,7 +4,7 @@
@settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
@c FIXME
@c Manual last updated:
address@hidden UPDATED Time-stamp: <Thu 24-Jun-2010 00:06:54 gm on grasmoor>
address@hidden 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 @@
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
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-12-21 08:10:26 +0000
+++ b/lisp/ChangeLog 2012-12-21 19:32:43 +0000
@@ -1,3 +1,11 @@
+2012-12-21 Chong Yidong <address@hidden>
+
+ * sort.el (sort-subr): Doc fix (Bug#13056).
+
+2012-12-21 Bastien Guerry <address@hidden>
+
+ * progmodes/etags.el (tags-search): Fix typo. Bug #13232.
+
2012-12-21 Michael Albinus <address@hidden>
* simple.el (process-file): Overwrite stderr file, if exists.
=== modified file 'lisp/ldefs-boot.el'
--- a/lisp/ldefs-boot.el 2012-12-04 03:04:31 +0000
+++ b/lisp/ldefs-boot.el 2012-12-21 19:32:43 +0000
@@ -9735,7 +9735,7 @@
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)
=== modified file 'lisp/progmodes/etags.el'
--- a/lisp/progmodes/etags.el 2012-11-29 20:19:11 +0000
+++ b/lisp/progmodes/etags.el 2012-12-21 19:32:43 +0000
@@ -1869,7 +1869,7 @@
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)
=== modified file 'lisp/sort.el'
--- a/lisp/sort.el 2012-12-03 23:49:08 +0000
+++ b/lisp/sort.el 2012-12-21 19:32:43 +0000
@@ -77,8 +77,13 @@
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
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-12-21 07:51:33 +0000
+++ b/src/ChangeLog 2012-12-21 19:32:43 +0000
@@ -1,3 +1,31 @@
+2012-12-21 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>.
+
+2012-12-21 Chong Yidong <address@hidden>
+
+ * buffer.c (Fset_buffer_major_mode): Doc fix (Bug#13231).
+
+ * fns.c (Fcompare_strings): Doc fix (Bug#13081).
+
+2012-12-21 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* editfns.c (Finsert_char): Since read-char-by-name now signals an
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2012-12-11 09:51:12 +0000
+++ b/src/buffer.c 2012-12-21 19:32:43 +0000
@@ -2049,7 +2049,7 @@
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)
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2012-12-20 16:09:05 +0000
+++ b/src/fileio.c 2012-12-21 19:32:43 +0000
@@ -3417,7 +3417,10 @@
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;
=== modified file 'src/fns.c'
--- a/src/fns.c 2012-11-09 00:08:12 +0000
+++ b/src/fns.c 2012-12-21 19:32:43 +0000
@@ -211,12 +211,18 @@
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;
=== modified file 'src/search.c'
--- a/src/search.c 2012-12-20 16:09:05 +0000
+++ b/src/search.c 2012-12-21 19:32:43 +0000
@@ -1313,8 +1313,11 @@
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)
{
=== modified file 'src/w32.c'
--- a/src/w32.c 2012-12-18 19:05:56 +0000
+++ b/src/w32.c 2012-12-21 19:32:43 +0000
@@ -3644,8 +3644,7 @@
#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 @@
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 @@
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 @@
}
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 @@
}
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 @@
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 @@
else
buf->st_mode = S_IFREG;
- get_file_owner_and_group (NULL, name, buf);
+ get_file_owner_and_group (NULL, buf);
}
#if 0
=== modified file 'src/w32proc.c'
--- a/src/w32proc.c 2012-12-15 13:38:21 +0000
+++ b/src/w32proc.c 2012-12-21 19:32:43 +0000
@@ -800,7 +800,7 @@
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 @@
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 @@
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 @@
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;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111289: Merge from emacs-24; up to r111057,
Glenn Morris <=