From: Glenn Morris <rgm@gnu.org>
Date: Sat, 15 Dec 2018 23:19:25 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~3990
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e2fb82e5f187614bd6997a3ace72d07bba4f1ab;p=emacs.git

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
---

2e2fb82e5f187614bd6997a3ace72d07bba4f1ab
diff --cc test/lisp/epg-tests.el
index 69c3838f0ae,f2cc351d70b..68350273681
--- a/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-----