Dolist for requires, remove one require

os-specific only had a couple things, and they could be included in the main
init.  Other requirements were all put into one dolist - no prformance
difference vs loading after init.

diff --git a/init.el b/init.el
index 941ee2b6f34429b37272a3c7cab5fc478ad42a1b..e923f29f79650b84beab42787034013d5a379f25 100644 (file)
--- a/init.el
+++ b/init.el
@@ -4,25 +4,39 @@
 
 ;;; Code:
 
-;; Load Features
-(add-to-list 'load-path (concat user-emacs-directory "re/"))
-(add-to-list 'load-path (concat user-emacs-directory "acme-mouse/"))
-(add-to-list 'load-path (concat user-emacs-directory "sedit-mouse/"))
+(dolist (path '("re/" "acme-mouse/" "sedit-mouse/"))
+  (add-to-list 'load-path (concat user-emacs-directory path)))
 
-(require 're-packages)
-(require 're-editing-defuns)
-(require 're-file-defuns)
-(require 're-vc-defuns)
-(require 're-os-specific)
-(require 're-bindings)
+(dolist (requirement '(re-packages
+                      re-editing-defuns
+                      re-file-defuns
+                      re-vc-defuns
+                      re-bindings
+                      re-repl-defuns
+                      re-pass-alike
+                      re-dired-defuns
+                      re-skeletons
+                      ;; acme-theme
+                      eng-paper-theme))
+  (require requirement))
 
-(add-hook 'after-init-hook
-         (lambda ()
-           (require 're-repl-defuns)
-           (require 're-pass-alike)
-           (require 're-dired-defuns)
-           (require 're-skeletons)
-           (when (not (equal system-type 'windows-nt)) (require 're-mu4e))))
+(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))))))
 
 (dolist (mode-maps '(("\\.keymap\\'" . c-mode) ("\\.dtsi\\'" . c-mode)))
   (add-to-list 'auto-mode-alist mode-maps t))
@@ -155,9 +169,6 @@
 (setq bookmark-save-flag 1)
 \f
 ;; GUI Settings
-(require 'acme-theme)
-(require 'eng-paper-theme)
-;; (load-theme 'acme t)
 (load-theme 'eng-paper t)
 (menu-bar-mode -1)
 (tool-bar-mode -1)
@@ -279,7 +290,7 @@
 (setq abbrev-file-name (expand-file-name "abbrev_defs" user-emacs-directory)
       save-abbrevs 'silently)
 
-(dolist (hook '(org-mode-hook 'howm-mode-hook))
+(dolist (hook '(org-mode-hook howm-mode-hook))
   (add-hook hook #'abbrev-mode))
 \f
 ;; Customization framework

diff --git a/re/re-os-specific.el b/re/re-os-specific.el
deleted file mode 100644 (file)
index df2976d..0000000
--- a/re/re-os-specific.el
+++ /dev/null
@@ -1,31 +0,0 @@
-;;; re-os-specific.el -*- lexical-binding: t; -*-
-;; This file is not part of GNU Emacs
-
-;;; Code:
-
-(when (equal system-type 'windows-nt)
-  (setq w32-recognize-altgr 'nil)
-  (defun re/unfuck-aveva-license nil
-    "Remove the offending xml files.
-Use this when aveva can't find ass with both hands."
-    (interactive)
-    (let ((xml1 "c:/ProgramData/AVEVA/Licensing/License API2/Data/LocalAcquireInfo.xml")
-         (xml2 "c:/ProgramData/AVEVA/Licensing/License API2/Data/LocalBackEndAcquireInfo.xml"))
-      (when (file-exists-p xml1) (delete-file xml1))
-      (when (file-exists-p xml2) (delete-file xml2)))))
-
-(unless (equal system-type 'windows-nt)
-  (setq trash-directory "~/Trash/")
-  (defun doas nil
-    "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 nil
-    "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)))))
-
-(provide 're-os-specific)
-;;; re-os-specific.el ends here