f70110dd77
This fixes the following error when pressing `SPC g r n` if
smerge-mode is not loaded yet:
Symbol's function definition is void: smerge-vc-next-conflict
Removed the `:commands` argument to use-package, which is
erroneous (:commands sets up autoloads so that invoking the command
will load the package specified, but only if the command is not
already fboundp).
Instead, explicitly load smerge-mode when entering the transient
state, so that any of the key bindings in the transient state will be
available. This has the same intended effect as the previous code.
|
||
|---|---|---|
| .. | ||
| +chat | ||
| +checkers | ||
| +completion | ||
| +distributions | ||
| +emacs | ||
| +filetree | ||
| +fonts/unicode-fonts | ||
| +frameworks | ||
| +fun | ||
| +intl | ||
| +lang | ||
| +misc | ||
| +music | ||
| +os | ||
| +pair-programming/floobits | ||
| +readers | ||
| +source-control | ||
| +spacemacs | ||
| +tags | ||
| +themes | ||
| +tools | ||
| +vim | ||
| +web/eww | ||
| +web-services | ||
| +window-management/exwm | ||
| auto-layer.el | ||
| LAYERS.org | ||