awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-03 12:27:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add: feature/version-control: smerge + hydra for smerge

Browse Source 
closes #5
This commit is contained in:
Benjamin Andresen
2017-07-02 16:29:46 +02:00
parent f4b68936a3
commit 228f478f99
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/feature/version-control/autoload.el
View File

@ -38,6 +38,15 @@ repository root."
(+vcs*update-header-line)
(setq-local header-line-format nil)))
;;;###autoload
(defun +vcs|enable-smerge-mode-maybe ()
"Auto-enable `smerge-mode' when merge conflict is detected."
(save-excursion
(goto-char (point-min))
(when (re-search-forward "^<<<<<<< " nil :noerror)
(smerge-mode 1)
(when +vcs-auto-hydra-smerge (+hydra-smerge/body)))))
;;;###autoload
(defun +vcs*update-header-line (&rest _)
"Show revision details in the header-line, instead of the minibuffer.