Merge branch 'bankruptcy8' of https://tildegit.org/acdw/emacs into bankruptcy8

3 files changed, 52 insertions, 25 deletions

@@ -0,0 +1,46 @@
+;;; +crux.el -*- lexical-binding: t; -*-
+
+;;; Code:
+
+(require 'crux)
+
+(defgroup +crux nil
+  "Extra crux customizations."
+  :group 'crux
+  :prefix "+crux-")
+
+(defun +crux-kill-ring-save (begin end arg)
+  "Copy region to the kill-ring, possibly indenting it first.
+Copy from BEGIN to END using `kill-ring-save' if no argument was
+passed, or with `crux-indent-rigidly-and-copy-to-clipboard' if
+one was."
+  (interactive "r\nP")
+  (call-interactively (if arg #'kill-ring-save
+                        #'crux-indent-rigidly-and-copy-to-clipboard)))
+
+(defcustom +crux-default-date-format "%c"
+  "Default date format to use for `+crux-insert-date-or-time'.
+Should be a format parsable by `format-time-string'."
+  :type 'string)
+
+(defcustom +crux-alternate-date-format "%FT%T%z"
+  "Alternate date format to use for `+crux-insert-date-or-time'.
+Should be a format parsable by `format-time-string'."
+  :type 'string)
+
+(defun +crux-insert-date-or-time (arg)
+  "Insert current date or time.
+Called without a prefix ARG, insert the time formatted by
+`+crux-default-date-format'.  When called with \\[universal-argument],
+format the time with `+crux-alternate-date-format'.  Otherwise,
+prompt for the time format."
+  (interactive "*P")
+  (let ((time (current-time)))
+    (insert (cond
+             ((null arg) (format-time-string +crux-default-date-format time))
+             ((eq (car-safe arg) 4)
+              (format-time-string +crux-alternate-date-format time))
+             (t (format-time-string (read-string "Time Format: ") time))))))
+
+(provide '+crux)
+;;; +crux.el ends here
@@ -24,31 +24,6 @@
 (require 'setup)
 (require 'straight)
 
-;; I don't like the "magic" `setup' performs to ensure a symbol is a
-;; function in `:global', `:bind', `:hook', `:hook-into', and others.
-;; So here, I'll just make it return the symbol unmodified.
-(el-patch-feature setup)
-(with-eval-after-load 'setup
-  (el-patch-defvar
-    (el-patch-add setup-ensure-function-inhibit nil
-                  "Whether to inhibit `setup-ensure-function'."))
-  (el-patch-defun setup-ensure-function (sexp)
-    (el-patch-concat
-      "Attempt to return SEXP as a quoted function name."
-      (el-patch-add
-        "\nIf `setup-ensure-function-inhibit' is non-nil, just return SEXP."))
-    (el-patch-wrap 3 0
-      (if (and setup-ensure-function-inhibit
-               (not (eq sexp (setup-get 'mode))))
-          sexp
-        (cond ((eq (car-safe sexp) 'function)
-               sexp)
-              ((eq (car-safe sexp) 'quote)
-               `#',(cadr sexp))
-              ((symbolp sexp)
-               `#',sexp)
-              (sexp))))))
-
 (setup-define :face
     (lambda (face spec)
       `(custom-set-faces '(,face ,spec 'now "Customized by `setup'.")))
@@ -83,5 +83,11 @@ If Emacs is already started, run FUNCTION.  Otherwise, add it to
       (funcall function)
     (add-hook 'after-init-hook function)))
 
+(defun +remember-prefix-arg (p-arg P-arg)
+  "Display prefix ARG, in \"p\" and \"P\" `interactive' types.
+I keep forgetting how they differ."
+  (interactive "p\nP")
+  (message "p: %S       P: %S" p-arg P-arg))
+
 (provide 'acdw)
 ;;; acdw.el ends here