Merge from origin/emacs-26

fa953b5 (origin/emacs-26) Fix an epg test for recent GnuPG versions (...
3015636 Document font structure layout constraints
f14d574 Document font structure layout constraints
f519aa1 Fix display of line numbers in empty lines beyond EOB
24b5026 Fix redisplay when a window's scroll bar or fringes are changed
5d1b158 Tiny markup fix in Elisp manual

1 files changed, 1 insertions, 1 deletions

diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi
index 1548dd49b2f..69f93009520 100644
--- a/doc/lispref/lists.texi
+++ b/doc/lispref/lists.texi
@@ -656,7 +656,7 @@ resulting list.  Instead, the sequence becomes the final @sc{cdr}, like
 any other non-list final argument.
 
 @defun copy-tree tree &optional vecp
-This function returns a copy of the tree @code{tree}.  If @var{tree} is a
+This function returns a copy of the tree @var{tree}.  If @var{tree} is a
 cons cell, this makes a new cons cell with the same @sc{car} and
 @sc{cdr}, then recursively copies the @sc{car} and @sc{cdr} in the
 same way.