Merge branch 'main' of github.com:duckwork/.emacs.d

2 files changed, 72 insertions, 27 deletions

@@ -0,0 +1,55 @@
+;;; acdw-autoinsert.el --- autoinsert.el            -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2021  Case Duckworth
+
+;; Author: Case Duckworth <acdw@acdw.ne
+
+;;; License:
+
+;; Everyone is permitted to do whatever with this software, without
+;; limitation.  This software comes without any warranty whatsoever,
+;; but with two pieces of advice:
+
+;; - Be kind to yourself.
+
+;; - Make good choices.
+
+;;; Commentary:
+
+;; These are my bespoke changes to the `autoinsert' library.
+
+;;; Code:
+
+(require 'autoinsert)
+(require 'cl-lib)
+
+(defun acdw/define-auto-insert (options condition action)
+  "Associate CONDITION with ACTION in `auto-insert-alist'.
+This function differs from `define-auto-insert' in that it won't
+allow more than one duplicate entry in `auto-insert-alist'.
+
+OPTIONS is a plist with three optional arguments:
+
+- `:testfn' takes a function to test the given CONDITION against
+  the already-existing ones in `auto-insert-alist'.  It defaults
+  to testing the cdr of CONDITION against the cdar of each entry
+  in `auto-insert-alist'.
+
+- `:replace', if non-nil, will replace the matching entry with
+  the given one.  Default: nil.
+
+- `:after' is the third, optional argument to `define-auto-insert'."
+  (declare (indent 1))
+  (let ((testfn (or (plist-get options :testfn)
+                    (lambda (a b)
+                      (string= (cdr a) (cdar b)))))
+        (replace (or (plist-get options :replace) nil))
+        (after (or (plist-get options :after) nil)))
+    (when replace
+      (setq auto-insert-alist
+            (assoc-delete-all condition auto-insert-alist testfn)))
+    (unless (assoc (list condition) auto-insert-alist testfn) 
+      (define-auto-insert condition action after))))
+
+(provide 'acdw-autoinsert)
+;;; acdw-autoinsert.el ends here
@@ -787,32 +787,6 @@ This function is internal.  Use `acdw/make-password-fetcher' instead."
       (insert "💩")
       (setq n (1- n)))))
 
-(defun spongebob-case-region (beg end)
-  "Make region, defined by BEG and END, lOoK lIkE tHiS."
-  (interactive "*r")
-  (save-excursion
-    (let (case)
-      (goto-char beg)
-      (while (< (point) end)
-        (if (looking-at "[[:alpha:]]")
-            (if (setq case (not case))
-                (upcase-region (point) (progn (forward-char 1) (point)))
-              (downcase-region (point) (progn (forward-char 1) (point))))
-          (forward-char 1))))))
-
-(defun spongebob-case-word (n)
-  "Spongebob-case N words forward, beginning at point, moving over."
-  (interactive "*p")
-  (spongebob-case-region (point) (progn (forward-word n) (point))))
-
-(defun spongebob-case-dwim (arg)
-  "Spongebob-case words in the region if active, else word at point.
-If ARG exists, it's passed to `spongebob-case-word'."
-  (interactive "*p")
-  (if (use-region-p)
-      (spongebob-case-region (region-beginning) (region-end))
-    (spongebob-case-word arg)))
-
 
 ;;; Fat finger solutions
 (defun acdw/fat-finger-exit (&optional prefix)
@@ -872,7 +846,23 @@ three blank lines, then place the point on the second one."
   (newline)
   (delete-blank-lines)
   (newline 2)
-  (previous-line))
+  (forward-line -1))
+
+(defun require/ (feature &optional filename noerror)
+  "If FEATURE is not loaded, load it from FILENAME.
+This function works just like `require', with one crucial
+difference: if the FEATURE name contains a slash, the FILENAME
+will as well -- unless, of course, FILENAME is set.  This allows
+for `require/' to require files within subdirectories of
+directories of `load-path'.  Of course, NOERROR isn't affected by
+the change."
+  (let* ((feature-name (if (symbolp feature)
+                           (symbol-name feature)
+                         feature))
+         (filename (or filename
+                       (and (string-match-p "/" feature-name)
+                            feature-name))))
+    (require (intern feature-name) filename noerror)))
 
 (provide 'acdw)
 ;;; acdw.el ends here