Merge from origin/emacs-26

b3f4a3a (origin/emacs-26) Special-case %DUMBFW for GnuTLS between 3.2...
c2ae057 Work around GnuTLS version issues with %DUMBFW (tiny change)
2f9d9ef ; Remove the mention of "plain C code" in the docstring as well
aca827b Merge branch 'widen-less' into emacs-26
87548f5 ; Rephrase NEWS entry a bit
da0d773 (emacs-26) ; * lisp/erc/erc.el: Update URL.
3a60515 * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler...
471b6c1 ; Replace non-ascii quote characters in doc strings etc
7af7f5e Fix some more aliases to user options
79fb4b5 Fix some flymake aliases
b9fbc03 (origin/widen-less) Widen in indent-for-tab-command in the no...
446faf3 Replace the mention of c-indent-defun with js-indent-line
7e9eef0 Consolidate 'widen' calls

# Conflicts:
#	etc/NEWS
#	lisp/progmodes/flymake-proc.el

1 files changed, 2 insertions, 2 deletions

diff --git a/test/src/eval-tests.el b/test/src/eval-tests.el
index 7ff60dd01c4..15b2fdf9c4b 100644
--- a/test/src/eval-tests.el
+++ b/test/src/eval-tests.el
@@ -28,14 +28,14 @@
 (require 'ert)
 
 (ert-deftest eval-tests--bug24673 ()
-  "Checks that Bug#24673 has been fixed."
+  "Check that Bug#24673 has been fixed."
   ;; This should not crash.
   (should-error (funcall '(closure)) :type 'invalid-function))
 
 (defvar byte-compile-debug)
 
 (ert-deftest eval-tests--bugs-24912-and-24913 ()
-  "Checks that Emacs doesn’t accept weird argument lists.
+  "Check that Emacs doesn't accept weird argument lists.
 Bug#24912 and Bug#24913."
   (dolist (args '((&optional) (&rest) (&optional &rest) (&rest &optional)
                   (&optional &rest a) (&optional a &rest)