[Emacs-diffs] master 99e20f1 13/18: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit 99e20f105aa8a33ca9e70b741400a46447a287af
Merge: e22eabd ba2847f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    ba2847f ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change.  ...
    8b43f97 * lisp/vc/ediff-util.el (ediff-janitor): Doc fix.  (Bug#25046)
    c20035c ; * doc/emacs/programs.texi (Man Page): Fix last change.
    93d8346 Improve indexing of 'man'
---
 doc/emacs/programs.texi |    8 ++++----
 lisp/vc/ediff-util.el   |    2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index e409aff..3c80228 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1193,7 +1193,7 @@ replace man pages with better-organized manuals that you 
can browse
 with Info (@pxref{Misc Help}).  This process is not finished, so it is
 still useful to read manual pages.
 
address@hidden manual-entry
address@hidden man
   You can read the man page for an operating system command, library
 function, or system call, with the @kbd{M-x man} command.  This
 prompts for a topic, with completion (@pxref{Completion}), and runs
@@ -1210,11 +1210,11 @@ mode buffer.
 named by a digit or by a digit and a letter.  Sometimes there are man
 pages with the same name in different sections.  To read a man page
 from a specific section, type @address@hidden(@var{section})} or
address@hidden@var{section} @var{topic}} when @kbd{M-x manual-entry} prompts
-for the topic.  For example, the man page for the C library function
address@hidden@var{section} @var{topic}} when @kbd{M-x man} prompts for the
+topic.  For example, the man page for the C library function
 @code{chmod} is in section 2, but there is a shell command of the same
 name, whose man page is in section 1; to view the former, type
address@hidden manual-entry @key{RET} chmod(2) @key{RET}}.
address@hidden@kbd{M-x man @key{RET} chmod(2) @key{RET}}}.
 
 @vindex Man-switches
 @kindex M-n @r{(Man mode)}
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 99672fc..3120147 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -2626,6 +2626,8 @@ temporarily reverses the meaning of this variable."
   "Kill buffers A, B, and, possibly, C, if these buffers aren't modified.
 In merge jobs, buffer C is not deleted here, but rather according to
 ediff-quit-merge-hook.
+ASK non-nil means ask the user whether to keep each unmodified buffer, unless
+KEEP-VARIANTS is non-nil, in which case buffers are never killed.
 A side effect of cleaning up may be that you should be careful when comparing
 the same buffer in two separate Ediff sessions: quitting one of them might
 delete this buffer in another session as well."