From bc89de4228f833bdbec8127f9851f6ce372b8277 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 8 Dec 2019 16:10:31 -0500 Subject: [PATCH] Move vc-follow-symlinks to core-editor And remove vc-make-backup-files setting. nil is already its default --- core/core-editor.el | 3 ++- modules/emacs/vc/config.el | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/core-editor.el b/core/core-editor.el index e31ed14ec..cd4d539ff 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -56,7 +56,8 @@ possible." ;; Resolve symlinks when opening files, so that any operations are conducted ;; from the file's true directory (like `find-file'). -(setq find-file-visit-truename t) +(setq find-file-visit-truename t + vc-follow-symlinks t) ;; Disable the warning "X and Y are the same file". It's fine to ignore this ;; warning as it will redirect you to the existing buffer anyway. diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el index a8a595052..9c16d9cca 100644 --- a/modules/emacs/vc/config.el +++ b/modules/emacs/vc/config.el @@ -4,11 +4,6 @@ (setenv "GIT_ASKPASS" "git-gui--askpass")) -;;;###package vc -(setq vc-make-backup-files nil - vc-follow-symlinks t) - - (after! vc-annotate (set-popup-rules! '(("^\\vc-d" :select nil) ; *vc-diff* @@ -21,7 +16,6 @@ (define-key vc-annotate-mode-map [remap quit-window] #'kill-current-buffer)) - (after! git-timemachine ;; Sometimes I forget `git-timemachine' is enabled in a buffer, so instead of ;; showing revision details in the minibuffer, show them in