Skip to content

Commit

Permalink
revert: restore disabled packages, using emacs@6bf441ff11540
Browse files Browse the repository at this point in the history
  • Loading branch information
abougouffa committed Mar 26, 2023
1 parent ddfb23a commit 6e00f68
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 17 deletions.
7 changes: 0 additions & 7 deletions core/me-evil.el
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
:straight t
:hook (minemacs-after-startup . evil-snipe-mode)
:hook (minemacs-after-startup . evil-snipe-override-mode)
;; TEMP: Disable. It triggers (invalid-function 2) on Emacs 29 (at least after
;; 786de66ec3c4cff90cafd0f8a68f9bce027e9947)
:disabled
:custom
(evil-snipe-scope 'buffer)
(evil-snipe-smart-case t)
Expand All @@ -95,10 +92,6 @@
(use-package evil-escape
:straight t
:hook (evil-mode . evil-escape-mode)
;; TEMP: Disable `evil-escape', it is not working in Emacs 29. Pressing "k" or
;; "j" in insert state adds "kk" or "jj" and signals (invalid-function "kj").
;; Spotted on Emacs built after 786de66ec3c4cff90cafd0f8a68f9bce027e9947
:disabled
:custom
;; The default "fd" interfere with the "f" (bound to `evil-snipe-f') binding.
(evil-escape-key-sequence "kj")
Expand Down
6 changes: 0 additions & 6 deletions modules/me-editor.el
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@
(use-package unicode-fonts
:straight t
:hook (minemacs-after-startup . +unicode-fonts-setup)
;; TEMP: Disable `unicode-fonts', it is not working in Emacs 29 (at least
;; after 786de66ec3c4cff90cafd0f8a68f9bce027e9947)
:disabled
:config
(defun +unicode-fonts-setup ()
"Prefer the `:unicode-font-family' from `minemacs-fonts'."
Expand Down Expand Up @@ -112,9 +109,6 @@

(use-package expand-region
:straight t
;; TEMP: Disable it. `er/expand-region' expands to the whole buffer in Emacs
;; 29 (at least after 786de66ec3c4cff90cafd0f8a68f9bce027e9947)
:disabled
:init
(+vmap! "v" #'er/expand-region))

Expand Down
5 changes: 1 addition & 4 deletions modules/me-vc.el
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,7 @@
:init
(+map! "gt" #'git-timemachine-toggle)
:custom
(git-timemachine-show-minibuffer-details t)
:config
;; TEMP: Fix a strange error triggred by `git-timemachine--erm-workaround'
(fset 'git-timemachine--erm-workaround #'ignore))
(git-timemachine-show-minibuffer-details t))

;; Enforce git commit conventions.
;; See: chris.beams.io/posts/git-commit/
Expand Down

0 comments on commit 6e00f68

Please sign in to comment.