From: Eli Zaretskii Date: Tue, 16 Apr 2019 15:27:37 +0000 (+0300) Subject: Fix confusing wording in the user manual X-Git-Tag: emacs-26.2.90~100 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f5568ea7c1e6952986dd03ef642a20e87736138;p=emacs.git Fix confusing wording in the user manual * doc/emacs/maintaining.texi (VC Undo): Remove a potentially inaccurate, outdated, and/or confusing sentence. (Bug#35290) --- diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index cddffd6f2a5..93dbce47595 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1084,8 +1084,7 @@ started editing, and asks for confirmation for discarding the changes. If you agree, the fileset is reverted. If you don't want @kbd{C-x v u} to show a diff, set the variable @code{vc-revert-show-diff} to @code{nil} (you can still view the diff directly with @kbd{C-x v =}; -@pxref{Old Revisions}). Note that @kbd{C-x v u} cannot be reversed -with the usual undo commands (@pxref{Undo}), so use it with care. +@pxref{Old Revisions}). On locking-based version control systems, @kbd{C-x v u} leaves files unlocked; you must lock again to resume editing. You can also use