Rename macros

1 files changed, 17 insertions, 17 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 3c9c39f..0356162 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -57,12 +57,12 @@ DOT are intentionally being skipped."
   (concat (symbol-name user) "@" (symbol-name host) "."
           (symbol-name com)))
 
-(defmacro eval-after-init (&rest body)
+(defmacro oni:eval-after-init (&rest body)
   "Defer execution of BODY until after Emacs init."
   (declare (indent 0))
   `(add-hook 'emacs-startup-hook #'(lambda () ,@body)))
 
-(defmacro link-modes (mode1 mode2)
+(defmacro oni:link-modes (mode1 mode2)
   "Whenever MODE1 is started, also start MODE2. Same for stopping.
 
 If INVERSE is specified, make sure MODE2 is turned off whenever
@@ -79,7 +79,7 @@ MODE1 is enabled and vice-versa."
        (add-hook ',(intern (concat mode1-name "-hook"))
                  #',function-name))))
 
-(defmacro make-modes-exclusive (mode1 mode2)
+(defmacro oni:exclude-modes (mode1 mode2)
   "Whenever MODE1 is started, stop MODE2. Switch for stopping."
   (let* ((mode1-name (symbol-name mode1))
          (mode2-name (symbol-name mode2))
@@ -95,7 +95,7 @@ MODE1 is enabled and vice-versa."
        (add-hook ',(intern (concat mode1-name "-hook"))
                  #',function-name))))
 
-(defmacro mode-hooks (&rest lst)
+(defmacro oni:mode-hooks (&rest lst)
   "Apply `add-mode-hooks' to each element of LST."
   (declare (indent 0))
   `(progn
@@ -103,14 +103,15 @@ MODE1 is enabled and vice-versa."
                #'(lambda (itm)
                    (add-mode-hooks (car itm) (list 'quote (cadr itm)))) lst))))
 
-(defmacro stumpwm (&rest body)
+(defmacro oni:stumpwm (&rest body)
   "Execute BODY in stumpwm."
   (declare (indent 0))
   `(call-process init-stumpish-program nil nil nil
                  ,(format "eval '%S'" `(progn ,@body))))
 
-(defmacro turn-off (&rest modes)
+(defmacro oni:turn-off (&rest modes)
   "Turn off each mode in MODES."
+  (declare (indent 0))
   `(progn ,@(mapcar (lambda (m) `(,m -1)) modes)))
 
 ;;;; Variables
@@ -687,7 +688,7 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
 
   (if (daemonp)
       (add-hook 'after-make-frame-functions #'init-set-theme)
-    (eval-after-init (load-theme theme t))))
+    (oni:eval-after-init (load-theme theme t))))
 
 (defun shell-command-with-command (command &optional output-buffer)
   "Print both COMMAND and the output into OUTPUT-BUFFER."
@@ -942,9 +943,7 @@ If no direction is given, don't split."
   (setq compilation-scroll-output t))
 
 (stante-after custom
-  (setq custom-theme-directory "~/.emacs.d/themes")
-  ;; (eval-after-init (load-theme 'yoshi t))
-  )
+  (setq custom-theme-directory "~/.emacs.d/themes"))
 
 (stante-after desktop
   (setq desktop-restore-frames nil)
@@ -1241,7 +1240,7 @@ If no direction is given, don't split."
 (when (fboundp 'prettify-symbols-mode)
   (add-hook 'prog-mode-hook 'prettify-symbols-mode))
 
-(mode-hooks
+(oni:mode-hooks
   ((clojure emacs-lisp lisp sawfish scheme ielm geiser-repl slime-repl)
    paredit-mode)
   ((comint) turn-on-compilation-shell-for-pony)
@@ -1347,13 +1346,14 @@ If no direction is given, don't split."
 (enable '(downcase-region narrow-to-page narrow-to-region scroll-left
           upcase-region))
 
-(turn-off menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
-          column-number-mode line-number-mode tooltip-mode)
+(oni:turn-off
+  menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
+  column-number-mode line-number-mode tooltip-mode)
 
-(link-modes outline-minor-mode persistent-outline-mode)
-(make-modes-exclusive magit-blame-mode fci-mode)
+(oni:link-modes outline-minor-mode persistent-outline-mode)
+(oni:exclude-modes magit-blame-mode fci-mode)
 
-(eval-after-init
+(oni:eval-after-init
   (require 'auto-complete-config)
   (ac-config-default)
 
@@ -1364,7 +1364,7 @@ If no direction is given, don't split."
   (desktop-registry-auto-register))
 
 (when (equal system-name "drd")
-  (eval-after-init
+  (oni:eval-after-init
    (load (expand-file-name "~/.local/share/quicklisp/slime-helper.el")))
   (load "eap-autoloads"))