aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichal Nazarewicz2016-06-21 16:46:52 +0200
committerMichal Nazarewicz2016-07-04 23:44:06 +0200
commit7c6317a0498b6690ea668909ac012cb45e6f809b (patch)
treeaddc7968bfe0759b83b35dc95acb2d35d835f576 /test
parentdc294483af221066724f1007a595016b47fb5814 (diff)
downloademacs-7c6317a0498b6690ea668909ac012cb45e6f809b.tar.gz
emacs-7c6317a0498b6690ea668909ac012cb45e6f809b.zip
Simplify ‘delete-trailing-whitespace’ by not treating \n as whitespace
* lisp/simple.el (delete-trailing-whitespace): Set newline’s character syntax to non-whitespace so that ‘\s-’ regular expression does not match it. This simplifies the loop slightly since a simple ‘\s-+$’ can be used and as a consequence ‘line-beginning-position’ function does not need to be called any longer. Furthermore, when newline has whitespace syntax, ‘\s-$’ regular expression ends up matching empty lins since ‘\s-’ matches newline characetr of proceeding line. This leads to needless loop iterations. Since previous change to ‘delete-trailing-whitespace’ already introduced ‘with-syntax-table’, take advantage of it and also overwrite newline’s character syntax.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/simple-tests.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index 2722544446d..97b6c491629 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -235,7 +235,8 @@
235 (insert " \f \n \f \f \n\nlast\n") 235 (insert " \f \n \f \f \n\nlast\n")
236 (delete-trailing-whitespace) 236 (delete-trailing-whitespace)
237 (should (string-equal (buffer-string) " \f\n \f \f\n\nlast\n")) 237 (should (string-equal (buffer-string) " \f\n \f \f\n\nlast\n"))
238 (should (equal ?\s (char-syntax ?\f)))))) 238 (should (equal ?\s (char-syntax ?\f)))
239 (should (equal ?\s (char-syntax ?\n))))))
239 240
240 241
241;;; auto-boundary tests 242;;; auto-boundary tests