APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1504772390 -3600 # Thu Sep 07 09:19:50 2017 +0100 # Node ID 8dea4d0549ac0a49456d01bba96171399456c227 # Parent 97ece44f19cfad8a1892d2a542dcceea679ae93c Fix up whitespace, rect.el 2017-09-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; [...] * rect.el (apply-on-rectangle): * rect.el (delete-rectangle-line): * rect.el (open-rectangle-line): * rect.el (string-rectangle-line): * rect.el (clear-rectangle-line): * rect.el (rect): Fixup whitespace in this file. diff -r 97ece44f19cf -r 8dea4d0549ac lisp/ChangeLog --- a/lisp/ChangeLog Thu Sep 07 09:16:19 2017 +0100 +++ b/lisp/ChangeLog Thu Sep 07 09:19:50 2017 +0100 ＠＠ -7,6 +7,13 ＠＠ * rect.el (spaces-strings): Removed. * rect.el (spaces-string): Removed. These aren't needed, (format "*s" N "") does the same job. + * rect.el (apply-on-rectangle): + * rect.el (delete-rectangle-line): + * rect.el (open-rectangle-line): + * rect.el (string-rectangle-line): + * rect.el (clear-rectangle-line): + * rect.el (rect): + Fixup whitespace in this file. 2017-06-28 Aidan Kehoe <kehoea(a)parhasard.net&gt; diff -r 97ece44f19cf -r 8dea4d0549ac lisp/rect.el --- a/lisp/rect.el Thu Sep 07 09:16:19 2017 +0100 +++ b/lisp/rect.el Thu Sep 07 09:19:50 2017 +0100 ＠＠ -106,9 +106,7 ＠＠ (goto-char startpt) (while (< (point) endpt) (apply function startcol endcol args) - (forward-line 1))) - )) - + (forward-line 1))))) (defun delete-rectangle-line (startcol endcol fill) (let ((pt (point-at-eol))) ＠＠ -118,8 +116,7 ＠＠ ;; else (setq pt (point)) (move-to-column endcol t) - (delete-region pt (point)))) - )) + (delete-region pt (point)))))) ;;;###autoload (defun delete-rectangle (start end &optional fill) ＠＠ -155,7 +152,6 ＠＠ (apply-on-rectangle 'delete-extract-rectangle-line start end lines fill) (nreverse (cdr lines)))) - ;; #### NOTE: this is actually the only function that needs to do complicated ;; stuff like what's happening in `operate-on-rectangle', because the buffer ;; might be read-only. --dv ＠＠ -194,7 +190,6 ＠＠ (apply-on-rectangle 'extract-rectangle-line start end lines) (nreverse (cdr lines)))) - ;;;###autoload (defvar killed-rectangle nil "Rectangle for `yank-rectangle' to insert.") ＠＠ -220,7 +215,6 ＠＠ (interactive "*") (insert-rectangle killed-rectangle)) - ;; This function is untouched --dv ;;;###autoload (defun insert-rectangle (rectangle) ＠＠ -244,7 +238,6 ＠＠ (insert (car lines)) (setq lines (cdr lines))))) - (defun open-rectangle-line (startcol endcol fill) (when (= (move-to-column startcol (or fill 'coerce)) startcol) (unless (and (not fill) ＠＠ -262,7 +255,6 ＠＠ (apply-on-rectangle 'open-rectangle-line start end fill) (goto-char start)) - (defun string-rectangle-line (startcol endcol string delete) (move-to-column startcol t) (if delete ＠＠ -290,7 +282,6 ＠＠ (interactive "*r\nsString rectangle: ") (apply-on-rectangle 'string-rectangle-line start end string t)) - (defun clear-rectangle-line (startcol endcol fill) (let ((pt (point-at-eol)) spaces) ＠＠ -303,8 +294,7 ＠＠ (move-to-column endcol t) (setq spaces (- (point) pt)) (delete-region pt (point)) - (indent-to (+ (current-column) spaces)))) - )) + (indent-to (+ (current-column) spaces)))))) ;;;###autoload (defun clear-rectangle (start end &optional fill) ＠＠ -317,7 +307,6 ＠＠ (interactive "*r\nP") (apply-on-rectangle 'clear-rectangle-line start end fill)) - (provide 'rect) ;;; rect.el ends here -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)