From f83ed02b6b311c314a7199c5ca09cda8ed299ec9 Mon Sep 17 00:00:00 2001
From: Juan Placencia <juan@placencia.uno>
Date: Mon, 14 Jun 2021 19:26:39 -0500
Subject: [PATCH] Fix accidental mode toggling

---
 uno/modules/lang/image.org    |  1 +
 uno/modules/ui/completion.org |  6 +++++-
 uno/modules/ui/emacs.org      | 20 +++++++++++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/uno/modules/lang/image.org b/uno/modules/lang/image.org
index 73c52a0..e8d6348 100644
--- a/uno/modules/lang/image.org
+++ b/uno/modules/lang/image.org
@@ -22,6 +22,7 @@ Define image language package.
     :after uno-lang-image
     :hook
     (image-mode . uno/lang/image/check-type)
+    (image-minor-mode . uno/run-prog-mode-hook)
     :general
     (uno-mode-leader-define
       :definer 'minor-mode
diff --git a/uno/modules/ui/completion.org b/uno/modules/ui/completion.org
index 599d395..176653b 100644
--- a/uno/modules/ui/completion.org
+++ b/uno/modules/ui/completion.org
@@ -109,7 +109,11 @@ Text completion framework.
     (company-require-match 'never)
     :hook
     (company-mode . evil-normalize-keymaps)
-    (uno-prog-mode . company-mode))
+    (uno-prog-mode . uno/ui/completion/company)
+    :init
+    (defun uno/ui/completion/company ()
+      "Set up company-mode."
+      (company-mode 1)))
 #+END_SRC
 
 ** Help
diff --git a/uno/modules/ui/emacs.org b/uno/modules/ui/emacs.org
index 2639c25..ee59940 100644
--- a/uno/modules/ui/emacs.org
+++ b/uno/modules/ui/emacs.org
@@ -34,13 +34,23 @@ Define UI Emacs package.
                                     face
                                     minibuffer-prompt))
     :hook
-    ((special-mode uno-prog-mode uno-text-mode) . hl-line-mode)
-    (uno-prog-mode . display-line-numbers-mode)
-    (uno-prog-mode . toggle-truncate-lines)
-    (uno-text-mode . toggle-word-wrap)
+    ((special-mode uno-prog-mode uno-text-mode) . uno/ui/emacs/setup-mode)
+    (uno-prog-mode . uno/ui/emacs/setup-prog)
+    (uno-text-mode . uno/ui/emacs/setup-text)
     :config
     (fset 'yes-or-no-p 'y-or-n-p)
     (scroll-bar-mode -1)
     (menu-bar-mode -1)
-    (tool-bar-mode -1))
+    (tool-bar-mode -1)
+    :init
+    (defun uno/ui/emacs/setup-mode ()
+      "Set up many (or all) modes."
+      (hl-line-mode 1))
+    (defun uno/ui/emacs/setup-prog ()
+      "Set up prog-mode."
+      (display-line-numbers-mode 1)
+      (toggle-truncate-lines 1))
+    (defun uno/ui/emacs/setup-text ()
+      "Set up text-mode."
+      (toggle-word-wrap 1)))
 #+END_SRC