From 93d83462889ed42bdc67b6c262813fa4f1d0af75 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 2 Dec 2016 11:10:04 +0200 Subject: [PATCH 1/4] Improve indexing of 'man' * doc/emacs/programs.texi (Man Page): Index 'man', not 'manual-entry', as the latter is an alias for the former. Suggested by Hong Xu . (Bug#25033) --- doc/emacs/programs.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index e409affd67d..4c382c16b7d 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. -@findex manual-entry +@findex 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 From c20035cd2bfc45bcecb52e51dea4ff8241d81b89 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 2 Dec 2016 11:14:11 +0200 Subject: [PATCH 2/4] ; * doc/emacs/programs.texi (Man Page): Fix last change. --- doc/emacs/programs.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 4c382c16b7d..3c802281207 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -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 @samp{@var{topic}(@var{section})} or -@samp{@var{section} @var{topic}} when @kbd{M-x manual-entry} prompts -for the topic. For example, the man page for the C library function +@samp{@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 -@kbd{M-x manual-entry @key{RET} chmod(2) @key{RET}}. +@w{@kbd{M-x man @key{RET} chmod(2) @key{RET}}}. @vindex Man-switches @kindex M-n @r{(Man mode)} From 8b43f97e2cfce5ffea4f56377b5a0f7a8f268484 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 2 Dec 2016 11:29:10 +0200 Subject: [PATCH 3/4] * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046) --- lisp/vc/ediff-util.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 5419d477810..81ba0e4a1f1 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -2625,6 +2625,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 killed unconditionally. 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." From ba2847f5a5c3a34274d564584ce6e1d1fbae6e85 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 2 Dec 2016 16:35:16 +0200 Subject: [PATCH 4/4] ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046) --- lisp/vc/ediff-util.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 81ba0e4a1f1..10b84fa8851 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -2626,7 +2626,7 @@ temporarily reverses the meaning of this variable." 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 killed unconditionally. +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."