mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-12 16:23:57 +00:00
Code Issues Releases Activity

Merge from origin/emacs-25

Browse Source 
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'
This commit is contained in:
Paul Eggert 2016-12-07 12:41:05 -08:00
commit 99e20f105a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/emacs/programs.texi
View File

@ -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
@ -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)}

2
lisp/vc/ediff-util.el
View File

@ -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."