Merge from origin/emacs-27

44104a607a Fix error in GMP test
e26e63444d Add Feature testing for Windows binaries
4e2caef384 ; * src/character.c (str_as_multibyte): Fix the commentary.
d3a4ce8420 Revert "; * etc/NEWS: Remove temporary note on documentati...
16f00e36dc * admin/admin.el (set-version): Trap yet another NEWS error.
121be3e118 ; * etc/NEWS: Remove temporary note on documentation.  (Bu...
5fcb97dabd Fix cond jump table compilation (bug#42919)

2 files changed, 87 insertions, 2 deletions

diff --git a/etc/NEWS.27 b/etc/NEWS.27
index 31b69025173..5ef54309893 100644
--- a/etc/NEWS.27
+++ b/etc/NEWS.27
@@ -24,7 +24,6 @@ applies, and please also update docstrings as needed.
 
 * Installation Changes in Emacs 27.1
 
----
 ** Emacs now uses GMP, the GNU Multiple Precision library.
 By default, if 'configure' does not find a suitable libgmp, it
 arranges for the included mini-gmp library to be built and used.
@@ -58,7 +57,6 @@ that building with Cairo enabled results in using Pango instead of
 libXft for font support, and that Pango 1.44 has removed support for
 bitmapped fonts.
 
-+++
 ** Emacs now uses a "portable dumper" instead of unexec.
 This improves compatibility with memory allocation on modern systems,
 and in particular better supports the Address Space Layout
diff --git a/etc/w32-feature.el b/etc/w32-feature.el
new file mode 100644
index 00000000000..3c0f74175cf
--- /dev/null
+++ b/etc/w32-feature.el
@@ -0,0 +1,87 @@
+;;; w32-feature.el --- Check Availability of Emacs Features  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2020 Free Software Foundation, Inc.
+
+;; Author: Phillip Lord <phillip.lord@russet.org.uk>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file provides tests for various features of Emacs. It is
+;; designed to check whether bundled binary distributions of Emacs on
+;; windows are fully functional.
+
+;;; Code:
+(require 'ert)
+
+(ert-deftest feature-optimization ()
+  (should
+   (string-match-p "CFLAGS=-O2" system-configuration-options)))
+
+(ert-deftest feature-harfbuzz ()
+  (should
+   (eq
+    'harfbuzz
+    (car (frame-parameter nil 'font-backend)))))
+
+(ert-deftest feature-gnutls ()
+  (should (gnutls-available-p)))
+
+(ert-deftest feature-zlib ()
+  (should (zlib-available-p)))
+
+(ert-deftest feature-thread ()
+  (should (fboundp 'make-thread)))
+
+(ert-deftest feature-json ()
+  (should
+   (fboundp 'json-serialize)))
+
+(ert-deftest feature-gmp ()
+  (should
+   (string-match-p "GMP" system-configuration-features)))
+
+(ert-deftest feature-module ()
+  (should (fboundp 'module-load)))
+
+(ert-deftest feature-libxml ()
+  (should (libxml-available-p)))
+
+(ert-deftest feature-lcms2 ()
+  (should (lcms2-available-p)))
+
+(ert-deftest feature-xpm ()
+  (should (image-type-available-p 'xpm)))
+
+(ert-deftest feature-gif ()
+  (should (image-type-available-p 'gif)))
+
+(ert-deftest feature-png ()
+  (should (image-type-available-p 'png)))
+
+(ert-deftest feature-xpm ()
+  (should (image-type-available-p 'xpm)))
+
+(ert-deftest feature-jpeg ()
+  (should (image-type-available-p 'jpeg)))
+
+(ert-deftest feature-tiff ()
+  (should (image-type-available-p 'tiff)))
+
+(ert-deftest feature-svg ()
+  (should (image-type-available-p 'svg)))
+;;; feature.el ends here