Merge from origin/emacs-25

2317c61 Fix last todo-mode change
5d4d8a3 Improve last todo-mode fix
d7084f2 Fix todo-mode use of minibuffer completion keymap (bug#23695).
27dec52 * src/alloc.c (ALIGN): Avoid error on DragonFly BSD.  (Bug#23...
f526191 * lisp/emacs-lisp/nadvice.el (advice--make-docstring): Avoid ...
e881070 * lisp/help-fns.el (describe-function-1): Avoid reporting adv...
d308aa1 Minor grammar fix (bug#23746)
20de667 Doc fixes for grammar and typos (bug#23746)
a67a4e5 * doc/lispref/processes.texi (Process Buffers): Minor rewordi...
27f440e Add cross-reference to ELisp manual
10802d8 ; make change-history-commit
4b2d77d * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bu...
12e009e Restore initial undo boundary with viper
291fe0a Revert "Fix viper undo breakage from undo-boundary changes"
6921f4a Fix dbus crash on 32-bit Cygwin

11 files changed, 22 insertions, 22 deletions

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index ec227e9c2c9..f195a41d542 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -701,7 +701,7 @@ after it visits the file.  (This marks the buffer as modified, and you
 can undo it.)  If the value is @code{visit-save}, Emacs adds such
 newlines both on visiting and on saving.  If the value is @code{nil},
 Emacs leaves the end of the file unchanged; any other non-@code{nil}
-value means to asks you whether to add a newline.  The default is
+value means Emacs asks you whether to add a newline.  The default is
 @code{nil}.
 
 @vindex mode-require-final-newline
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index a7e709f9221..7e6006262ce 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1011,7 +1011,7 @@ scroll bar height, change the @code{scroll-bar-height} frame parameter
 
   On graphical displays, you can use @dfn{window dividers} in order to
 separate windows visually.  Window dividers are bars that can be dragged
-with the mouse, thus allowing to easily resize adjacent windows.
+with the mouse, thus allowing you to easily resize adjacent windows.
 
 @findex window-divider-mode
   To toggle the display of window dividers, use the command @kbd{M-x
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index b614ed221a0..94e1f198f2b 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1923,7 +1923,7 @@ Like @code{lpr-buffer} but print only the current region.
 @findex lpr-region
 @vindex lpr-switches
 @vindex lpr-commands
-  On most operating system, the above hardcopy commands submit files
+  On most operating systems, the above hardcopy commands submit files
 for printing by calling the @command{lpr} program.  To change the
 printer program, customize the variable @code{lpr-command}.  To
 specify extra switches to give the printer program, customize the list
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 2048e28d959..46756d0ddd6 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -1977,7 +1977,7 @@ in @code{event-modifiers}.  For example:
 
 @defun mouse-movement-p object
 This function returns non-@code{nil} if @var{object} is a mouse movement
-event.
+event.  @xref{Motion Events}.
 @end defun
 
 @defun event-convert-list list
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index c943a6a29c1..f6cd0229c4d 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -438,7 +438,7 @@ Emacs commands for operating on compiler output can be used on these
 messages.
 
   When an error is due to invalid syntax in the program, the byte
-compiler might get confused about the errors' exact location.  One way
+compiler might get confused about the error's exact location.  One way
 to investigate is to switch to the buffer @w{@file{ *Compiler
 Input*}}.  (This buffer name starts with a space, so it does not show
 up in the Buffer Menu.)  This buffer contains the program being
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 9abbd898d91..35d9d0c9654 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1382,7 +1382,7 @@ default global map.
   The function @code{substitute-key-definition} scans a keymap for
 keys that have a certain binding and rebinds them with a different
 binding.  Another feature which is cleaner and can often produce the
-same results to remap one command into another (@pxref{Remapping
+same results is to remap one command into another (@pxref{Remapping
 Commands}).
 
 @defun substitute-key-definition olddef newdef keymap &optional oldmap
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index d2d38d7fb5e..81a1922d71c 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -848,8 +848,8 @@ loaded, into the current Emacs session.  This means that the facilities
 associated with @var{feature} are or will be available for other Lisp
 programs.
 
-The direct effect of calling @code{provide} is if not already in
-@var{features} then to add @var{feature} to the front of that list and
+The direct effect of calling @code{provide} is to add @var{feature} to
+the front of @code{features} if it is not already in that list and
 call any @code{eval-after-load} code waiting for it (@pxref{Hooks for
 Loading}).  The argument @var{feature} must be a symbol.
 @code{provide} returns @var{feature}.
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index 1c904666cb4..1b4d74fb257 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -340,10 +340,10 @@ text is inserted at its position.  If @var{type} is @code{nil},
 This function reports the current insertion type of @var{marker}.
 @end defun
 
-Most functions that create markers, without an argument allowing to
-specify the insertion type, create them with insertion type
-@code{nil}.  Also, the mark has, by default, insertion type
-@code{nil}.
+All functions that create markers without accepting an argument that
+specifies the insertion type, create them with insertion type
+@code{nil} (@pxref{Creating Markers}).  Also, the mark has, by
+default, insertion type @code{nil}.
 
 @node Moving Markers
 @section Moving Marker Positions
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 7b76e6af9c3..1285c1c69e6 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -913,7 +913,7 @@ follow these conventions: they may run the parent's mode hook too early,
 or fail to run @code{after-change-major-mode-hook}.  If you encounter
 such a major mode, please correct it to follow these conventions.
 
-  When you defined a major mode using @code{define-derived-mode}, it
+  When you define a major mode using @code{define-derived-mode}, it
 automatically makes sure these conventions are followed.  If you
 define a major mode ``by hand'', not using @code{define-derived-mode},
 use the following functions to handle these conventions automatically.
@@ -1066,7 +1066,7 @@ to invert the sort order.
 @defun tabulated-list-init-header
 This function computes and sets @code{header-line-format} for the
 Tabulated List buffer (@pxref{Header Lines}), and assigns a keymap to
-the header line to allow sort entries by clicking on column headers.
+the header line to allow sorting entries by clicking on column headers.
 
 Modes derived from Tabulated List mode should call this after setting
 the above variables (in particular, only after setting
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index e3346aa3a5b..f859b3adde4 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -506,7 +506,7 @@ inputinput@point{}
 @defun call-process-shell-command command &optional infile destination display
 This function executes the shell command @var{command} synchronously.
 The arguments are handled as in @code{call-process}.  An old calling
-convention allowed to pass any number of additional arguments after
+convention allowed passing any number of additional arguments after
 @var{display}, which were concatenated to @var{command}; this is still
 supported, but strongly discouraged.
 @end defun
@@ -515,7 +515,7 @@ supported, but strongly discouraged.
 This function is like @code{call-process-shell-command}, but uses
 @code{process-file} internally.  Depending on @code{default-directory},
 @var{command} can be executed also on remote hosts.  An old calling
-convention allowed to pass any number of additional arguments after
+convention allowed passing any number of additional arguments after
 @var{display}, which were concatenated to @var{command}; this is still
 supported, but strongly discouraged.
 @end defun
@@ -1382,10 +1382,10 @@ subprocess with a @code{SIGHUP} signal (@pxref{Signals to Processes}).
 @end defun
 
 If the process's buffer is displayed in a window, your Lisp program
-may wish telling the process the dimensions of that window, so that
+may wish to tell the process the dimensions of that window, so that
 the process could adapt its output to those dimensions, much as it
-adapts to the screen dimensions.  The following functions allow to
-communicate this kind of information to processes; however, not all
+adapts to the screen dimensions.  The following functions allow
+communicating this kind of information to processes; however, not all
 systems support the underlying functionality, so it is best to provide
 fallbacks, e.g., via command-line arguments or environment variables.
 
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 0b7759347fc..43d4945b685 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1376,10 +1376,10 @@ before executing each key sequence, so that each undo normally undoes
 the effects of one command.  A few exceptional commands are
 @dfn{amalgamating}: these commands generally cause small changes to
 buffers, so with these a boundary is inserted only every 20th command,
-allowing to undo them as a group.  By default, commands
+allowing the changes to be undone as a group.  By default, the commands
 @code{self-insert-command}, which produces self-inserting input
-characters (@pxref{Commands for Insertion}), and @code{delete-char}
-which deletes characters (@pxref{Deletion}) are amalgamating.
+characters (@pxref{Commands for Insertion}), and @code{delete-char},
+which deletes characters (@pxref{Deletion}), are amalgamating.
 Where a command affects the contents of several buffers, as may happen,
 for example, when a function on the @code{post-command-hook} affects a
 buffer other than the @code{current-buffer}, then @code{undo-boundary}