Commit graph

14 commits

Author SHA1 Message Date
syl20bnr
ca5b8be90b New hybrid mode variable hybrid-mode-enable-evilified-state
When non nil then evilified buffer use evilified state, otherwise
they use the emacs state (may put the hybrid state if users get
confused).
2016-03-16 23:34:20 -04:00
syl20bnr
c2296f71f8 Put back holy and hybrid in spacemacs base layer
They are not optional
Also fixes some bugs like toggling hybrid mode from holy mode and
toggling off the hybrid mode.
2016-03-16 21:59:44 -04:00
syl20bnr
82fdd9a511 Use evil in holy-mode
Motivation

While disabling Evil in holy-mode makes its implementation shorter and
sounds elegant on the paper, in practice it puts a big burden on the
configuration parts which need to know if Evil is enable or not. This is
a bad separation of concerns and the bunch of fixes that we were forced
to do in the past weeks shows this issue. Those fixes were about
removing the knowledge of the activation of Evil by implementing new
dispatching functions to be used by layers, this is cumbersome and makes
Spacemacs layer configuration more subtle which is not good. There was
additional bad consequences of the removal of Evil state like the
impossibility to use Evil lisp state or iedit states, or we would have
been forced to implement a temporary activation of Evil which is
awkward.

Instead I reintroduce Evil as the central piece of Spacemacs design thus
Evil is now re-enabled in holy-mode. It provides the abstraction we need
to isolate editing styles and be able to grow the Spacemacs
configuration coverage sanely. Layers don't need to check whether the
holy mode is active or not and they don't need to know if Evil is
available (it is always available). We also don't need to write
additional dispatching functions, this is the job of Evil, and I think
it provides everything for this. Ideally configuration layer should be
implemented with only Evil in mind and the holy-mode (and hybrid-mode)
should magically make it work for Emacs style users, for instance we can
freely use `evil-insert-state` anywhere in the code without any guard.

Evil is now even more part of Spacemacs, we can really say that
Spacemacs is Emacs+Evil which is now an indivisible pair. Spacemacs
needed this stable API to continue on the right track.

While these changes should be rather transparent to the user, I'm sorry
for this experimental period, I failed to see all the implications of
such a change, I was just excited about the possibility to make Evil
optional. The reality is that Spacemacs has to embrace it and keep its
strong position on being Emacs+Evil at the core.

Implementation

- insert, motion and normal states are forced to emacs state using an
advice on `evil-insert-state`, `evil-motion-state` and
`evil-normal-state` respectively. These functions can be used freely in
the layer configuration.
- A new general hook `spacemacs-editing-style-hook` allow to hook any
code that need to be configured based on the editing style. Functions
hooked to this hook takes the current style as parameter, this
basically generalize the hook used to setup hjkl navigation bindings.
- ESC has been removed from the emacs state map.
- Revert unneeded changes
  - Revert "evil: enter insert-state only from normal-state"
    commit bdd702dfbe.
  - Revert "avoid being evil in deft with emacs editing style"
    commit f3a16f49ed.

Additional changes

All editing style packages have been moved to a layer called
`spacemacs-editing-styles`

Notes

I did not have time to attack hybrid mode, I should be able to do it
later.
2016-03-13 21:16:55 -04:00
justbur
f6b82ee90d helm/ivy: Use hook to update hjkl navigation
Introduce hjkl-completion-navigation-functions to hold the functions to
disable and enable hjkl navigation for ivy and/or helm. The hook is run
with args to indicate whether to enable or disable.
2016-02-16 23:53:43 -05:00
syl20bnr
046d86800c Clean copyrights and update for year 2016 2016-01-11 21:42:17 -05:00
syl20bnr
ea333f7282 completion: move hjkl function to layers and treat ivy as a package 2016-01-09 15:29:37 -05:00
syl20bnr
2f479eedc3 holy-mode: fix handling of evil-escape 2016-01-05 00:58:05 -05:00
syl20bnr
5463a370bd holy-mode: fix toggle rule regression
From doc:
SPC t e E toggles between vim and emacs styles (corrected)
SPC t e h toggles between vim and hybrid styles (was correct)
2015-12-21 00:14:46 -05:00
justbur
27fa611af6 holy-mode: Disable certain modes on activation
Includes evil-escape-mode and hybrid-mode for now, but more can be added
to holy-mode-modes-to-disable-alist.
2015-12-21 00:13:34 -05:00
justbur
84a8f124df hybrid-mode: Add option to change default state
Useful for those who want to start in hybrid state with emacs bindings.
2015-12-21 00:13:29 -05:00
justbur
1d05f3887a holy-mode == (evil-mode -1)
The proper holy-mode (IMO). Simply disable evil-mode and reset the
cursor and mode-line settings.
2015-12-20 23:25:48 -05:00
vijaykiran
d6be41a4e8 Fix Latin function name
Apparently ` in-nominus-patris-et-filii-et-sipritus-sancti` should be
`in-nomine-patris-et-filii-et-sipritus-sancti`

See: https://en.wikipedia.org/wiki/Trinitarian_formula
Via: https://twitter.com/PeterHilton/status/672133909795196928
2015-12-03 23:54:15 -05:00
kr5x
05a40a2ee2 holy-mode: fix #3876 2015-11-19 12:36:03 +01:00
Robert O'Connor
3f2e885811 Rename spacemacs-core to spacemacs-base
Per the discussion in #3002. A comment in #3047 prompted this PR.
2015-09-16 21:22:35 -04:00