Browse Source

Fix accidental mode toggling

master
Juan Placencia 4 years ago
parent
commit
f83ed02b6b
3 changed files with 21 additions and 6 deletions
  1. +1
    -0
      uno/modules/lang/image.org
  2. +5
    -1
      uno/modules/ui/completion.org
  3. +15
    -5
      uno/modules/ui/emacs.org

+ 1
- 0
uno/modules/lang/image.org View File

@ -22,6 +22,7 @@ Define image language package.
:after uno-lang-image :after uno-lang-image
:hook :hook
(image-mode . uno/lang/image/check-type) (image-mode . uno/lang/image/check-type)
(image-minor-mode . uno/run-prog-mode-hook)
:general :general
(uno-mode-leader-define (uno-mode-leader-define
:definer 'minor-mode :definer 'minor-mode

+ 5
- 1
uno/modules/ui/completion.org View File

@ -109,7 +109,11 @@ Text completion framework.
(company-require-match 'never) (company-require-match 'never)
:hook :hook
(company-mode . evil-normalize-keymaps) (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 #+END_SRC
** Help ** Help

+ 15
- 5
uno/modules/ui/emacs.org View File

@ -34,13 +34,23 @@ Define UI Emacs package.
face face
minibuffer-prompt)) minibuffer-prompt))
:hook :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 :config
(fset 'yes-or-no-p 'y-or-n-p) (fset 'yes-or-no-p 'y-or-n-p)
(scroll-bar-mode -1) (scroll-bar-mode -1)
(menu-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 #+END_SRC

Loading…
Cancel
Save