X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/1bbc615cc0caa3b5069bc058fccea2427ae9f865..3b8e0d032aa647a76da40c77bb1ad13cfac85ad2:/init.org?ds=sidebyside diff --git a/init.org b/init.org index 4c6b9cb..1eb94d8 100644 --- a/init.org +++ b/init.org @@ -947,7 +947,8 @@ There's no way I could top that, so I won't attempt to. (defun a/eshell-setup () (make-local-variable 'company-idle-delay) - (defvar company-idle-delay nil) + (defvar company-idle-delay) + (setq company-idle-delay nil) (bind-keys :map eshell-mode-map ("C-d" . a/eshell-quit-or-delete-char) ("C-S-l" . a/eshell-clear) @@ -1070,16 +1071,20 @@ TODO: break this giant source block down into individual org sections. (global-diff-hl-mode) (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t)) +(use-package ls-lisp + :custom (ls-lisp-dirs-first t)) + (use-package dired :defer t :config - (setq dired-listing-switches "-alh") + (setq dired-listing-switches "-alh" + ls-lisp-use-insert-directory-program nil) ;; easily diff 2 marked files ;; https://oremacs.com/2017/03/18/dired-ediff/ (defun dired-ediff-files () (interactive) - (require 'ediff) + (defvar ediff-after-quit-hook-internal) (let ((files (dired-get-marked-files)) (wnd (current-window-configuration))) (if (<= (length files) 2)