From db41608fee0133e1f18df43bbf0348ef09771617 Mon Sep 17 00:00:00 2001 From: Elias Almqvist Date: Wed, 30 Nov 2022 10:36:27 +0100 Subject: [PATCH] Merge fix --- doomemacs/.doom.d/config.el | 4 ++++ doomemacs/.doom.d/init.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doomemacs/.doom.d/config.el b/doomemacs/.doom.d/config.el index ef973b0..0d2d133 100644 --- a/doomemacs/.doom.d/config.el +++ b/doomemacs/.doom.d/config.el @@ -74,3 +74,7 @@ ;; ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; they are implemented. + +;; Indentation +(setq-default tab-width 4) +(setq-default indent-tabs-mode t) diff --git a/doomemacs/.doom.d/init.el b/doomemacs/.doom.d/init.el index 265c269..cf9159f 100644 --- a/doomemacs/.doom.d/init.el +++ b/doomemacs/.doom.d/init.el @@ -68,7 +68,7 @@ :emacs dired ; making dired pretty [functional] - electric ; smarter, keyword-based electric-indent + ;; electric ; smarter, keyword-based electric-indent ;;ibuffer ; interactive buffer management undo ; persistent, smarter undo for your inevitable mistakes ;; vc ; version-control and Emacs, sitting in a tree