Merge branch 'master' into harfbuzz

3 files changed, 18 insertions, 5 deletions

diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index 173b63670fc..5349de055ed 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -1,4 +1,4 @@
-;;; Test GNU Emacs modules.
+;;; emacs-module-tests --- Test GNU Emacs modules.  -*- lexical-binding: t; -*-
 
 ;; Copyright 2015-2019 Free Software Foundation, Inc.
 
@@ -17,6 +17,14 @@
 ;; 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:
+
+;; Unit tests for the dynamic module facility.  See Info node `(elisp)
+;; Writing Dynamic Modules'.  These tests make use of a small test
+;; module in test/data/emacs-module.
+
+;;; Code:
+
 (require 'cl-lib)
 (require 'ert)
 (require 'help-fns)
@@ -137,8 +145,9 @@ changes."
 ;;
 
 (defun multiply-string (s n)
+  "Return N copies of S concatenated together."
   (let ((res ""))
-    (dotimes (i n)
+    (dotimes (_ n)
       (setq res (concat res s)))
     res))
 
@@ -304,7 +313,7 @@ Interactively, you can try hitting \\[keyboard-quit] to quit."
                          ;; Interactively, run for 5 seconds to give the
                          ;; user time to quit.  In batch mode, run only
                          ;; briefly since the user can't quit.
-                         (float-time (time-add nil (if noninteractive 0.1 5)))
+                         (time-add nil (if noninteractive 0.1 5))
                          ;; should_quit or process_input
                          arg))
                       'finished))
diff --git a/test/src/lcms-tests.el b/test/src/lcms-tests.el
index f1d1110283d..d92ebcbeab5 100644
--- a/test/src/lcms-tests.el
+++ b/test/src/lcms-tests.el
@@ -2,8 +2,6 @@
 
 ;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
 
-;; Maintainer: emacs-devel@gnu.org
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/test/src/timefns-tests.el b/test/src/timefns-tests.el
index 5c858ef3bd8..2c90af757f0 100644
--- a/test/src/timefns-tests.el
+++ b/test/src/timefns-tests.el
@@ -142,3 +142,9 @@
                       (< 0.99 (/ x y) 1.01)
                       (< 0.99 (/ (- (float-time a)) (float-time b))
                          1.01))))))))
+
+(ert-deftest encode-time-dst-numeric-zone ()
+    "Check for Bug#35502."
+    (should (time-equal-p
+             (encode-time '(29 31 17 30 4 2019 2 t 7200))
+             '(23752 27217))))