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

diff --cc doc/lispref/lists.texi
Simple merge

diff --cc src/ftcrfont.c
Simple merge

diff --cc src/ftfont.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xftfont.c
Simple merge

diff --cc test/lisp/epg-tests.el
index 69c3838f0ae11fb40c49f39fc0150cd6541765cb,f2cc351d70b2f9d9c956da1b85a7aff1dc1ade25..683502736814ea62c8d607ffdb0351e512cf9091
--- 1/test/lisp/epg-tests.el
--- 2/test/lisp/epg-tests.el
+++ b/test/lisp/epg-tests.el
@@@ -107,7 -85,10 +107,9 @@@
         (delete-directory epg-tests-home-directory t)))))
  
  (ert-deftest epg-decrypt-1 ()
 -  (skip-unless (epg-tests-find-usable-gpg-configuration 'require-passphrase))
    (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-----