From: npostavs@users.sourceforge.net
To: Reuben Thomas <rrt@sc3d.org>
Cc: Mark Karpov <markkarpov@openmailbox.org>, 25157@debbugs.gnu.org
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 [thread overview]
Message-ID: <878tr9c4bn.fsf@users.sourceforge.net> (raw)
In-Reply-To: <CAOnWdoj=icjFZPDSYN494E1U59iKq_AD4O2J5pe5is9mZ7=UuA@mail.gmail.com> (Reuben Thomas's message of "Tue, 20 Dec 2016 18:37:29 +0000")
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
Reuben Thomas <rrt@sc3d.org> 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.
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 3239 bytes --]
From e918857882733460a429f6a37344567a5021efa5 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
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 <http://www.gnu.org/licenses/>.
+
+;;; 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
next prev parent reply other threads:[~2016-12-21 4:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-10 14:41 bug#25157: 26.0.50; whitespace-cleanup does not remove single trailing empty line anymore Mark Karpov
2016-12-20 4:36 ` npostavs
2016-12-20 18:37 ` Reuben Thomas
2016-12-21 0:51 ` Reuben Thomas
2016-12-21 4:07 ` npostavs [this message]
2016-12-21 11:07 ` Reuben Thomas
2016-12-22 2:18 ` npostavs
2016-12-22 12:53 ` Reuben Thomas
2016-12-23 0:03 ` npostavs
2016-12-23 10:44 ` Reuben Thomas
2016-12-24 15:34 ` npostavs
2016-12-26 22:37 ` Reuben Thomas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878tr9c4bn.fsf@users.sourceforge.net \
--to=npostavs@users.sourceforge.net \
--cc=25157@debbugs.gnu.org \
--cc=markkarpov@openmailbox.org \
--cc=rrt@sc3d.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.