Some cleanup

get rid of extraneous stuff.  Don't know if w32-altgr mode can be set when on
linux (I assume so), so just always set it to nil.

diff --git a/init.el b/init.el
index e923f29f79650b84beab42787034013d5a379f25..e21aa8e7c3d544aa4aa6a6479b14a8a5bf0c3d39 100644 (file)
--- a/init.el
+++ b/init.el
@@ -16,27 +16,26 @@
                       re-pass-alike
                       re-dired-defuns
                       re-skeletons
-                      ;; acme-theme
                       eng-paper-theme))
   (require requirement))
 
-(if (equal system-type 'windows-nt)
-    (setq w32-recognize-altgr 'nil)
-  (progn
-    (require 're-mu4e)
-    (setq trash-directory "~/Trash/")
-    (defun doas ()
-      "Use TRAMP to reopen the current buffer as root using doas."
-      (interactive)
-      (when buffer-file-name
-       (find-alternate-file (concat "/doas:root@localhost:"
-                                    buffer-file-name))))
-    (defun sudo ()
-      "Use TRAMP to reopen the current buffer as root using sudo."
-      (interactive)
-      (when buffer-file-name
-       (find-alternate-file (concat "/sudo:root@localhost:"
-                                    buffer-file-name))))))
+(setq w32-recognize-altgr 'nil)
+
+(unless (equal system-type 'windows-nt)
+  (require 're-mu4e)
+  (setq trash-directory "~/Trash/")
+  (defun doas ()
+    "Use TRAMP to reopen the current buffer as root using doas."
+    (interactive)
+    (when buffer-file-name
+      (find-alternate-file (concat "/doas:root@localhost:"
+                                  buffer-file-name))))
+  (defun sudo ()
+    "Use TRAMP to reopen the current buffer as root using sudo."
+    (interactive)
+    (when buffer-file-name
+      (find-alternate-file (concat "/sudo:root@localhost:"
+                                  buffer-file-name)))))
 
 (dolist (mode-maps '(("\\.keymap\\'" . c-mode) ("\\.dtsi\\'" . c-mode)))
   (add-to-list 'auto-mode-alist mode-maps t))
@@ -44,39 +43,20 @@
 (add-hook 'c-mode-hook (lambda () (require 're-c-style)))
 \f
 ;; Tabs
-(setq-default indent-tabs-mode 'only
+
+(setq-default indent-tabs-mode t
              tab-width 8
              backward-delete-char-untabify-method nil)
 
 (advice-add 'indent-to :around
            (lambda (orig-fun column &rest args)
-             (when (eq indent-tabs-mode 'only)
+             (when indent-tabs-mode
                (setq column (* tab-width (round column tab-width))))
              (apply orig-fun column args)))
 
-(setq whitespace-style '(face
-                        tabs
-                        spaces
-                        trailing
-                        lines
-                        space-before-tab
-                        newline
-                        indentation::tab
-                        empty
-                        space-after-tab
-                        space-mark
-                        tab-mark
-                        newline-mark
-                        missing-newline-at-eof))
-
 (dolist (indent-level '(c-basic-offset cperl-indent-level LaTeX-indent-level))
   (defvaralias indent-level 'tab-width))
 
-(dolist (hook '(prog-mode-hook text-mode-hook LaTeX-mode-hook))
-  (add-hook hook
-           (lambda ()
-             (keymap-local-set "<TAB>" #'self-insert-command)
-             (setq indent-line-function 'tab-to-tab-stop))))
 \f
 ;; Buffer dealiŋ
 (setq-default indicate-empty-lines t
@@ -188,8 +168,6 @@
                                   (if (buffer-modified-p)
                                       'mode-line-highlight
                                     'header-line)))
-               ;; removed the below to test if it makes a difference
-               ;; mode-line-window-dedicated
                " "
                (:propertize (buffer-file-name "%f" "%b")
                             face