emacs: Get rid of set-tab-usage

2 files changed, 4 insertions, 5 deletions

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index 33ae15e..e19aa47 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -12,7 +12,7 @@
   :mode ("\\.s\\'" "\\.S\\'")
   :init
   (defun arkta/asm-setup ()
-    (set-tab-usage t)
+    (setq indent-tabs-mode t)
     (set-tab-width 8))
   :hook (asm-mode . arkta/asm-setup))
 
@@ -29,7 +29,7 @@
          ("\\.cpp\\'" . c++-ts-mode))
   :init
   (defun arkta/c-setup ()
-    (set-tab-usage t)
+    (setq indent-tabs-mode t)
     (set-tab-width c-ts-mode-indent-offset))
   :hook (c-ts-base-mode . arkta/c-setup)
   :custom
@@ -105,7 +105,7 @@
   :init
   (defun arkta/go-setup ()
     (add-hook 'before-save-hook #'gofmt-before-save nil t)
-    (set-tab-usage t)
+    (setq indent-tabs-mode t)
     (set-tab-width go-ts-mode-indent-offset))
   :hook (go-ts-mode . arkta/go-setup))
 
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index fdff907..ca353b4 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -215,12 +215,10 @@
              ,@(mapcar (lambda (name) `(setq-default ,name value)) emacs-names))
          ,@(mapcar (lambda (name) `(setq ,name value)) emacs-names)))))
 
-(defsetter tab-usage indent-tabs-mode)
 (defsetter tab-width c-basic-offset nasm-offset standard-indent tab-width)
 
 ;; Miscellany
 
-(set-tab-usage nil t)
 (set-tab-width 4 t)
 
 ;; HIC SVNT DRACONES
@@ -504,6 +502,7 @@
          (before-save . delete-trailing-whitespace))
   :custom
   (backward-delete-char-untabify-method nil)
+  (indent-tabs-mode nil)
   (mail-user-agent 'mu4e-user-agent))
 
 (use-package swiper