Use narrow tab width (except in shell)

2 files changed, 7 insertions, 4 deletions

diff --git a/init.el b/init.el
index 5996be4..8e2cd2e 100644
--- a/init.el
+++ b/init.el
@@ -148,6 +148,10 @@
 (define-key key-translation-map [?\C-x] [?\C-t])
 (define-key key-translation-map [?\C-t] [?\C-x])
 
+;; Use narrow tab width
+(set-default 'tab-width 4)
+(setq tab-width 4)
+
 (load "email.el")
 (load "init-org.el")
 (require 'my/init-org)
@@ -205,7 +209,3 @@
 (setq pdf-info-epdfinfo-program "~/.guix-profile/bin/epdfinfo")
 (pdf-tools-install)
 
-;; Use narrow tab width except in shell mode (for ls output)
-(set-default 'tab-width 4)
-(setq tab-width 4)
-(add-hook 'shell-mode-hook (lambda () (setq tab-width 8)))
diff --git a/lisp/init-eshell.el b/lisp/init-eshell.el
index 60c83ef..069ce56 100644
--- a/lisp/init-eshell.el
+++ b/lisp/init-eshell.el
@@ -50,6 +50,9 @@
 
 (add-hook 'shell-mode-hook
           (lambda ()
+            ;; needed for proper display of "ls"
+            (setq tab-width 8)
+
             (define-key shell-mode-map
               (kbd "C-d") 'my/comint-delchar-or-eof-or-kill-buffer)
             (define-key shell-mode-map