Mats tells me this is needed for org-mode, and it’s a useful feature beyond that. APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1347107660 -3600 # Node ID 98f762d06c5fb95ba6a6d1883e1cf65f7aca8f13 # Parent dae33b5feffeee270840946d709b40dfae7e4689 Import GNU's #'delete-trailing-whitespace, thank you GNU. lisp/ChangeLog addition: 2012-09-08 Aidan Kehoe <kehoea(a)parhasard.net&gt; * simple.el: * simple.el (delete-trailing-lines): New. * simple.el (delete-trailing-whitespace): New. Import this function and an associated variable from GNU, thank you GNU. diff -r dae33b5feffe -r 98f762d06c5f lisp/ChangeLog --- a/lisp/ChangeLog Fri Sep 07 22:06:01 2012 +0100 +++ b/lisp/ChangeLog Sat Sep 08 13:34:20 2012 +0100 ＠＠ -1,3 +1,11 ＠＠ +2012-09-08 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * simple.el: + * simple.el (delete-trailing-lines): New. + * simple.el (delete-trailing-whitespace): New. + Import this function and an associated variable from GNU, thank + you GNU. + 2012-09-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; * files.el: diff -r dae33b5feffe -r 98f762d06c5f lisp/simple.el --- a/lisp/simple.el Fri Sep 07 22:06:01 2012 +0100 +++ b/lisp/simple.el Sat Sep 08 13:34:20 2012 +0100 ＠＠ -369,6 +369,54 ＠＠ (if (looking-at "^[ \t]*\n\\'") (delete-region (point) (point-max))))) +(defcustom delete-trailing-lines t + "If non-nil, \\[delete-trailing-whitespace] deletes trailing lines. +Trailing lines are deleted only if `delete-trailing-whitespace' +is called on the entire buffer (rather than an active region)." +:type 'boolean +:group 'editing) + ; :version "24.2") + +(defun delete-trailing-whitespace (&optional start end) + "Delete trailing whitespace between START and END. +If called interactively, START and END are the start/end of the +region if the mark is active, or of the buffer's accessible +portion if the mark is inactive. + +This command deletes whitespace characters after the last +non-whitespace character in each line between START and END. It +does not consider formfeed characters to be whitespace. + +If this command acts on the entire buffer (i.e. if called +interactively with the mark inactive, or called from Lisp with +END nil), it also deletes all trailing lines at the end of the +buffer if the variable `delete-trailing-lines' is non-nil." + ;; XEmacs; "*r" instead of re-implementing it. + (interactive "*r") + (save-match-data + (save-excursion + (let ((end-marker (copy-marker (or end (point-max)))) + (start (or start (point-min)))) + (goto-char start) + (while (re-search-forward "\\s-$" end-marker t) + (skip-syntax-backward "-" (line-beginning-position)) + ;; Don't delete formfeeds, even if they are considered whitespace. + ;; XEmacs; #'looking-at-p not (yet) available + (if (save-match-data (looking-at ".*\f")) + (goto-char (match-end 0))) + (delete-region (point) (match-end 0))) + ;; Delete trailing empty lines. + (goto-char end-marker) + (when (and (not end) + delete-trailing-lines + ;; Really the end of buffer. + (save-restriction (widen) (eobp)) + (<= (skip-chars-backward "\n") -2)) + (delete-region (1+ (point)) end-marker)) + (set-marker end-marker nil)))) + ;; Return nil for the benefit of `write-file-functions'. + nil) + (defun back-to-indentation () "Move point to the first non-whitespace character on this line." ;; XEmacs change -- ‘Liston operated so fast that he once accidentally amputated an assistant’s fingers along with a patient’s leg, […] The patient and the assistant both died of sepsis, and a spectator reportedly died of shock, resulting in the only known procedure with a 300% mortality.’ (Atul Gawande, NEJM, 2012) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches