diff options
Diffstat (limited to 'emacs/.emacs.d/init/ycp-vc.el')
| -rw-r--r-- | emacs/.emacs.d/init/ycp-vc.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el index abd02d1..57de6f1 100644 --- a/emacs/.emacs.d/init/ycp-vc.el +++ b/emacs/.emacs.d/init/ycp-vc.el @@ -29,6 +29,12 @@ ;;; vc, magit, diff +(my-package vc + (:delay 5) + ;; A var from newer emacs, in .dir-locals of emacs source + (add-to-list 'safe-local-variable-values + '(vc-prepare-patches-separately))) + (my-package vc-hooks (:delay 5) ;;; avoid the "file is symlink to git controlled repo, follow?" @@ -43,7 +49,8 @@ ;; The following are from Emacs 27.1 (setq diff-font-lock-prettify t) (setq diff-font-lock-syntax 'hunk-also) - (add-to-list 'safe-local-variable-values '(diff-add-log-use-relative-names . t))) + (add-to-list 'safe-local-variable-values + '(diff-add-log-use-relative-names . t))) (my-package ediff (:delay 30) |