Now on revision 111291. 1 tag(s) updated. ------------------------------------------------------------ revno: 111291 fixes bugs: http://debbugs.gnu.org/11469 http://debbugs.gnu.org/12374 author: Takafumi Arakaki committer: Chong Yidong branch nick: trunk timestamp: Sat 2012-12-22 10:59:08 +0800 message: Two fixes for the URL library (tiny change). * url-expand.el (url-default-expander): Don't calculate a default url port before checking url-type. * url-http.el (url-http-end-of-document-sentinel): Bind relevant url-request-* variables around the call to url-http. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-12-03 06:23:06 +0000 +++ lisp/url/ChangeLog 2012-12-22 02:59:08 +0000 @@ -1,3 +1,15 @@ +2012-12-22 Takafumi Arakaki (tiny change) + + * url-http.el (url-http-end-of-document-sentinel): Bind relevant + url-request-* variables around the call to url-http (Bug#11469). + + * url-expand.el (url-default-expander): Don't calculate a default + url port before checking url-type (Bug#12374). + +2012-12-22 Chong Yidong + + * url-parse.el (url-port): Doc fix. + 2012-12-03 Chong Yidong * url-misc.el (url-do-terminal-emulator): Use make-term instead of === modified file 'lisp/url/url-expand.el' --- lisp/url/url-expand.el 2012-07-11 23:13:41 +0000 +++ lisp/url/url-expand.el 2012-12-22 02:59:08 +0000 @@ -112,7 +112,7 @@ ;; Well, they told us the scheme, let's just go with it. nil (setf (url-type urlobj) (or (url-type urlobj) (url-type defobj))) - (setf (url-port urlobj) (or (url-port urlobj) + (setf (url-port urlobj) (or (url-portspec urlobj) (and (string= (url-type urlobj) (url-type defobj)) (url-port defobj)))) === modified file 'lisp/url/url-http.el' --- lisp/url/url-http.el 2012-10-13 09:37:25 +0000 +++ lisp/url/url-http.el 2012-12-22 02:59:08 +0000 @@ -890,8 +890,11 @@ (url-http-activate-callback) ;; Call `url-http' again if our connection expired. (erase-buffer) - (url-http url-current-object url-callback-function - url-callback-arguments (current-buffer)))) + (let ((url-request-method url-http-method) + (url-request-extra-headers url-http-extra-headers) + (url-request-data url-http-data)) + (url-http url-current-object url-callback-function + url-callback-arguments (current-buffer))))) ((url-http-parse-headers) (url-http-activate-callback)))))) === modified file 'lisp/url/url-parse.el' --- lisp/url/url-parse.el 2012-11-17 06:48:51 +0000 +++ lisp/url/url-parse.el 2012-12-22 02:59:08 +0000 @@ -39,13 +39,14 @@ silent (use-cookies t)) (defsubst url-port (urlobj) - "Return the port number for the URL specified by URLOBJ." + "Return the port number for the URL specified by URLOBJ. +If the port spec is nil (i.e. URLOBJ specifies no port number), +return the default port number for URLOBJ's scheme." (declare (gv-setter (lambda (port) `(setf (url-portspec ,urlobj) ,port)))) (or (url-portspec urlobj) (if (url-type urlobj) (url-scheme-get-property (url-type urlobj) 'default-port)))) - (defun url-path-and-query (urlobj) "Return the path and query components of URLOBJ. These two components are stored together in the FILENAME slot of ------------------------------------------------------------ revno: 111290 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-12-21 15:55:07 -0800 message: Remove time-stamp from woman.texi * doc/misc/woman.texi (UPDATED, VERSION): Remove in favor of EMACSVER. Include emacsver.texi. Nuke hand-written node pointers. * doc/misc/Makefile.in ($(buildinfodir)/woman$(INFO_EXT), woman.dvi, woman.pdf): Depend on emacsver.texi. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-12-21 19:32:43 +0000 +++ doc/misc/ChangeLog 2012-12-21 23:55:07 +0000 @@ -1,5 +1,10 @@ 2012-12-21 Glenn Morris + * woman.texi (UPDATED, VERSION): Remove in favor of EMACSVER. + Include emacsver.texi. Nuke hand-written node pointers. + * Makefile.in ($(buildinfodir)/woman$(INFO_EXT), woman.dvi, woman.pdf): + Depend on emacsver.texi. + * 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. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2012-12-13 04:47:14 +0000 +++ doc/misc/Makefile.in 2012-12-21 23:55:07 +0000 @@ -27,7 +27,6 @@ ## Where the output files go. buildinfodir = $(srcdir)/../../info ## Directory with emacsver.texi. -## Currently only used by efaq and calc. emacsdir = $(srcdir)/../emacs MKDIR_P = @MKDIR_P@ @@ -685,12 +684,12 @@ $(ENVADD) $(TEXI2PDF) ${srcdir}/wisent.texi woman : $(buildinfodir)/woman$(INFO_EXT) -$(buildinfodir)/woman$(INFO_EXT): ${srcdir}/woman.texi +$(buildinfodir)/woman$(INFO_EXT): ${srcdir}/woman.texi $(emacsdir)/emacsver.texi $(mkinfodir) $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/woman.texi -woman.dvi: ${srcdir}/woman.texi +woman.dvi: ${srcdir}/woman.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi -woman.pdf: ${srcdir}/woman.texi +woman.pdf: ${srcdir}/woman.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi === modified file 'doc/misc/woman.texi' --- doc/misc/woman.texi 2012-12-21 18:36:41 +0000 +++ doc/misc/woman.texi 2012-12-21 23:55:07 +0000 @@ -2,11 +2,7 @@ @c %**start of header @setfilename ../../info/woman @settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man'' -@c FIXME -@c Manual last updated: -@set UPDATED Time-stamp: -@c Software version: -@set VERSION 0.54 (beta) +@include emacsver.texi @afourpaper @c With different size paper the printed page breaks will need attention! @c Look for @page and @need commands. @@ -43,7 +39,7 @@ @titlepage @title WoMan @subtitle Browse Unix Manual Pages ``W.O. (without) Man'' -@subtitle Software Version @value{VERSION} +@subtitle as distributed with Emacs @value{EMACSVER} @author Francis J. Wright @sp 2 @author School of Mathematical Sciences @@ -53,8 +49,6 @@ @author @email{F.J.Wright@@qmul.ac.uk} @author @uref{http://centaur.maths.qmw.ac.uk/} @c He no longer maintains this manual. -@sp 2 -@author Manual Last Updated @value{UPDATED} @comment The following two commands start the copyright page. @page @@ -67,13 +61,12 @@ @c =================================================================== @ifnottex -@node Top, Introduction, (dir), (dir) +@node Top @comment node-name, next, previous, up @top WoMan: Browse Unix Manual Pages ``W.O. (without) Man'' @display -Software Version @value{VERSION} -Manual Last Updated @value{UPDATED} +As distributed with Emacs @value{EMACSVER}. @email{F.J.Wright@@qmw.ac.uk, Francis J. Wright} @uref{http://centaur.maths.qmw.ac.uk/, School of Mathematical Sciences} @@ -103,7 +96,7 @@ @c =================================================================== -@node Introduction, Background, Top, Top +@node Introduction @comment node-name, next, previous, up @chapter Introduction @cindex introduction @@ -165,7 +158,7 @@ @c =================================================================== -@node Background, Finding, Introduction, Top +@node Background @comment node-name, next, previous, up @chapter Background @cindex background @@ -295,7 +288,7 @@ emulation of @code{troff} as GNU Emacs moves to providing bit-mapped display facilities. -@node Finding, Browsing, Background, Top +@node Finding @comment node-name, next, previous, up @chapter Finding and Formatting Man Pages @cindex using, finding man pages @@ -352,7 +345,7 @@ * Automatic:: Automatic Interface @end menu -@node Topic, Filename, Finding, Finding +@node Topic @comment node-name, next, previous, up @section Topic Interface @cindex topic interface @@ -434,7 +427,7 @@ * Word at point:: Using the "Word at Point" as a Topic Suggestion @end menu -@node Cache, Word at point, Topic, Topic +@node Cache @comment node-name, next, previous, up @subsection The WoMan Topic Cache @cindex topic cache @@ -469,7 +462,7 @@ time it is run in a new Emacs session. -@node Word at point, , Cache, Topic +@node Word at point @comment node-name, next, previous, up @subsection Using the "Word at Point" as a Topic Suggestion @cindex word at point @@ -496,7 +489,7 @@ @end lisp -@node Filename, Automatic, Topic, Finding +@node Filename @comment node-name, next, previous, up @section Filename Interface @cindex filename interface @@ -546,7 +539,7 @@ primarily used internally by WoMan. -@node Automatic, , Filename, Finding +@node Automatic @comment node-name, next, previous, up @section Automatic Interface @cindex automatic interface @@ -584,7 +577,7 @@ @c =================================================================== -@node Browsing, Customization, Finding, Top +@node Browsing @comment node-name, next, previous, up @chapter Browsing Man Pages @cindex using, browsing man pages @@ -615,7 +608,7 @@ * Imenu:: Imenu Support; Contents Menu @end menu -@node Fonts, Navigation, Browsing, Browsing +@node Fonts @comment node-name, next, previous, up @section Fonts and Faces @cindex fonts @@ -631,7 +624,7 @@ sub-scripts, which are not displayed well by WoMan. -@node Navigation, References, Fonts, Browsing +@node Navigation @comment node-name, next, previous, up @section Navigation @cindex navigation @@ -677,7 +670,7 @@ @end table -@node References, Changing, Navigation, Browsing +@node References @comment node-name, next, previous, up @section Following References @cindex following references @@ -721,7 +714,7 @@ @end table -@node Changing, Convenience, References, Browsing +@node Changing @comment node-name, next, previous, up @section Changing the Current Man Page @cindex changing current man page @@ -789,7 +782,7 @@ @end table -@node Convenience, Imenu, Changing, Browsing +@node Convenience @comment node-name, next, previous, up @section Convenience Key Bindings @cindex convenience key bindings @@ -831,7 +824,7 @@ @end table -@node Imenu, , Convenience, Browsing +@node Imenu @comment node-name, next, previous, up @section Imenu Support; Contents Menu @cindex imenu support @@ -852,7 +845,7 @@ @c =================================================================== -@node Customization, Log, Browsing, Top +@node Customization @comment node-name, next, previous, up @chapter Customization @cindex customization @@ -910,7 +903,7 @@ * Special symbols:: @end menu -@node Interface Options, Formatting Options, Customization, Customization +@node Interface Options @comment node-name, next, previous, up @section Interface Options @cindex interface options @@ -1137,7 +1130,7 @@ @end vtable -@node Formatting Options, Faces, Interface Options, Customization +@node Formatting Options @comment node-name, next, previous, up @section Formatting Options @cindex formatting options @@ -1181,7 +1174,7 @@ @end vtable -@node Faces, Special symbols, Formatting Options, Customization +@node Faces @comment node-name, next, previous, up @section Faces @cindex faces @@ -1217,7 +1210,7 @@ @end vtable -@node Special symbols, , Faces, Customization +@node Special symbols @comment node-name, next, previous, up @section Special symbols @cindex special symbols @@ -1255,7 +1248,7 @@ @c =================================================================== -@node Log, Technical, Customization, Top +@node Log @comment node-name, next, previous, up @chapter The *WoMan-Log* Buffer @cindex log buffer @@ -1280,7 +1273,7 @@ @c =================================================================== -@node Technical, Bugs, Log, Top +@node Technical @comment node-name, next, previous, up @chapter Technical Details @cindex technical details @@ -1305,7 +1298,7 @@ @c =================================================================== -@node Bugs, Acknowledgments, Technical, Top +@node Bugs @comment node-name, next, previous, up @chapter Reporting Bugs @cindex reporting bugs @@ -1330,7 +1323,7 @@ @c =================================================================== -@node Acknowledgments, GNU Free Documentation License, Bugs, Top +@node Acknowledgments @comment node-name, next, previous, up @chapter Acknowledgments @cindex acknowledgments @@ -1387,17 +1380,17 @@ @page -@node GNU Free Documentation License, Command Index, Acknowledgments, Top +@node GNU Free Documentation License @appendix GNU Free Documentation License @include doclicense.texi -@node Command Index, Variable Index, GNU Free Documentation License, Top +@node Command Index @comment node-name, next, previous, up @unnumbered Command Index @printindex fn -@node Variable Index, Keystroke Index, Command Index, Top +@node Variable Index @comment node-name, next, previous, up @unnumbered Variable Index @@ -1409,7 +1402,7 @@ @page -@node Keystroke Index, Concept Index, Variable Index, Top +@node Keystroke Index @comment node-name, next, previous, up @unnumbered Keystroke Index @@ -1421,7 +1414,7 @@ @page -@node Concept Index, , Keystroke Index, Top +@node Concept Index @comment node-name, next, previous, up @unnumbered Concept Index ------------------------------------------------------------ revno: 111289 [merge] committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-12-21 11:32:43 -0800 message: Merge from emacs-24; up to r111057 diff: === modified file 'ChangeLog' --- ChangeLog 2012-12-16 18:22:27 +0000 +++ ChangeLog 2012-12-21 19:32:43 +0000 @@ -1,3 +1,7 @@ +2012-12-21 Akinori MUSHA (tiny change) + + * Makefile.in (install-arch-dep): Ignore chmod errors. (Bug#13233) + 2012-12-16 Romain Francoise * configure.ac (acl): New option. === modified file 'Makefile.in' --- Makefile.in 2012-12-13 05:29:15 +0000 +++ 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' --- doc/emacs/ChangeLog 2012-12-15 12:10:12 +0000 +++ doc/emacs/ChangeLog 2012-12-21 19:32:43 +0000 @@ -1,3 +1,13 @@ +2012-12-21 Glenn Morris + + * emacs-xtra.texi (copying): The FSF does not sell copies of this. + Simply include doclicense. + +2012-12-21 Chong Yidong + + * frames.texi (Mouse Commands): Fix description of the effect of + mouse dragging (Bug#13049). + 2012-12-15 Juri Linkov * misc.texi (Recursive Edit): Add a link to "Query Replace". === modified file 'doc/emacs/emacs-xtra.texi' --- doc/emacs/emacs-xtra.texi 2012-02-21 19:56:14 +0000 +++ 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 +@node GNU Free Documentation License +@appendix GNU Free Documentation License +@include doclicense.texi + @node Index @unnumbered Index === modified file 'doc/emacs/frames.texi' --- doc/emacs/frames.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/lispref/ChangeLog 2012-12-19 21:25:58 +0000 +++ doc/lispref/ChangeLog 2012-12-21 19:32:43 +0000 @@ -1,3 +1,12 @@ +2012-12-21 Chong Yidong + + * 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 * files.texi (Magic File Names): Add `file-acl', === modified file 'doc/lispref/customize.texi' --- doc/lispref/customize.texi 2012-12-10 02:00:42 +0000 +++ 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. +@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}}. === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2012-12-05 22:27:56 +0000 +++ 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 @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). === modified file 'doc/lispref/strings.texi' --- doc/lispref/strings.texi 2012-09-30 09:18:38 +0000 +++ 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 +@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 === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-12-16 22:51:03 +0000 +++ doc/misc/ChangeLog 2012-12-21 19:32:43 +0000 @@ -1,3 +1,34 @@ +2012-12-21 Glenn Morris + + * 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 + + * org.texi: Fix typos. + 2012-12-16 Paul Eggert * 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 +2012-09-30 Bastien Guerry * 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 +2012-04-01 Bastien Guerry * org.texi (Customization): Update the approximate number of Org variables. === modified file 'doc/misc/ada-mode.texi' --- doc/misc/ada-mode.texi 2012-01-19 07:21:25 +0000 +++ 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' --- doc/misc/auth.texi 2012-12-05 22:27:56 +0000 +++ 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}. +@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 === modified file 'doc/misc/autotype.texi' --- doc/misc/autotype.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/bovine.texi 2012-12-13 04:25:50 +0000 +++ 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' --- doc/misc/calc.texi 2012-12-16 22:51:03 +0000 +++ 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' --- doc/misc/cc-mode.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/cl.texi 2012-12-13 05:33:36 +0000 +++ 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' --- doc/misc/dbus.texi 2012-10-23 15:06:07 +0000 +++ 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' --- doc/misc/dired-x.texi 2012-05-28 23:35:09 +0000 +++ 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' --- doc/misc/ebrowse.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/ede.texi 2012-12-05 22:27:56 +0000 +++ 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. -@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 @@ @end table @end table +@node GNU Free Documentation License, , Extending EDE, Top +@appendix GNU Free Documentation License +@include doclicense.texi + @bye === modified file 'doc/misc/ediff.texi' --- doc/misc/ediff.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/edt.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/eieio.texi 2012-12-05 22:27:56 +0000 +++ 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 +@node GNU Free Documentation License +@appendix GNU Free Documentation License +@include doclicense.texi + @node Function Index @unnumbered Function Index === modified file 'doc/misc/emacs-gnutls.texi' --- doc/misc/emacs-gnutls.texi 2012-05-02 07:33:52 +0000 +++ 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 +@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 === modified file 'doc/misc/emacs-mime.texi' --- doc/misc/emacs-mime.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/epa.texi 2012-12-05 22:27:56 +0000 +++ 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. +@node GNU Free Documentation License +@appendix GNU Free Documentation License +@include doclicense.texi + @bye @c End: === modified file 'doc/misc/erc.texi' --- doc/misc/erc.texi 2012-12-07 02:37:20 +0000 +++ 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 -@node Copying -@appendix GNU GENERAL PUBLIC LICENSE -@include gpl.texi - @node GNU Free Documentation License @appendix GNU Free Documentation License @include doclicense.texi === modified file 'doc/misc/ert.texi' --- doc/misc/ert.texi 2012-12-05 22:27:56 +0000 +++ 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. -@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 @@ 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 === modified file 'doc/misc/eshell.texi' --- doc/misc/eshell.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/eudc.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/flymake.texi 2012-12-12 18:37:52 +0000 +++ 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' --- doc/misc/forms.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/gnus-coding.texi 2012-12-05 22:27:56 +0000 +++ 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. +@node GNU Free Documentation License +@appendix GNU Free Documentation License +@include doclicense.texi + @c Local Variables: @c mode: texinfo @c coding: iso-8859-1 === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2012-12-06 18:30:38 +0000 +++ 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' --- doc/misc/idlwave.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/info.texi 2012-12-05 22:27:56 +0000 +++ 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. +@node GNU Free Documentation License +@appendix GNU Free Documentation License +@include doclicense.texi + @node Index @unnumbered Index === modified file 'doc/misc/mairix-el.texi' --- doc/misc/mairix-el.texi 2012-12-05 22:27:56 +0000 +++ 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! - +@node GNU Free Documentation License +@appendix GNU Free Documentation License +@include doclicense.texi @bye === modified file 'doc/misc/message.texi' --- doc/misc/message.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/mh-e.texi 2012-12-06 06:17:10 +0000 +++ doc/misc/mh-e.texi 2012-12-21 19:32:43 +0000 @@ -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 @@ 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' --- doc/misc/newsticker.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/nxml-mode.texi 2012-12-05 22:27:56 +0000 +++ 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 +@node GNU Free Documentation License +@appendix GNU Free Documentation License +@include doclicense.texi + @bye === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2012-12-14 20:05:03 +0000 +++ 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 +@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 @@ * 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 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 @@ 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 @@ 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 @@ @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 === modified file 'doc/misc/pcl-cvs.texi' --- doc/misc/pcl-cvs.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/pgg.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/rcirc.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/reftex.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/remember.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/sasl.texi 2012-01-19 07:21:25 +0000 +++ 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). +@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 === modified file 'doc/misc/sc.texi' --- doc/misc/sc.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/sem-user.texi 2012-12-05 22:27:56 +0000 +++ doc/misc/sem-user.texi 2012-12-18 08:32:46 +0000 @@ -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} === modified file 'doc/misc/semantic.texi' --- doc/misc/semantic.texi 2012-01-19 07:21:25 +0000 +++ 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' --- doc/misc/ses.texi 2012-12-06 06:17:10 +0000 +++ 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' --- doc/misc/sieve.texi 2012-01-19 07:21:25 +0000 +++ 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' --- doc/misc/smtpmail.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/speedbar.texi 2012-01-19 07:21:25 +0000 +++ 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' --- doc/misc/srecode.texi 2012-12-14 20:05:03 +0000 +++ 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' --- doc/misc/tramp.texi 2012-12-14 15:37:27 +0000 +++ 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' --- doc/misc/url.texi 2012-12-06 06:17:10 +0000 +++ 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' --- doc/misc/vip.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/viper.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/widget.texi 2012-12-05 22:27:56 +0000 +++ 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' --- doc/misc/wisent.texi 2012-12-14 20:05:03 +0000 +++ 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' --- doc/misc/woman.texi 2012-12-05 22:27:56 +0000 +++ 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: -@set UPDATED Time-stamp: +@set UPDATED Time-stamp: @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' --- lisp/ChangeLog 2012-12-21 08:10:26 +0000 +++ lisp/ChangeLog 2012-12-21 19:32:43 +0000 @@ -1,3 +1,11 @@ +2012-12-21 Chong Yidong + + * sort.el (sort-subr): Doc fix (Bug#13056). + +2012-12-21 Bastien Guerry + + * progmodes/etags.el (tags-search): Fix typo. Bug #13232. + 2012-12-21 Michael Albinus * simple.el (process-file): Overwrite stderr file, if exists. === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2012-12-04 03:04:31 +0000 +++ 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' --- lisp/progmodes/etags.el 2012-11-29 20:19:11 +0000 +++ 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' --- lisp/sort.el 2012-12-03 23:49:08 +0000 +++ 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' --- src/ChangeLog 2012-12-21 07:51:33 +0000 +++ src/ChangeLog 2012-12-21 19:32:43 +0000 @@ -1,3 +1,31 @@ +2012-12-21 Eli Zaretskii + + * 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 . + +2012-12-21 Chong Yidong + + * buffer.c (Fset_buffer_major_mode): Doc fix (Bug#13231). + + * fns.c (Fcompare_strings): Doc fix (Bug#13081). + +2012-12-21 Eli Zaretskii + + * 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 * editfns.c (Finsert_char): Since read-char-by-name now signals an === modified file 'src/buffer.c' --- src/buffer.c 2012-12-11 09:51:12 +0000 +++ 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' --- src/fileio.c 2012-12-20 16:09:05 +0000 +++ 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' --- src/fns.c 2012-11-09 00:08:12 +0000 +++ 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' --- src/search.c 2012-12-20 16:09:05 +0000 +++ 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' --- src/w32.c 2012-12-18 19:05:56 +0000 +++ 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' --- src/w32proc.c 2012-12-15 13:38:21 +0000 +++ 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; } ------------------------------------------------------------ revno: 111288 committer: Michael Albinus branch nick: trunk timestamp: Fri 2012-12-21 09:10:26 +0100 message: * simple.el (process-file): Overwrite stderr file, if exists. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-12-21 07:51:33 +0000 +++ lisp/ChangeLog 2012-12-21 08:10:26 +0000 @@ -1,3 +1,7 @@ +2012-12-21 Michael Albinus + + * simple.el (process-file): Overwrite stderr file, if exists. + 2012-12-21 Daiki Ueno * epg.el (epg--start): Print GPG_AGENT_INFO in the debug buffer. === modified file 'lisp/simple.el' --- lisp/simple.el 2012-12-21 05:42:59 +0000 +++ lisp/simple.el 2012-12-21 08:10:26 +0000 @@ -2804,7 +2804,7 @@ (or lc infile) (if stderr-file (list (car buffer) stderr-file) buffer) display args) - (when stderr-file (copy-file stderr-file (cadr buffer))))) + (when stderr-file (copy-file stderr-file (cadr buffer) t)))) (when stderr-file (delete-file stderr-file)) (when lc (delete-file lc))))) ------------------------------------------------------------ revno: 111287 fixes bug: http://debbugs.gnu.org/13177 committer: Chong Yidong branch nick: trunk timestamp: Fri 2012-12-21 15:51:33 +0800 message: Make read-char-by-name signal an error for invalid input. * international/mule-cmds.el (read-char-by-name): Signal an error if the user does not supply a valid character. * editfns.c (Finsert_char): Since read-char-by-name now signals an error for invalid chars, don't check for a nil return value. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-12-21 07:35:02 +0000 +++ lisp/ChangeLog 2012-12-21 07:51:33 +0000 @@ -5,6 +5,9 @@ 2012-12-21 Chong Yidong + * international/mule-cmds.el (read-char-by-name): Signal an error + if the user does not supply a valid character (Bug#13177). + * simple.el (transpose-subr-1): Preserve marker positions by changing the insertion sequence (Bug#13122). === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2012-12-15 13:03:17 +0000 +++ lisp/international/mule-cmds.el 2012-12-21 07:51:33 +0000 @@ -2953,14 +2953,18 @@ (let ((completion-ignore-case t)) (if (eq action 'metadata) '(metadata (category . unicode-name)) - (complete-with-action action (ucs-names) string pred))))))) - (cond - ((string-match-p "\\`[0-9a-fA-F]+\\'" input) - (string-to-number input 16)) - ((string-match-p "\\`#" input) - (read input)) - (t - (cdr (assoc-string input (ucs-names) t)))))) + (complete-with-action action (ucs-names) string pred)))))) + (char + (cond + ((string-match-p "\\`[0-9a-fA-F]+\\'" input) + (string-to-number input 16)) + ((string-match-p "\\`#" input) + (read input)) + (t + (cdr (assoc-string input (ucs-names) t)))))) + (unless (characterp char) + (error "Invalid character")) + char)) (define-obsolete-function-alias 'ucs-insert 'insert-char "24.3") (define-key ctl-x-map "8\r" 'insert-char) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-12-20 16:09:05 +0000 +++ src/ChangeLog 2012-12-21 07:51:33 +0000 @@ -1,3 +1,8 @@ +2012-12-21 Chong Yidong + + * editfns.c (Finsert_char): Since read-char-by-name now signals an + error for invalid chars, don't check for a nil return value. + 2012-12-20 Dmitry Antipov Avoid calls to CHAR_TO_BYTE if byte position is known. === modified file 'src/editfns.c' --- src/editfns.c 2012-12-20 16:09:05 +0000 +++ src/editfns.c 2012-12-21 07:51:33 +0000 @@ -2361,10 +2361,9 @@ } DEFUN ("insert-char", Finsert_char, Sinsert_char, 1, 3, - "(list (or (read-char-by-name \"Insert character (Unicode name or hex): \")\ - (error \"You did not specify a valid character\"))\ - (prefix-numeric-value current-prefix-arg)\ - t))", + "(list (read-char-by-name \"Insert character (Unicode name or hex): \")\ + (prefix-numeric-value current-prefix-arg)\ + t))", doc: /* Insert COUNT copies of CHARACTER. Interactively, prompt for CHARACTER. You can specify CHARACTER in one of these ways: ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.