diff options
| author | Case Duckworth | 2022-01-03 10:36:32 -0600 |
|---|---|---|
| committer | Case Duckworth | 2022-01-03 10:36:32 -0600 |
| commit | 679fe570a7527eadc1fcddbff619bfb2763f4d98 (patch) | |
| tree | 21751d516bdcc50f851ad5913495bee1bbc54126 | |
| parent | Add function: +ensure-after-init (diff) | |
| download | emacs-679fe570a7527eadc1fcddbff619bfb2763f4d98.tar.gz emacs-679fe570a7527eadc1fcddbff619bfb2763f4d98.zip | |
Fix things for Windows Emacs
| -rw-r--r-- | init.el | 7 | ||||
| -rw-r--r-- | lisp/+emacs.el | 4 | ||||
| -rw-r--r-- | lisp/+org-capture.el | 4 |
3 files changed, 11 insertions, 4 deletions
| diff --git a/init.el b/init.el index 5d5c02f..dc4bb74 100644 --- a/init.el +++ b/init.el | |||
| @@ -16,7 +16,10 @@ | |||
| 16 | 16 | ||
| 17 | ;;; Code: | 17 | ;;; Code: |
| 18 | 18 | ||
| 19 | (setq debug-on-error t) | ||
| 20 | |||
| 19 | (dolist (feature `((early-init . ,(locate-user-emacs-file "early-init")) | 21 | (dolist (feature `((early-init . ,(locate-user-emacs-file "early-init")) |
| 22 | acdw | ||
| 20 | private | 23 | private |
| 21 | _work)) | 24 | _work)) |
| 22 | (require (or (car-safe feature) feature) (cdr-safe feature) :noerror)) | 25 | (require (or (car-safe feature) feature) (cdr-safe feature) :noerror)) |
| @@ -743,8 +746,8 @@ See also `crux-reopen-as-root-mode'." | |||
| 743 | (:+key "C-." #'embark-act | 746 | (:+key "C-." #'embark-act |
| 744 | "M-." #'embark-dwim | 747 | "M-." #'embark-dwim |
| 745 | "<f1> B" #'embark-bindings) | 748 | "<f1> B" #'embark-bindings) |
| 746 | (:bind-into minibuffer | 749 | (:with-map minibuffer-local-map |
| 747 | "C-." #'embark-act)) | 750 | (:bind "C-." #'embark-act))) |
| 748 | 751 | ||
| 749 | (setup (:straight embark-consult) | 752 | (setup (:straight embark-consult) |
| 750 | (:load-after consult embark) | 753 | (:load-after consult embark) |
| diff --git a/lisp/+emacs.el b/lisp/+emacs.el index d76eee8..2e3d257 100644 --- a/lisp/+emacs.el +++ b/lisp/+emacs.el | |||
| @@ -273,7 +273,9 @@ kill without asking." | |||
| 273 | (when (require 'repeat nil :noerror) | 273 | (when (require 'repeat nil :noerror) |
| 274 | (setq-default repeat-exit-key "g" | 274 | (setq-default repeat-exit-key "g" |
| 275 | repeat-exit-timeout 5) | 275 | repeat-exit-timeout 5) |
| 276 | (repeat-mode +1)) | 276 | (when (fboundp 'repeat-mode) |
| 277 | ;; `repeat-mode' is defined in repeat.el, which is an older library. | ||
| 278 | (repeat-mode +1))) | ||
| 277 | 279 | ||
| 278 | (when (require 'savehist nil :noerror) | 280 | (when (require 'savehist nil :noerror) |
| 279 | (setq-default history-length t | 281 | (setq-default history-length t |
| diff --git a/lisp/+org-capture.el b/lisp/+org-capture.el index 1631bdd..6968657 100644 --- a/lisp/+org-capture.el +++ b/lisp/+org-capture.el | |||
| @@ -4,7 +4,9 @@ | |||
| 4 | 4 | ||
| 5 | (require 'cl-lib) | 5 | (require 'cl-lib) |
| 6 | ;; We don't require `org-capture' here because I'll have to require this library | 6 | ;; We don't require `org-capture' here because I'll have to require this library |
| 7 | ;; to init.el /before/ org-capture is fully needed. | 7 | ;; to init.el /before/ org-capture is fully needed. But I do need to declare |
| 8 | ;; `org-capture-templates'. | ||
| 9 | (defvar org-capture-templates nil) | ||
| 8 | 10 | ||
| 9 | (defun +org-capture--get (key &optional list) | 11 | (defun +org-capture--get (key &optional list) |
| 10 | "Find KEY in LIST, or return nil. | 12 | "Find KEY in LIST, or return nil. |