Skip to content

Commit

Permalink
fix(builtin): fix a couple of issues with Emacs 29
Browse files Browse the repository at this point in the history
  • Loading branch information
abougouffa committed Dec 14, 2024
1 parent 52661b2 commit 95ce8e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions core/me-builtin.el
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
(tooltip-hide-delay 20) ; Make tooltips last a bit longer (default 10s)
(image-animate-loop t) ; Animated images loop forever instead of playing the animation only once
(icomplete-compute-delay 0.01) ; Don't delay displaying completion candidates in `fido-mode' (def. 0.15)
(ring-bell-function #'ignore) ; Don't beep
:init
(setq-default truncate-lines nil ; Don't truncate long line, display them
fill-column 80 ; Default fill column width
Expand All @@ -83,7 +84,7 @@
(fido-vertical-mode 1))

;; When `me-completion/corfu' is disabled, enable `global-completion-preview-mode'
(when (or minemacs-builtin-only-p (and (+package-disabled-p 'corfu 'me-completion) (fboundp 'global-completion-preview-mode)))
(when (and (fboundp 'global-completion-preview-mode) (or minemacs-builtin-only-p (+package-disabled-p 'corfu 'me-completion)))
(global-completion-preview-mode 1)
(add-hook 'minibuffer-mode-hook 'completion-preview-mode)) ; Use also in the minibuffer

Expand Down Expand Up @@ -211,6 +212,7 @@ or file path may exist now."

(use-package which-key
:hook (minemacs-lazy . which-key-mode)
:when (>= emacs-major-version 30)
:custom
(which-key-idle-delay 1.0)
(which-key-idle-secondary-delay nil)
Expand Down Expand Up @@ -366,7 +368,8 @@ or file path may exist now."
(setcdr (assq 'explicit-name tab) 'def)))

(use-package editorconfig
:hook (minemacs-first-file . editorconfig-mode))
:hook (minemacs-first-file . editorconfig-mode)
:when (>= emacs-major-version 30))

(use-package flymake
:hook ((prog-mode conf-mode) . flymake-mode)
Expand Down
2 changes: 1 addition & 1 deletion core/me-lib.el
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ If `minemacs-verbose-p' is non-nil, do not print any message to
(let ((default-theme (eval (car (get 'minemacs-theme 'standard-value)))))
(+error! "Cannot load theme %S, trying to load the default theme %S" minemacs-theme default-theme)
(unless (ignore-errors (load-theme default-theme t))
(+error! "Cannot load default theme %S, falling back to the builtin tsdh-light theme" default-theme)
(+error! "Cannot load default theme %S, falling back to the builtin `modus-operandi' theme" default-theme)
(load-theme 'modus-operandi t)))))
;; Run hooks
(run-hooks 'minemacs-after-load-theme-hook))
Expand Down

0 comments on commit 95ce8e9

Please sign in to comment.