From c8e22f94fc0fbbb4568b382e6e3ce593a99ad914 Mon Sep 17 00:00:00 2001
From: Yuchen Pei <id@ypei.org>
Date: Mon, 14 Aug 2023 18:04:29 +1000
Subject: [emacs] Some minor tweaks

---
 emacs/.emacs.d/init/ycp-editing.el   |  2 +-
 emacs/.emacs.d/init/ycp-org.el       |  1 +
 emacs/.emacs.d/init/ycp-prog.el      |  3 +++
 emacs/.emacs.d/lisp/my/my-consult.el |  2 +-
 emacs/.emacs.d/lisp/my/my-editing.el |  1 +
 emacs/.emacs.d/lisp/my/my-org.el     | 11 +++++++++++
 emacs/.emacs.d/lisp/my/my-prog.el    |  3 ++-
 7 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/emacs/.emacs.d/init/ycp-editing.el b/emacs/.emacs.d/init/ycp-editing.el
index ce850a0..f440e49 100644
--- a/emacs/.emacs.d/init/ycp-editing.el
+++ b/emacs/.emacs.d/init/ycp-editing.el
@@ -102,7 +102,7 @@
 (my-package aggressive-indent
   (:install t)
   (:delay 15)
-  (add-hook 'emacs-lisp-mode-hook #'aggressive-indent-mode))
+  (my-add-hooks #'aggressive-indent-mode '(emacs-lisp-mode-hook lisp-mode-hook)))
 
 (my-package avy
   (:install t)
diff --git a/emacs/.emacs.d/init/ycp-org.el b/emacs/.emacs.d/init/ycp-org.el
index e57466a..8c195a9 100644
--- a/emacs/.emacs.d/init/ycp-org.el
+++ b/emacs/.emacs.d/init/ycp-org.el
@@ -43,6 +43,7 @@
   (my-keybind org-mode-map
     "C-a" #'my-org-beginning-of-line-or-indent
     "C-k" #'my-org-kill-line
+    "M-k" #'my-org-kill-line-backwards
     "M-l" #'org-insert-last-stored-link
     "M-n" #'org-next-link
     "M-p" #'org-previous-link
diff --git a/emacs/.emacs.d/init/ycp-prog.el b/emacs/.emacs.d/init/ycp-prog.el
index 193ea54..7dc2f92 100644
--- a/emacs/.emacs.d/init/ycp-prog.el
+++ b/emacs/.emacs.d/init/ycp-prog.el
@@ -234,6 +234,9 @@
     "C-M-x" #'my-eval-defun-or-region)
   )
 
+(my-package inf-lisp
+  (setq inferior-lisp-program "clisp"))
+
 (my-package data-debug
   (:delay 10)
   (my-keybind global-map
diff --git a/emacs/.emacs.d/lisp/my/my-consult.el b/emacs/.emacs.d/lisp/my/my-consult.el
index aa71ac6..885cdfc 100644
--- a/emacs/.emacs.d/lisp/my/my-consult.el
+++ b/emacs/.emacs.d/lisp/my/my-consult.el
@@ -31,7 +31,7 @@
 
 ...depending whether we are in the git repo."
   (interactive)
-  (if (vc-git-root (buffer-file-name))
+  (if (vc-git-root (or (buffer-file-name) default-directory))
       (consult-git-grep default-directory nil)
     (consult-grep default-directory nil)))
 
diff --git a/emacs/.emacs.d/lisp/my/my-editing.el b/emacs/.emacs.d/lisp/my/my-editing.el
index 1604e32..0b953b3 100644
--- a/emacs/.emacs.d/lisp/my/my-editing.el
+++ b/emacs/.emacs.d/lisp/my/my-editing.el
@@ -403,6 +403,7 @@ With an prefix-arg, copy the file name relative to project root."
   (setq-local electric-pair-preserve-balance nil)
   (turn-on-auto-fill)
   (visual-line-mode)
+  (flyspell-mode)
   )
 
 (defun my-find-file-line-number (orig filename &rest args)
diff --git a/emacs/.emacs.d/lisp/my/my-org.el b/emacs/.emacs.d/lisp/my/my-org.el
index 0fb7d9e..63db9fa 100644
--- a/emacs/.emacs.d/lisp/my/my-org.el
+++ b/emacs/.emacs.d/lisp/my/my-org.el
@@ -113,6 +113,17 @@ With a prefix, insert inactive dates.
       (my-kill-forward)
     (org-kill-line)))
 
+(defun my-org-kill-line-backwards (&optional arg)
+  "Kill backwards in an org way, or `my-kill-backward' with a prefix arg."
+  (interactive "P")
+  (if arg
+      (my-kill-backward)
+    (if (bolp)
+        (delete-char -1)
+      (kill-region
+       (save-excursion (my-org-beginning-of-line-or-indent) (point))
+       (point)))))
+
 (defun my-org-open-default-notes-file ()
   (interactive)
   (find-file org-default-notes-file))
diff --git a/emacs/.emacs.d/lisp/my/my-prog.el b/emacs/.emacs.d/lisp/my/my-prog.el
index 6309f70..2bb4745 100644
--- a/emacs/.emacs.d/lisp/my/my-prog.el
+++ b/emacs/.emacs.d/lisp/my/my-prog.el
@@ -392,7 +392,8 @@ left and the source buffer on the right.
   (auto-fill-mode)
   (display-line-numbers-mode)
   (setq tab-width 2)
-  (bug-reference-prog-mode))
+  (bug-reference-prog-mode)
+  (flyspell-prog-mode))
 
 (provide 'my-prog)
 ;;; my-prog.el ends here
-- 
cgit v1.2.3