heckyel/emacs-personal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the following functions are not known to be defined: ivy-read, enable-smerge-maybe

Browse Source 
FS #2
This commit is contained in:
Jesús 2019-01-22 16:59:31 -05:00
parent 09b8e739e4
commit ccfd6a33cd
No known key found for this signature in database
GPG Key ID: F6EE7BC59A315766
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/init-git.el
View File

@ -48,6 +48,10 @@
(defun my-goto-git-gutter ()
(interactive)
(eval-when-compile (require 'git-gutter-fringe nil t))
(when (and (require 'git-gutter-fringe nil t)
(fboundp 'ivy-read))
(if git-gutter-fr:diffinfos
(ivy-read "git-gutters-fr:"
(mapcar 'my-reshape-git-gutter git-gutter-fr:diffinfos)
@ -58,7 +62,8 @@
(unless (numberp e) (setq e (cdr e)))
(with-no-warnings
(goto-line e))))
(message "NO git-gutters-fringe!")))))
(message "NO git-gutters-fringe!"))
))))
(use-package gitconfig-mode
:ensure t
@ -93,7 +98,11 @@
(goto-char (point-min))
(when (re-search-forward "^<<<<<<< " nil t)
(smerge-mode +1)))))
(add-hook 'buffer-list-update-hook #'enable-smerge-maybe))
(eval-when-compile (require 'smerge-mode nil t))
(when (and (require 'smerge-mode nil t)
(fboundp 'enable-smerge-maybe))
(add-hook 'buffer-list-update-hook #'enable-smerge-maybe)))
(provide 'init-git)