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

7 files changed, 28 insertions, 8 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.
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index dc1a389c607..afe21b639fc 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -35,8 +35,9 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 struct ftcrfont_info
 {
   struct font font;
-  /* The following six members must be here in this order to be
-     compatible with struct ftfont_info (in ftfont.c).  */
+  /* The following members up to and including 'matrix' must be here
+     in this order to be compatible with struct ftfont_info (in
+     ftfont.c).  */
 #ifdef HAVE_LIBOTF
   bool maybe_otf;         /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
diff --git a/src/ftfont.c b/src/ftfont.c
index e83eff3ad08..44e0e626ee6 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -56,8 +56,9 @@ struct ftfont_info
 {
   struct font font;
 #ifdef HAVE_LIBOTF
-  /* The following four members must be here in this order to be
-     compatible with struct xftfont_info (in xftfont.c).  */
+  /* The following members up to and including 'matrix' must be here in
+     this order to be compatible with struct xftfont_info (in
+     xftfont.c).  */
   bool maybe_otf;       /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
 #endif  /* HAVE_LIBOTF */
diff --git a/src/window.c b/src/window.c
index 9da77ffc972..14b3364477e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7176,6 +7176,11 @@ set_window_fringes (struct window *w, Lisp_Object left_width,
       w->right_fringe_width = right;
       w->fringes_outside_margins = outside;
 
+      /* This is needed to trigger immediate redisplay of the window
+         when its fringes are changed, because fringes are redrawn
+         only if update_window is called, so we must trigger that even
+         if the window's glyph matrices did not change at all.  */
+      windows_or_buffers_changed = 35;
       return w;
     }
   else
@@ -7293,6 +7298,12 @@ set_window_scroll_bars (struct window *w, Lisp_Object width,
   wset_horizontal_scroll_bar_type (w, Qnil);
 #endif
 
+  /* This is needed to trigger immediate redisplay of the window when
+     scroll bars are changed, because scroll bars are redisplayed only
+     if more than a single window needs to be considered, see
+     redisplay_internal.  */
+  if (changed)
+    windows_or_buffers_changed = 31;
   return changed ? w : NULL;
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index cb21397e7b9..4201bdc4a75 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21242,7 +21242,10 @@ maybe_produce_line_number (struct it *it)
       if (lnum_face_id != current_lnum_face_id
           && (EQ (Vdisplay_line_numbers, Qvisual)
               ? this_line == 0
-              : this_line == it->pt_lnum))
+              : this_line == it->pt_lnum)
+          /* Avoid displaying the line-number-current-line face on
+             empty lines beyond EOB.  */
+          && it->what != IT_EOB)
         tem_it.face_id = current_lnum_face_id;
       else
         tem_it.face_id = lnum_face_id;
diff --git a/src/xftfont.c b/src/xftfont.c
index 85df0d857a2..86b8f222425 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -42,8 +42,9 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 struct xftfont_info
 {
   struct font font;
-  /* The following five members must be here in this order to be
-     compatible with struct ftfont_info (in ftfont.c).  */
+  /* The following members up to and including 'matrix' must be here
+     in this order to be compatible with struct ftfont_info (in
+     ftfont.c).  */
 #ifdef HAVE_LIBOTF
   bool maybe_otf;         /* Flag to tell if this may be OTF or not.  */
   OTF *otf;
@@ -51,6 +52,7 @@ struct xftfont_info
   FT_Size ft_size;
   int index;
   FT_Matrix matrix;
+
   Display *display;
   XftFont *xftfont;
   unsigned x_display_id;
diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el
index 69c3838f0ae..68350273681 100644
--- a/test/lisp/epg-tests.el
+++ b/test/lisp/epg-tests.el
@@ -108,6 +108,8 @@
 
 (ert-deftest epg-decrypt-1 ()
   (with-epg-tests (:require-passphrase t)
+    (with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory)
+      (insert "ignore-mdc-error"))
     (should (equal "test"
                    (epg-decrypt-string epg-tests-context "\
 -----BEGIN PGP MESSAGE-----