Control: tags -1 upstream fixed-upstream patch

On 2023-01-13 16:07:09 +0100, Vincent Lefevre wrote:
> The cause may be that we are now in 2023 and the above tests
> are expecting 2022. Instead of expecting 2022, shouldn't they
> expect the current year?

This is what upstream did in

commit da77d70deeb2798693ec4f28a291befeb8e43989
Author: Mattias Engdegård <matti...@acm.org>
Date:   2023-01-01 13:18:50 +0100

    ; * test/lisp/emacs-lisp/copyright-tests.el: Fix and future-safe.

I'm attaching this commit.

-- 
Vincent Lefèvre <vinc...@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)
commit da77d70deeb2798693ec4f28a291befeb8e43989
Author: Mattias Engdegård <matti...@acm.org>
Date:   2023-01-01 13:18:50 +0100

    ; * test/lisp/emacs-lisp/copyright-tests.el: Fix and future-safe.

diff --git a/test/lisp/emacs-lisp/copyright-tests.el b/test/lisp/emacs-lisp/copyright-tests.el
index ef531174617..5f8b5c67896 100644
--- a/test/lisp/emacs-lisp/copyright-tests.el
+++ b/test/lisp/emacs-lisp/copyright-tests.el
@@ -59,7 +59,8 @@ test-end-chop
                 "\nCopyright 2006, 2007, 2008 Foo Bar\n\n")
         (copyright-update)
         (buffer-substring (- (point-max) 42) (point-max))))
-    "Copyright 2006, 2007, 2008, 2022 Foo Bar\n\n")))
+    (format "Copyright 2006, 2007, 2008, %s Foo Bar\n\n"
+            (format-time-string "%Y")))))
 
 (ert-deftest test-correct-notice ()
   (should (equal
@@ -70,7 +71,8 @@ test-correct-notice
                    (copyright-query nil))
                (copyright-update))
              (buffer-string))
-           "Copyright 2021 FSF\nCopyright 2021, 2022 FSF\n")))
+           (format "Copyright 2021 FSF\nCopyright 2021, %s FSF\n"
+                   (format-time-string "%Y")))))
 
 (defmacro with-copyright-fix-years-test (orig result)
   `(let ((copyright-year-ranges t))

Reply via email to