From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: npostavs@users.sourceforge.net Newsgroups: gmane.emacs.bugs Subject: bug#25157: 26.0.50; whitespace-cleanup does not remove single trailing empty line anymore Date: Tue, 20 Dec 2016 23:07:56 -0500 Message-ID: <878tr9c4bn.fsf@users.sourceforge.net> References: <8760mr26dr.fsf@openmailbox.org> <87eg13b4jk.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1482293241 28729 195.159.176.226 (21 Dec 2016 04:07:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 21 Dec 2016 04:07:21 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: Mark Karpov , 25157@debbugs.gnu.org To: Reuben Thomas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 21 05:07:15 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cJYBK-00063t-R6 for geb-bug-gnu-emacs@m.gmane.org; Wed, 21 Dec 2016 05:07:11 +0100 Original-Received: from localhost ([::1]:54766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cJYBP-0006nu-2F for geb-bug-gnu-emacs@m.gmane.org; Tue, 20 Dec 2016 23:07:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cJYBG-0006nf-4Y for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2016 23:07:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cJYBC-0005uY-Sj for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2016 23:07:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34143) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cJYBC-0005uN-NK for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2016 23:07:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cJYBC-0002By-Hx for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2016 23:07:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: npostavs@users.sourceforge.net Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 21 Dec 2016 04:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25157 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 25157-submit@debbugs.gnu.org id=B25157.14822932228419 (code B ref 25157); Wed, 21 Dec 2016 04:07:02 +0000 Original-Received: (at 25157) by debbugs.gnu.org; 21 Dec 2016 04:07:02 +0000 Original-Received: from localhost ([127.0.0.1]:49542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cJYBB-0002Bj-KM for submit@debbugs.gnu.org; Tue, 20 Dec 2016 23:07:01 -0500 Original-Received: from mail-it0-f41.google.com ([209.85.214.41]:38379) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cJYB9-0002BK-N4 for 25157@debbugs.gnu.org; Tue, 20 Dec 2016 23:07:00 -0500 Original-Received: by mail-it0-f41.google.com with SMTP id x2so41912481itf.1 for <25157@debbugs.gnu.org>; Tue, 20 Dec 2016 20:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=KIjGvG+1zyS59PQ2P6tFlkSEfOreaTfI8skcXxOcGhk=; b=phnxV+CvpIfC5ewI2yOVyiEW5bPQjGDcc+H9PAM/LLiYORAb+agzCyEw5zzckd00nr C0EK3NA1XTTRTJBpP0ulqF4XsMrwE03enue/KNCRVzg4h9wudGBbjJUMn/0bq2vM1qqy 4sxhCyrOPvtTq+GyAjEBwDkTRhuJnhOW6vapW61Tb0YvGs6GX70ZHi6AUyfc4KjcNeks seYudk3+YRtC3sbaVqGOd3xWdCko5zg6TcHTTCBRDH3kp+igIB16CKzawfytu6zvQ3vj aqRsGuPlXqOqQfjbqwWdt4pszl/7AAOf9FRfSbwc7xeTKP0XjfUXTwdn+Rlv4yYcpY9D nIqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=KIjGvG+1zyS59PQ2P6tFlkSEfOreaTfI8skcXxOcGhk=; b=Nj/RwMV9eIb72O7c16S/psxQuhEEHZ1SpB6y6v8FxCavwnMU6njfZISwcdaNNC/cME zNR/0xHRBaVvDDZBusxoSuS2dRvKcT8yGM/MmCziRR3lY/pPep5Sksucumu0p617BDdN Q0m9k848INRIzYvUQvCiRI8C//u4LCOoRw6E4LwY78dQOOupN7Hfiry1cp8JQiRcfKjB kz9bPddLrVtjlx/4OnxzedYn9vGUyLNjrxXhTGUhmUeSVhz6//qX+U62ZzFUvda9nhi3 UcXT7BNfzWME0mM2cNL1wXStMmqNU9PUGCufRcIwOkZ/OW94eW1rZdLV/EK7ct6dT8iA dSDA== X-Gm-Message-State: AIkVDXJMIIA5XNyokvxPTuvb/Im9ZD2DzSDLrQIT9582qyBqwJn6OESRf6V7Rz5WeWv3pQ== X-Received: by 10.36.11.65 with SMTP id 62mr1778725itd.118.1482293214219; Tue, 20 Dec 2016 20:06:54 -0800 (PST) Original-Received: from zony ([45.2.7.65]) by smtp.googlemail.com with ESMTPSA id k205sm10151670ita.15.2016.12.20.20.06.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Dec 2016 20:06:53 -0800 (PST) In-Reply-To: (Reuben Thomas's message of "Tue, 20 Dec 2016 18:37:29 +0000") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:127279 Archived-At: --=-=-= Content-Type: text/plain Reuben Thomas writes: > > Given my previous error of reasoning, I'm submitting the above for your consideration before I prepare a patch! Sorry I didn't get around to looking at this before you wrote a patch, but I think you're overthinking this. AFAICT, your first fix (in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24745#5) was right. Here's a patch with some tests, let me know if I missed any cases. --=-=-= Content-Type: text/plain Content-Disposition: inline; filename=v1-0001-Fix-whitespace-eob-cleanup.patch Content-Description: patch >From e918857882733460a429f6a37344567a5021efa5 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Tue, 20 Dec 2016 23:02:48 -0500 Subject: [PATCH v1] Fix whitespace eob cleanup * lisp/whitespace.el (whitespace-empty-at-eob-regexp): Match any number of empty lines at end of buffer. * test/lisp/whitespace-tests.el (whitespace-cleanup-eob): New test. (whitespace-tests--cleanup-string): New helper function for tests. --- lisp/whitespace.el | 2 +- test/lisp/whitespace-tests.el | 52 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 test/lisp/whitespace-tests.el diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 29d60c9..a15308c 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -729,7 +729,7 @@ whitespace-empty-at-bob-regexp :group 'whitespace) -(defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]*\\(\n\\{2,\\}\\|[ \t]+\\)\\)\\'" +(defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]+\\)\\'" "Specify regexp for empty lines at end of buffer. Used when `whitespace-style' includes `empty'." diff --git a/test/lisp/whitespace-tests.el b/test/lisp/whitespace-tests.el new file mode 100644 index 0000000..ffd2e65 --- /dev/null +++ b/test/lisp/whitespace-tests.el @@ -0,0 +1,52 @@ +;;; whitespace-tests.el --- Test suite for whitespace -*- lexical-binding: t -*- + +;; Copyright (C) 2016 Free Software Foundation, Inc. + +;; 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 . + +;;; Code: + +(require 'ert) +(require 'whitespace) + +(defun whitespace-tests--cleanup-string (string) + (with-temp-buffer + (insert string) + (whitespace-cleanup) + (buffer-string))) + +(ert-deftest whitespace-cleanup-eob () + (let ((whitespace-style '(empty))) + (should (equal (whitespace-tests--cleanup-string "a\n") + "a\n")) + (should (equal (whitespace-tests--cleanup-string "a\n\n") + "a\n")) + (should (equal (whitespace-tests--cleanup-string "a\n\t\n") + "a\n")) + (should (equal (whitespace-tests--cleanup-string "a\n\t \n") + "a\n")) + (should (equal (whitespace-tests--cleanup-string "a\n\t \n\n") + "a\n")) + (should (equal (whitespace-tests--cleanup-string "\n\t\n") + "")) + ;; Whitespace at end of non-empty line is not covered by the + ;; `empty' style. + (should (equal (whitespace-tests--cleanup-string "a \n\t \n\n") + "a \n")))) + +(provide 'whitespace-tests) + +;;; whitespace-tests.el ends here -- 2.9.3 --=-=-=--