From 37809363b706164555246867f3937e3c412de1b3 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Tue, 31 Jul 2018 20:00:55 +0200 Subject: [PATCH] [Dired] Cleanup and cosmetics Removed dired-subtree, never really used it anyway. --- init.el | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/init.el b/init.el index 3e49aba..b457060 100644 --- a/init.el +++ b/init.el @@ -783,8 +783,6 @@ are assumed to be of the form *.crt." ("\\.html?\\'" "firefox") ("\\.docx?\\'" "loffice")))) - (unbind-key "C-M-o" dired-mode-map) - ;; disable exaggerated fontification of dired+ (use-package font-lock) (add-to-list 'font-lock-maximum-decoration '(wdired-mode . 1)) @@ -800,18 +798,12 @@ are assumed to be of the form *.crt." ;; custom keybindings - (bind-key [remap beginning-of-buffer] - 'dired-back-to-top dired-mode-map) - (bind-key [remap end-of-buffer] - 'dired-jump-to-bottom dired-mode-map) - (bind-key "z" 'dired-get-size dired-mode-map) (unbind-key "s" dired-mode-map) (unbind-key "" dired-mode-map) - (bind-key "e" 'ora-ediff-files dired-mode-map) - ;; https://oremacs.com/2017/03/18/dired-ediff/ (defun ora-ediff-files () "Compare marked files in dired with ediff." + ;; from: https://oremacs.com/2017/03/18/dired-ediff/ (interactive) (lexical-let ((files (dired-get-marked-files)) (wnd (current-window-configuration))) @@ -830,12 +822,16 @@ are assumed to be of the form *.crt." (setq ediff-after-quit-hook-internal nil) (set-window-configuration wnd)))) (error "No more than 2 files should be marked")))) + (bind-key "e" 'ora-ediff-files dired-mode-map) (defun dired-back-to-top () "Jump to first non-trivial line in dired." (interactive) (goto-char (point-min)) - (dired-next-line 2)) + (dired-next-line 1)) + + (bind-key [remap beginning-of-buffer] + 'dired-back-to-top dired-mode-map) (defun dired-jump-to-bottom () "Jump to last non-trivial line in dired." @@ -843,6 +839,9 @@ are assumed to be of the form *.crt." (goto-char (point-max)) (dired-next-line -1)) + (bind-key [remap end-of-buffer] + 'dired-jump-to-bottom dired-mode-map) + (defun dired-get-size () ; from emacswiki, via oremacs "Print size of all files marked in the current dired buffer." (interactive) @@ -855,9 +854,7 @@ are assumed to be of the form *.crt." (re-search-backward "\\(^[0-9.,]+[a-za-z]+\\).*total$") (match-string 1)))))) - (use-package dired-subtree) - (bind-key "i" 'dired-subtree-insert dired-mode-map) - (bind-key ";" 'dired-subtree-remove dired-mode-map))) + (bind-key "z" 'dired-get-size dired-mode-map))) (use-package find-dired :commands (find-dired)