Merge branch 'master' of https://github.com/emacs-mirror/emacs into pgtk

Author: Yuuki Harano

doc/emacs/dired.texi

@@ -654,10 +654,15 @@ commands, use the same conventions to decide which files to work on.
   Commands which ask for a destination directory, such as those which
 copy and rename files or create links for them, try to guess the default
 target directory for the operation.  Normally, they suggest the Dired
-buffer's default directory, but if the variable @code{dired-dwim-target}
-is non-@code{nil}, and if there is another Dired buffer displayed in one
-of the most recently used windows, that other buffer's directory is
-suggested instead.
+buffer's default directory, but if the option @code{dired-dwim-target}
+is non-@code{nil}, and if there is another Dired buffer displayed in
+some window, that other buffer's directory is suggested instead.
+You can customize @code{dired-dwim-target} to prefer either the next
+window with a Dired buffer, or the most recently used window with
+a Dired buffer, or to use any other function.  When the value is
+a function, it will be called with no arguments and is expected to
+return a list of directories which will be used as defaults
+(i.e. default target and ``future history'').
 
   Here are the file-manipulating Dired commands that operate on files.
 

doc/emacs/emacs.texi

@@ -3,28 +3,21 @@
 @setfilename ../../info/emacs.info
 @settitle GNU Emacs Manual
 @include docstyle.texi
-
-@c The edition number appears in more than one place in this file
-@c I don't really know what it means...
-@c For example, it has said "Sixteenth" since sometime in the Emacs 22
-@c series, all through 23, and into 24.  So it is not very useful IMO,
-@c and offers nothing that EMACSVER does not.  I guess it relates
-@c mainly to the published book sold by the FSF.  Hence no longer
-@c bother including it except iftex.  Really, I think it should not be
-@c here at all (since anyone can make a pdf version), but should just
-@c be something added by the FSF during the publishing process.
-@c Also, the lispref uses a float (3.0), whereas this uses an ordinal,
-@c so the format is not even consistent.
-@set EDITION   Seventeenth
 @include emacsver.texi
 
+@c When printing, define EDITION to be the printed edition number, in
+@c the preferred style for ordinal edition numbers.  E.g., run the
+@c shell command "texi2any -D 'EDITION Nineteenth'" for the 19th
+@c printed edition where the edition number is spelled out in English.
+@c This relates mainly to the published book sold by the FSF.
+
 @copying
-@iftex
+@ifset EDITION
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
-@end iftex
-@ifnottex
+@end ifset
+@ifclear EDITION
 This is the @cite{GNU Emacs Manual},
-@end ifnottex
+@end ifclear
 updated for Emacs version @value{EMACSVER}.
 
 Copyright @copyright{} 1985--1987, 1993--2019 Free Software Foundation, Inc.
@@ -82,7 +75,12 @@ developing GNU and promoting software freedom.''
 @sp 6
 @center @titlefont{GNU Emacs Manual}
 @sp 4
+@ifset EDITION
 @center @value{EDITION} Edition, Updated for Emacs Version @value{EMACSVER}.
+@end ifset
+@ifclear EDITION
+@center Updated for Emacs Version @value{EMACSVER}
+@end ifclear
 @sp 5
 @center Richard Stallman et al.
 @page

doc/emacs/maintaining.texi

@@ -963,6 +963,10 @@ Display the changes that a ``pull'' operation will retrieve
 @item C-x v O
 Display the changes that will be sent by the next ``push'' operation
 (@code{vc-log-outgoing}).
+
+@item C-x v h
+Display the history of changes made in the region of file visited by
+the current buffer (@code{vc-region-history}).
 @end table
 
 @kindex C-x v l
@@ -1068,20 +1072,20 @@ buffer.  However, RCS, SCCS, CVS, and SRC do not support this feature.
 
 @kindex C-x v h
 @findex vc-region-history
-A useful variant of examining changes is provided by the command
+A useful variant of examining history of changes is provided by the command
 @kbd{vc-region-history} (by default bound to @kbd{C-x v h}), which shows
-a @file{*VC-history*} buffer with the history of changes to the region
-of the current file between point and the mark (@pxref{Mark}).  The
+a @file{*VC-history*} buffer with the history of changes made in the region
+of the current buffer's file between point and the mark (@pxref{Mark}).  The
 history of changes includes the commit log messages and also the
 changes themselves in the Diff format.
 
-Invoke this command after marking the region of the current file in
+Invoke this command after marking in the current buffer the region in
 whose changes you are interested.  In the @file{*VC-history*} buffer
 it pops up, you can use all of the commands available in the
 @file{*vc-change-log*} buffer described above, and also the commands
 defined by Diff mode (@pxref{Diff Mode}).
 
-This command is currently available only with Git.
+This command is currently available only with Git and Mercurial (hg).
 
 @node VC Undo
 @subsection Undoing Version Control Actions

doc/lispintro/emacs-lisp-intro.texi

@@ -63,10 +63,6 @@
 \global\hbadness=6666 % don't worry about not-too-underfull boxes
 @end tex
 
-@c These refer to the printed book sold by the FSF.
-@set edition-number 3.10
-@set update-date 28 October 2009
-
 @c For next or subsequent edition:
 @c   create function using with-output-to-temp-buffer
 @c   create a major mode, with keymaps
@@ -102,16 +98,24 @@
 * Emacs Lisp Intro: (eintr).    A simple introduction to Emacs Lisp programming.
 @end direntry
 
