Commit cf5417f0 authored by Noam Postavsky's avatar Noam Postavsky
Browse files

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.
parent 25c9cb77
......@@ -729,7 +729,7 @@ Used when `whitespace-style' includes `empty'."
: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'."
......
;;; 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment