From 449e9c086a2862978c36205f3bff6ef51441d41f Mon Sep 17 00:00:00 2001 From: rearman Date: Thu, 20 Mar 2025 12:48:54 -0400 Subject: [PATCH] Changes for Emacs 30 mouse-prefer-closest-glyph enabled ielm history set up, old kludge commented ou for now - may be made conditional at some point. binding added for replace-regexp-as-diff --- README.org | 2 +- init.el | 7 ++++++- re/re-bindings.el | 1 + re/re-repl-defuns.el | 30 +++++++++++++++--------------- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/README.org b/README.org index b8910b7..f2038b1 100644 --- a/README.org +++ b/README.org @@ -9,7 +9,7 @@ Many þoughtlines taken from: - [[https://github.com/sachac/.emacs.d][github.com/sachac/.emacs.d]] ** A note on draft checkiŋ -I keep my emacs installs on þe latest draft, so I don't worry about looking at drafts in my bespokeniŋ unless I happen to updraft on linux/BSD before þe windows forebindings are shared. Þat beiŋ said, I am now on draft 29.3. +I keep my emacs installs on þe latest draft, so I don't worry about looking at drafts in my bespokeniŋ unless I happen to updraft on linux/BSD before þe windows forebindings are shared. Þat beiŋ said, I am now on draft 30.1 * Overbespokeniŋ I have chaŋed þe overbespokeniŋ. I no loŋer taŋle from an ~.org~ writ, instead choosiŋ to split my bespokeniŋ into a set of writs. diff --git a/init.el b/init.el index 07cccdc..e7ea4ce 100644 --- a/init.el +++ b/init.el @@ -23,6 +23,7 @@ (require 're-math-defuns) (require 're-electronics-defuns) (require 're-plc-defuns) + (require 're-unit-conversions) (require 're-refrigeration-defuns) (require 're-skeletons) (require 're-org) @@ -34,7 +35,8 @@ (setq-default indicate-empty-lines t fill-column 80 cursor-type 'bar - cursor-in-non-selected-windows 'hollow) + cursor-in-non-selected-windows 'hollow + mouse-prefer-closest-glyph t) (blink-cursor-mode -1) (column-number-mode t) @@ -159,6 +161,9 @@ (add-hook 'org-mode-hook #'abbrev-mode) +;; IELM +(setq ielm-history-file-name (expand-file-name "ielm/history" user-emacs-directory)) + ;; Bespoken framework (setq custom-file (expand-file-name "custom.el" user-emacs-directory)) diff --git a/re/re-bindings.el b/re/re-bindings.el index 27909fe..10c4bb3 100644 --- a/re/re-bindings.el +++ b/re/re-bindings.el @@ -41,6 +41,7 @@ (keymap-global-set "C-%" #'replace-string) (keymap-global-set "C-s" #'re/isearch-forward-use-region) (keymap-global-set "C-r" #'re/isearch-backward-use-region) +(keymap-global-set "C-M-S-R" #'replace-regexp-as-diff) (keymap-global-set "C-S-S" #'isearch-forward-regexp) (keymap-global-set "C-S-R" #'isearch-backward-regexp) diff --git a/re/re-repl-defuns.el b/re/re-repl-defuns.el index a3bdfdc..2a2eb63 100644 --- a/re/re-repl-defuns.el +++ b/re/re-repl-defuns.el @@ -29,9 +29,9 @@ Either delete or add as many ')' as needed." (let ((distance (re/sexp-unbalanced-count))) (cond ((re/sexp-need-paren-p) - (insert-char 41 distance)) - ((re/sexp-drop-paren-p) - (backward-delete-char distance))))) + (insert-char 41 distance)) + ((re/sexp-drop-paren-p) + (backward-delete-char distance))))) (defmacro re/balance-and-eval-sexp (executor) "Balance the sexp before point, then call `executor'. @@ -50,20 +50,20 @@ Stolen from https://depp.brause.cc/dotemacs" (delete-char arg))) ;; IELM -(defun re/ielm-init-history () - "Stolen from https://n16f.net/blog/making-ielm-more-comfortable." - (let ((path (expand-file-name "ielm/history" user-emacs-directory))) - (make-directory (file-name-directory path) t) - (setq-local comint-input-ring-file-name path)) - (setq-local comint-input-ring-size 10000 comint-input-ignoredups t) - (comint-read-input-ring)) +;; (defun re/ielm-init-history () +;; "Stolen from https://n16f.net/blog/making-ielm-more-comfortable." +;; (let ((path (expand-file-name "ielm/history" user-emacs-directory))) +;; (make-directory (file-name-directory path) t) +;; (setq-local comint-input-ring-file-name path)) +;; (setq-local comint-input-ring-size 10000 comint-input-ignoredups t) +;; (comint-read-input-ring)) -(defun re/ielm-write-history (&rest _args) - "Stolen from https://n16f.net/blog/making-ielm-more-comfortable." - (with-file-modes 384 (comint-write-input-ring))) +;; (defun re/ielm-write-history (&rest _args) +;; "Stolen from https://n16f.net/blog/making-ielm-more-comfortable." +;; (with-file-modes 384 (comint-write-input-ring))) -(add-hook 'ielm-mode-hook #'re/ielm-init-history) -(advice-add 'ielm-send-input :after #'re/ielm-write-history) +;; (add-hook 'ielm-mode-hook #'re/ielm-init-history) +;; (advice-add 'ielm-send-input :after #'re/ielm-write-history) (provide 're-repl-defuns) ;;; re-repl-defuns.el ends here -- 2.39.5