From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 18 Aug 2017 06:33:11 +0000 (+0300)
Subject: ; Minor copyedits in manuals.
X-Git-Tag: emacs-26.0.90~431
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc5fba7aae4beb56d983e057cfc968856ffe53ae;p=emacs.git

; Minor copyedits in manuals.

* doc/lispref/variables.texi (Lexical Binding): The future is here.

* doc/emacs/files.texi (Copying and Naming): Use @w{..} around
constructs that could be split between lines, but shouldn't.
---

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 04d2fc1c999..9195bc47efe 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1556,10 +1556,14 @@ not accept wildcard file names.
 
 In all these commands, if the argument @var{new} is just a directory
 name, the real new name is in that directory, with the same
-non-directory component as @var{old}.  For example,
+non-directory component as @var{old}.  For example, the command
 @c FIXME: '/tmp' should be '/tmp/' because '/tmp'
 @c is not "just a directory name".
-@kbd{M-x rename-file @key{RET} ~/foo @key{RET} /tmp @key{RET}}
+@c And actually the fact that ``directory name'' must end in a slash
+@c is not explained anywhere in this manual.  Moreover, it many times
+@c uses ``directory name'' in contexts where the string it alludes to
+@c will clearly _not_ end in a slash
+@w{@kbd{M-x rename-file @key{RET} ~/foo @key{RET} /tmp @key{RET}}}
 renames @file{~/foo} to @file{/tmp/foo}.  All these
 commands ask for confirmation when the new file name already exists,
 too.
@@ -1586,8 +1590,8 @@ different file systems, the file @var{old} is copied and deleted.
 
 @ifnottex
   If a file is under version control (@pxref{Version Control}), you
-should rename it using @kbd{M-x vc-rename-file} instead of @kbd{M-x
-rename-file}.  @xref{VC Delete/Rename}.
+should rename it using @w{@kbd{M-x vc-rename-file}} instead of
+@w{@kbd{M-x rename-file}}.  @xref{VC Delete/Rename}.
 @end ifnottex
 
 @findex add-name-to-file
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 7650ed4e3d8..50739e6b5f1 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1017,11 +1017,11 @@ variables like @code{case-fold-search}:
 @subsection Lexical Binding
 
   Lexical binding was introduced to Emacs, as an optional feature, in
-version 24.1.  We expect its importance to increase in the future.
+version 24.1.  We expect its importance to increase with time.
 Lexical binding opens up many more opportunities for optimization, so
 programs using it are likely to run faster in future Emacs versions.
-Lexical binding is also more compatible with concurrency, which we
-want to add to Emacs in the future.
+Lexical binding is also more compatible with concurrency, which was
+added to Emacs in version 26.1.
 
   A lexically-bound variable has @dfn{lexical scope}, meaning that any
 reference to the variable must be located textually within the binding