From b8c0126f8ccaa3e3da5ca19db04fc049c944879e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 24 Nov 2019 14:16:46 -0500 Subject: [PATCH] emacs/dired: don't enable dired-git-info in ranger It won't correctly disable on `C-c C-e`, but it does work find if enabled manually. Also: refactors +dired-enable-git-info-h and map! call Relevant to #2106 --- modules/emacs/dired/autoload.el | 9 ++++----- modules/emacs/dired/config.el | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/emacs/dired/autoload.el b/modules/emacs/dired/autoload.el index 145fdd557..e44d3dda0 100644 --- a/modules/emacs/dired/autoload.el +++ b/modules/emacs/dired/autoload.el @@ -7,10 +7,9 @@ (mapc #'kill-buffer (doom-buffers-in-mode 'dired-mode)) (message "Killed all dired buffers")) - ;;;###autoload (defun +dired-enable-git-info-h () - (if (and - (not (file-remote-p default-directory)) - (locate-dominating-file "." ".git")) - (dired-git-info-mode 1))) + "Enable `dired-git-info-mode' in git repos." + (and (not (file-remote-p default-directory)) + (locate-dominating-file "." ".git") + (dired-git-info-mode 1))) diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el index e7782e820..74f9950e1 100755 --- a/modules/emacs/dired/config.el +++ b/modules/emacs/dired/config.el @@ -165,10 +165,9 @@ we have to clean it up ourselves." ("\\.\\(?:mp3\\|flac\\)\\'" ,cmd) ("\\.html?\\'" ,cmd) ("\\.md\\'" ,cmd)))) - (map! - :map dired-mode-map - :localleader - "h" #'dired-omit-mode)) + (map! :map dired-mode-map + :localleader + "h" #'dired-omit-mode)) (use-package! fd-dired @@ -180,7 +179,8 @@ we have to clean it up ourselves." (use-package! dired-git-info :after dired :init - (add-hook 'dired-after-readin-hook '+dired-enable-git-info-h) + (unless (featurep! +ranger) + (add-hook 'dired-after-readin-hook '+dired-enable-git-info-h)) :config (map! :map (dired-mode-map ranger-mode-map) :ng ")" #'dired-git-info-mode)