+@c When printing, define edition-number to be the printed edition
+@c number, titlepage-edition-number to be the spelled out edition
+@c number suitable for the title page, and update-date to be the date,
+@c in the preferred style for these.  E.g., run the shell command:
+@c   texi2any -D 'edition-number 3.11' \
+@c            -D 'titlepage-edition-number Revised Third Edtion' \
+@c            -D 'update-date 31 March 2020'
+@c This relates mainly to the published book sold by the FSF.
+
 @copying
 This is @cite{An Introduction to Programming in Emacs Lisp}, for
 people who are not programmers.
 @sp 1
-@iftex
+@ifset edition-number
 Edition @value{edition-number}, @value{update-date}
-@end iftex
-@ifnottex
+@end ifset
+@sp 1
 Distributed with Emacs version @value{EMACSVER}.
-@end ifnottex
 @sp 1
 Copyright @copyright{} 1990--1995, 1997, 2001--2019 Free Software
 Foundation, Inc.
@@ -173,7 +177,9 @@ supports it in developing GNU and promoting software freedom.''
 @sp 2
 @center @titlefont{Programming in Emacs Lisp}
 @sp 2
-@center Revised Third Edition
+@ifset titlepage-edition-number
+@center @value{titlepage-edition-number}
+@end ifset
 @sp 4
 @center by Robert J. Chassell
 

doc/lispref/commands.texi

@@ -2501,6 +2501,9 @@ and key sequences read from keyboard macros being executed.
   The lowest level functions for command input are @code{read-event},
 @code{read-char}, and @code{read-char-exclusive}.
 
+If you need a function to read a character using the minibuffer, use
+@code{read-char-from-minibuffer} (@pxref{Multiple Queries}).
+
 @defun read-event &optional prompt inherit-input-method seconds
 This function reads and returns the next event of command input,
 waiting if necessary until an event is available.

doc/lispref/edebug.texi

@@ -231,8 +231,10 @@ evaluating forms that never instrument them: from a file with
 (@kbd{M-:}).
 
 @findex edebug-remove-instrumentation
-  If you want to remove Edebug instrumentation from all functions, you
-can use the @code{edebug-remove-instrumentation} command.
+  A different way to remove the instrumentation from a definition is
+to use the @code{edebug-remove-instrumentation} command.  It also
+allows removing the instrumentation from everything that has been
+instrumented.
 
   @xref{Edebug Eval}, for other evaluation functions available
 inside of Edebug.

doc/lispref/elisp.texi

@@ -52,12 +52,7 @@
 @end ifset
 @end tex
 
-
-@c Version of the manual and of Emacs.
-@c (See comments for EDITION in emacs.texi)
-@set VERSION  3.1
 @include emacsver.texi
-@set DATE October 2014
 
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  The manual should go
@@ -90,13 +85,18 @@
 @c We use the "type index" to index new functions and variables.
 @c @syncodeindex tp fn
 
+@c When printing, define VERSION to be the printed edition number and
+@c DATE to be the printed edition's date.  E.g., run the shell command
+@c "texi2any -D 'VERSION 3.2' -D 'DATE 31 March 2020'".  This relates
+@c mainly to the published book sold by the FSF.
+
 @copying
-@iftex
+@ifset VERSION
 This is edition @value{VERSION} of the @cite{GNU Emacs Lisp Reference Manual},@*
-@end iftex
-@ifnottex
+@end ifset
+@ifclear VERSION
 This is the @cite{GNU Emacs Lisp Reference Manual}
-@end ifnottex
+@end ifclear
 corresponding to Emacs version @value{EMACSVER}.
 
 Copyright @copyright{} 1990--1996, 1998--2019 Free Software Foundation, Inc.
@@ -127,7 +127,9 @@ developing GNU and promoting software freedom.''
 @subtitle @value{voltitle}
 @end ifset
 @subtitle For Emacs Version @value{EMACSVER}
+@ifset VERSION
 @subtitle Revision @value{VERSION}, @value{DATE}
+@end ifset
 
 @author by Bil Lewis, Dan LaLiberte, Richard Stallman,
 @author the GNU Manual Group, et al.

doc/lispref/functions.texi

@@ -453,7 +453,8 @@ after a @code{&rest} argument.
 
 @node Function Documentation
 @subsection Documentation Strings of Functions
-@cindex documentation of function
+@cindex documentation string of function
+@cindex function's documentation string
 
   A lambda expression may optionally have a @dfn{documentation string}
 just after the lambda list.  This string does not affect execution of

doc/lispref/minibuf.texi

@@ -2253,16 +2253,12 @@ Here is an example of using this function:
 @end lisp
 @end defun
 
-If you need a function to read a character like @code{read-char} or
-@code{read-char-choice} (@pxref{Reading One Event}) but using the
-minibuffer, use @code{read-char-from-minibuffer}.
-
 @defun read-char-from-minibuffer prompt &optional chars history
 This function uses the minibuffer to read and return a single
 character.  Optionally, it ignores any input that is not a member of
 @var{chars}, a list of accepted characters.  The @var{history}
-argument specifies the history list symbol to use; if is omitted or
-@code{nil}, it doesn't use the history.
+argument specifies the history list symbol to use; if it is omitted or
+@code{nil}, this function doesn't use the history.
 @end defun
 
 @node Reading a Password

doc/lispref/objects.texi

@@ -123,6 +123,9 @@ Objects that have no read syntax are presented like this
 The printed representation of an interned symbol whose name is an
 empty string (@pxref{Symbol Type}).
 
+@item #'
+This is a shortcut for @code{function}, see @ref{Anonymous Functions}.
+
 @item #:
 The printed representation of an uninterned symbol whose name is
 @var{foo} is @samp{#:@var{foo}} (@pxref{Symbol Type}).