File tree Expand file tree Collapse file tree 1 file changed +5
-11
lines changed Expand file tree Collapse file tree 1 file changed +5
-11
lines changed Original file line number Diff line number Diff line change @@ -928,7 +928,7 @@ Typing these will trigger reindentation of the current line.")
928
928
(add-hook hook #'+ediff--restore-window-config-h 99 )))
929
929
930
930
(use-package smerge-mode
931
- :commands (+smerge-first +smerge-last +smerge-vc-next-conflict-recenter )
931
+ :commands (+smerge-first +smerge-last)
932
932
:config
933
933
(defun +smerge-first ()
934
934
" Got to the first occurrence."
@@ -940,15 +940,7 @@ Typing these will trigger reindentation of the current line.")
940
940
" Got to the last occurrence."
941
941
(interactive )
942
942
(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 )))
952
944
953
945
(use-package octave
954
946
:mode (" \\ .m\\ '" . octave-maybe-mode)
@@ -1179,7 +1171,9 @@ Typing these will trigger reindentation of the current line.")
1179
1171
(window-divider-default-right-width 2 ))
1180
1172
1181
1173
(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"
1183
1177
1184
1178
(use-package server
1185
1179
:autoload server-running-p
You can’t perform that action at this time.
0 commit comments