Commit gabesoft/evil-mc@041b904475 changed
the default key bind of `g r u` to a different (new) function. The old
behaviour is now available at `g r q`.
Unify "Key binding" headers.
Capitalize first word in descriptions.
Smerge transient state section:
Group by column/category.
Merge previous hunk bindings to one line.
Remove Smerge prefix in descriptions.
New Smerge transient state key bindings:
Merge action section:
Kill current
Diff section:
Diff base and mine
Diff mine and other
Diff base and other
Ediff
Match the magit buffer section/sibling navigation keys (bound in evil-magit) and
the evil-collections motion section also suggests using [ and ] for navigation
between sections.
And list the default ibuffer filter group motion bindings:
Forward: TAB and M-n
Backward: S-TAB and M-p
The line in the Spacemacs home buffer that shows the Spacemacs version, Emacs
version and the Spacemacs distribution, for example: "0.300.0@26.1 (spacemacs)"
were tied to the banner. The line disappeared when the banner was hidden.
I realize this may be controversial, but as I understand it (correct me if I'm
wrong), all `SPC f F` does differently compared to `SPC f f` is call the vanilla
version of `helm-find-files` that does take `thing-at-point` into account. But I
presume we removed this feature in `spacemacs/helm-find-files` for a reason.
Also, it makes sense as a *forte* version of `helm-find-files` when you can't
find something in your current directory and decide to drill deeper. This
complies with the general tone of uppercase/lowercase bindings in Spacemacs, and
provides more utility than te subtle distinction between different
implementations of `helm-find-files`.
Added key bindings:
`e` `smerge-ediff` to diff column
`K` `smerge-kill-current` to merge action column,
(used upper case K, because lower case k moves the cursor to the previous line)
Renamed "join curr/next hunk" to "Combine curr/next hunks", to match it's
command name: `smerge-combine-with-next`
and moved it from the "Merge Action" column to the "Other" column. Because the
merge action column handles versions while the combine command acts on hunks.
Sorted and groupped the backend keys to match the transient state columns.
Adds `SPC m e u` to the Clojure layer to call `cider-undef`, removing an
existing definition from the current namespace.
This provides a Spacemacs style keybinding for the existing Emacs style
keybinding `C-c C-u`
Capitalize title and column headers.
Reduce two to one space between the key and description in the first column.
Rename and separate "move up/down" to "next line" and "prev line", to reduce the
first columns width, and to make it clear that it doesn't move the hunks.
Reduce four to two spaces between the first and second columns.
Rename "combine with next" to "join curr/next hunk" to indicate that the
hunks/conflicts are combined and not just of the versions.
Add a new column: Diff
Remove "diff" and "to" from diff key descriptions, to reduce the column width.
Move refine from the Other column to the new Diff column.
I often use these operations to ask how mine and other have diverged:
=< smerge-diff-base-mine
== smerge-diff-mine-other
=> smerge-diff-base-other
It's awkward to use their global keybindings under C-c ^ because that exits the
smerge transient-state.
Judging from issue GH-7378 there was no principled reason to omit them, only
that the author did not use them himself.
Noticed a new warning during startup saying
that sqlup-mode is using "=c" where "=" is no
prefix key. Noticed that the entire binding
was not carried out in this case.
Therefore I have removed "=" from the binding
but left it on "c" until enough text
manipulations are available, then it should
be moved to "x text manipulation" group instead.
- dap-debug-edit-template is very important for some of the debug adapters so it
is important to have a keybinding for it to improve the discoverability
