procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/simple.el (delete-trailing-whitespace): Document last change; simplify.

Browse source
This commit is contained in:
Stefan Monnier 2011-09-23 11:06:14 -04:00
parent c4682d186f
commit db4e950db7
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-09-23 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (delete-trailing-whitespace):
Document last change; simplify.
2011-09-23 Peter J. Weisberg <pj@irregularexpressions.net>
* simple.el (delete-trailing-whitespace): Also delete

21
lisp/simple.el
View file

@ -568,6 +568,7 @@ On nonblank line, delete any immediately following blank lines."
All whitespace after the last non-whitespace character in a line is deleted.
This respects narrowing, created by \\[narrow-to-region] and friends.
A formfeed is not considered whitespace by this function.
If END is nil, also delete all trailing lines at the end of the buffer.
If the region is active, only delete whitespace within the region."
(interactive (progn
(barf-if-buffer-read-only)
@ -580,18 +581,18 @@ If the region is active, only delete whitespace within the region."
(start (or start (point-min))))
(goto-char start)
(while (re-search-forward "\\s-$" end-marker t)
(skip-syntax-backward "-" (save-excursion (forward-line 0) (point)))
(skip-syntax-backward "-" (line-beginning-position))
;; Don't delete formfeeds, even if they are considered whitespace.
(save-match-data
(if (looking-at ".*\f")
(goto-char (match-end 0))))
(if (looking-at-p ".*\f")
(goto-char (match-end 0)))
(delete-region (point) (match-end 0)))
(save-restriction
(goto-char end-marker)
(widen)
(if (and (eobp)
(looking-back "\n\n+" nil t))
(replace-match "\n")))
;; Delete trailing empty lines.
(goto-char end-marker)
(when (and (not end)
(<= (skip-chars-backward "\n") -2)
;; Really the end of buffer.
(save-restriction (widen) (eobp)))
(delete-region (1+ (point)) end-marker))
(set-marker end-marker nil))))
;; Return nil for the benefit of `write-file-functions'.
nil)