1 files changed, 16 insertions, 15 deletions

@@ -87,21 +87,6 @@ ARG).  When called with multiple arguments or a list, it returns
       (save-restriction
         (unfill-region (point-min) (point-max))))))
 
-(defun kill-ring-save-unfilled (start end &optional region)
-  "Unfill, kill, then re-fill the region defined by START and END positions.
-REGION is passed straight to `kill-ring-save'."
-  (interactive "*r")
-  (let ((sentence-end-double-space nil))
-    (unfill-region start end)
-    (kill-ring-save
-     ;; A quick hack to try and ameliorate the "Args out of range" error when
-     ;; `unfill-region' removes some newlines.  I'm not sure if this will work
-     ;; if calling from Lisp or other such nonsense.
-     (max start (point-min))
-     (min end (point-max))
-     region))
-  (fill-region start end))
-
 (defmacro when-unfocused (name &rest forms)
   "Define a function NAME, executing FORMS, that fires when Emacs
 is unfocused."
@@ -123,6 +108,22 @@ is unfocused."
               ,@body)
      (message "%s... Done." ,message)))
 
+(defmacro with-eval-after-loads (files &rest body)
+  "Execute BODY after FILES are loaded.
+This macro simplifies `with-eval-after-load' for multiple nested
+features."
+  (declare (indent 1) (debug (form def-body)))
+  (waterfall-list 'with-eval-after-load files body))
+
+(defun waterfall-list (car list rest)
+  "Cons CAR with each element in LIST in a waterfall fashion, end with REST.
+For use with the `with-eval-after-loads' function."
+  (cond ((atom list) `(,car ',list ,@rest))
+        ((= 1 (length list)) `(,car ',(car list) ,@rest))
+        (t
+         `(,car ',(car list)
+                ,(waterfall-list car (cdr list) rest)))))
+
 
 ;;; Comment-or-uncomment-sexp
 ;; from https://endlessparentheses.com/a-comment-or-uncomment-sexp-command.html