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
- in addition to that I have removed the line that removes clangd from the
server list since it is not needed in latest lsp-mode since it has smaller
priority than ccls/cquery.
ietf layer declared a wrong use-package
declaration, which tried to load ietf-docs
instead of the locally installed irfc package
causing irfc-mode to fail loading.
The issue was that `flycheck-package` explicitly
activated `flycheck-pos-tip-mode` however
this package is owned by `syntax checking layer`
and should only be activated by it directly.
This commit removes the workarounds needed on older versions of `dart-mode` library, now that many of the fixes have landed.
This commit also fixes the integration with flycheck, as there is a new function used on the `develop` branch.
Naming the main file `main.nim` is a `C` convention, not a `Nim` convention. In
fact, `Nimble` defaults to naming the main file after the project at
initialization. I will soon add a function that parses the Nimble configuration
for project entry point and compiles that. Until then, this is a solid
compromise between flexibility and reliability. I also added a doc-string to the
function.
For those with MELPA on their mind. It's easier to work when packaging errors
are reported on the fly, and we don't even have `package-lint` integration for
occasional checkups yet.
It adds no unnecessary verbosity as it is only triggered by `Package-Requires`
and `Package-Version` headers.
