Skip to content

Commit fe42a2c

Browse files
committed
tweak(builtin): some cleanup and removal of unused stuff
1 parent 2ce35e9 commit fe42a2c

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

core/me-builtin.el

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ Typing these will trigger reindentation of the current line.")
928928
(add-hook hook #'+ediff--restore-window-config-h 99)))
929929

930930
(use-package smerge-mode
931-
:commands (+smerge-first +smerge-last +smerge-vc-next-conflict-recenter)
931+
:commands (+smerge-first +smerge-last)
932932
:config
933933
(defun +smerge-first ()
934934
"Got to the first occurrence."
@@ -940,15 +940,7 @@ Typing these will trigger reindentation of the current line.")
940940
"Got to the last occurrence."
941941
(interactive)
942942
(goto-char (point-max))
943-
(smerge-prev))
944-
945-
(defun +smerge-vc-next-conflict-recenter ()
946-
"Go to next conflict, possibly in another file."
947-
(interactive)
948-
(smerge-vc-next-conflict)
949-
;; Often, after calling `smerge-vc-next-conflict', the cursor will land at
950-
;; the bottom of the window.
951-
(recenter-top-bottom (/ (window-height) 8))))
943+
(smerge-prev)))
952944

953945
(use-package octave
954946
:mode ("\\.m\\'" . octave-maybe-mode)
@@ -1179,7 +1171,9 @@ Typing these will trigger reindentation of the current line.")
11791171
(window-divider-default-right-width 2))
11801172

11811173
(use-package repeat
1182-
:hook (minemacs-lazy . repeat-mode)) ; Enable repeat mode, "C-x o then C-x o" becomes "C-x o o"
1174+
:after minemacs-lazy
1175+
:init
1176+
(+shutup! (repeat-mode 1))) ; Enable repeat mode, "C-x o then C-x o" becomes "C-x o o"
11831177

11841178
(use-package server
11851179
:autoload server-running-p

0 commit comments

Comments
 (0)