From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lele Gaifax Newsgroups: gmane.emacs.bugs Subject: bug#53597: copyright-fix-years generates incorrect years ranges Date: Fri, 28 Jan 2022 09:18:47 +0100 Message-ID: <871r0s8e8o.fsf@metapensiero.it> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13882"; mail-complaints-to="usenet@ciao.gmane.io" To: 53597@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 28 09:20:22 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nDMUX-0003Mx-8M for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 28 Jan 2022 09:20:21 +0100 Original-Received: from localhost ([::1]:45784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDMUW-00058w-4C for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 28 Jan 2022 03:20:20 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:48348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDMUF-00055T-2h for bug-gnu-emacs@gnu.org; Fri, 28 Jan 2022 03:20:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36115) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nDMUE-0005Ag-Oj for bug-gnu-emacs@gnu.org; Fri, 28 Jan 2022 03:20:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nDMUE-0003hA-Kf for bug-gnu-emacs@gnu.org; Fri, 28 Jan 2022 03:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lele Gaifax Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 28 Jan 2022 08:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53597 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.164335797514144 (code B ref -1); Fri, 28 Jan 2022 08:20:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 28 Jan 2022 08:19:35 +0000 Original-Received: from localhost ([127.0.0.1]:57247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nDMTY-0003fm-Q5 for submit@debbugs.gnu.org; Fri, 28 Jan 2022 03:19:35 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:46982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nDMTW-0003fe-KJ for submit@debbugs.gnu.org; Fri, 28 Jan 2022 03:19:19 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:48214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDMTH-0004Tw-I3 for bug-gnu-emacs@gnu.org; Fri, 28 Jan 2022 03:19:04 -0500 Original-Received: from orphu.arstecnica.it ([178.63.97.204]:33940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDMTF-00054y-13 for bug-gnu-emacs@gnu.org; Fri, 28 Jan 2022 03:19:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=metapensiero.it; s=mail; t=1643357928; bh=UrJXBP76uKu6UKl9svSx7Ud4NxpqAsZhkKLRryLPaK0=; h=From:To:Subject:Date; b=CEaGS1BFU8SLiLVfN7bjfUOtQ5ZbnQVjTP/ubAex1GtQaRSrhryVhlz3CygDaVTuH T5Tefhv8/Z2RHda2o0EmaCxgkG2rnerzHLniJ3RpbgIZ3aoZjiQDaxXVBlA2HRWTuR GWpSQUCXtZwkk+xbRbS5SQevONixyWdV04A9jKM8= Received-SPF: pass client-ip=178.63.97.204; envelope-from=lele@metapensiero.it; helo=orphu.arstecnica.it X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:225419 Archived-At: --=-=-= Content-Type: text/plain Hi, I'm attaching a patch that describes and hopefully cures the problem I found in copyright-fix-years. All the best, ciao, lele. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-copyright-fix-years-use-a-dash-to-separate-years.patch >From 6b924868878d17974f0d289c6f9b6318bfc455ec Mon Sep 17 00:00:00 2001 From: Lele Gaifax Date: Fri, 28 Jan 2022 08:41:51 +0100 Subject: [PATCH] Fix copyright-fix-years, use a dash to separate years in a range Commit 7a46fa9c751f7c3147cd9b27fe84c1ce25419d3b, allowing en-dash as years separator, changed the way the years range is composed taking the separator from the `sep' variable instead of always using an hardwired hyphen. Since the code explicitly avoid to touch (that is, extend) existing ranges, that `sep' variable is almost always a space, or whatever character precedes the last parsed year, thus generating a range like "2020 2022" instead of "2020-2022". * lisp/emacs-lisp/copyright.el (copyright-fix-years): Always use an dash to separate years in a range. * test/lisp/emacs-lisp/copyright-tests.el (with-copyright-fix-years-test): (copyright-fix-years-tests--data): (text-copyright-fix-years): New test cases. --- lisp/emacs-lisp/copyright.el | 2 +- test/lisp/emacs-lisp/copyright-tests.el | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index 6b60097782..e5087672ae 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -313,7 +313,7 @@ copyright-fix-years (> prev-year first-year)) (goto-char range-end) (delete-region range-start range-end) - (insert (format "%c%d" sep prev-year)) + (insert (format "-%d" prev-year)) (goto-char p)) (setq first-year year range-start (point))))) diff --git a/test/lisp/emacs-lisp/copyright-tests.el b/test/lisp/emacs-lisp/copyright-tests.el index abb0913a0d..b00d697aa6 100644 --- a/test/lisp/emacs-lisp/copyright-tests.el +++ b/test/lisp/emacs-lisp/copyright-tests.el @@ -72,5 +72,25 @@ copyright-tests--data (buffer-string)) "Copyright 2021 FSF\nCopyright 2021, 2022 FSF\n"))) +(defmacro with-copyright-fix-years-test (orig result) + `(let ((copyright-year-ranges t)) + (with-temp-buffer + (insert ,orig) + (copyright-fix-years) + (should (equal (buffer-string) ,result))))) + +(defvar copyright-fix-years-tests--data + '((";; Copyright (C) 2008, 2010, 2012" + . ";; Copyright (C) 2008, 2010, 2012") + (";; Copyright (C) 2008, 2009, 2010, 2013, 2014, 2015, 2016, 2018" + . ";; Copyright (C) 2008-2010, 2013-2016, 2018") + (";; Copyright (C) 2008-2010, 2011, 2015, 2016, 2017" + . ";; Copyright (C) 2008-2010, 2011, 2015-2017"))) + +(ert-deftest text-copyright-fix-years () + "Test basics of \\[copyright-fix-years]." + (dolist (test copyright-fix-years-tests--data) + (with-copyright-fix-years-test (car test) (cdr test)))) + (provide 'copyright-tests) ;;; copyright-tests.el ends here -- 2.34.1 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 nickname: Lele Gaifax | Quando vivr=C3=B2 di quello che ho pensato ieri real: Emanuele Gaifas | comincer=C3=B2 ad aver paura di chi mi copia. lele@metapensiero.it | -- Fortunato Depero, 1929. --=-=-=--