Commit Graph

34 Commits

Author SHA1 Message Date
James Nguyen d461f459f4 Change package-requires to 26.3
25 was already deprecated a year ago:

https://github.com/emacs-evil/evil-collection/pull/508/files
2022-06-06 20:53:16 -04:00
James Nguyen 4336587f8e [Magit]: Add new customs to bind $ and 0 2022-05-23 17:35:41 -04:00
James Nguyen c8366be124 Add some repolist bindings 2022-04-30 17:07:35 -04:00
James Nguyen 9f287eb937 Magit: Change motion states to normal 2022-04-14 11:16:09 -04:00
James Nguyen 646fbe11c8 Sort magit maps to allow key translation to work (#433) 2022-04-14 10:09:17 -04:00
condy ecc4ecc288 magit: fix tests 2022-04-02 15:57:34 +08:00
Jonas Bernoulli e557188692 Use transient's definition macros by their new names
See https://github.com/magit/transient/issues/192.
2022-03-14 08:59:04 -07:00
Steven Allen ffe4f66d43 Avoid binding escape to bury-buffer and quit-window
Escape usually means to:

1. Return to normal mode.
2. Abort the minibuffer.

By binding it to quit-window (or equivalent), hitting escape a few times
to exit a (potentially recursive) minibuffer, etc. can cause buffers to
vanish.

It's also:

1. Inconsistently applied.
2. Redundant with "q" (which is consistently applied).
2022-01-23 04:43:56 -08:00
condy e8d1eb117a Use default v/V for magit revert action
Fixes #571

Co-authored-by: Micah Buckley-Farlee <micah@super.mx>
2022-01-23 15:03:13 +08:00
Janek e6be41bed7 Fix C-u scroll in magit config 2022-01-04 21:29:02 +08:00
James Nguyen 33461aa545 Add support for forge 2021-11-11 12:33:37 -08:00
mosquito-magnet 940dfe91aa fix use-z-for-folds also in magit-mode-map
Keybinding for magit-mode-map has also changed, Z is now magit-worktree
instead of magit-stash. Remap it to magit-stash. Magit-worktree still
has its old mapping to %.
2021-08-26 10:36:10 +08:00
mosquito-magnet 53a76e15df magit: fix use-z-for-folds
magit-worktree has been moved from "%" to "Z" in transient prefix
magit-dispatch in commit 9bec1c54ab0705eb68ae4aa6c8a0498999a018f6.

When mapping magit-stash to Z in magit-dispatch due to
evil-collection-magit-use-z-for-folds, first move magit-worktree back to
its original keybinding to avoid collision.
2021-08-26 10:36:10 +08:00
condy 8213a9be94 magit: fix search repeat in magit-blame
close #502
2021-07-10 04:17:30 +08:00
condy d97e0ff4af magit: properly bind escape key 2021-07-08 02:27:39 +08:00
Nicholas Vollmer 6c97b0c186 Properly bind escape in magit-mode-map
Without using `kbd', each key in the string "<escape>" is interpreted as a
prefix key.
2021-06-28 18:26:48 +08:00
condy c7f85d330b magit: interpret evil-toggle-key in the right way
fix #492
2021-06-26 03:29:08 +08:00
duianto 23c60d576c Docstring: evil-collection-magit-use-y-for-yank
`magit-show-refs-popup` and `magit-dispatch-popup`
have been renamed without "-popup".

Define magit-show-refs as a transient command
c3135cdb23

Define magit-dispatch as a transient command
dde9a5b77a

And make the docstring more readable,
with the related key and command on the same line.
2021-05-08 01:41:05 +08:00
Andrew Psaltis 09b165d4c2 Magit: Properly format rebase instructions when commentChar is "%"
This change adjusts the formatting of the instructions in the `git-rebase`
buffer to allow them to be properly formatted when git's `core.commentChar` is
set to `%`.  In particular, lines will look something like this:

```
%-8s p
```

The root cause seems to be the how the lines are constructed: comment characters
are directly added to the format string.  When it is `%`, `format` appears to
proceed until it finds the next `%` character, (corresponding to the `%` in
`%-8s`) above and prints it directly to the string rather than interpreting it
something to format.

This is fixed by constructing the format string with the comment character as an
argument to `format` rather than being added directly to the format string.

Fixes #468.
2021-04-24 16:26:15 -07:00
Kira Bruneau 65766ad8c0 Magit: Keep bindings consistent with prefix key in magit-revert
"O" is used to launch `magit-reset`, not `magit-revert`. "_" and "-"
should be used for the suffix commands to be consistent with the
prefix key "_".
2021-04-13 23:35:26 -07:00
James Nguyen e6824e2ad2 Magit: Rely on popup backup when reverting popups (#446) 2021-01-30 00:33:41 -08:00
James Nguyen 2bbaa52d22 Magit: Add submodule prefix back in after forge loads (#446) 2021-01-30 00:33:41 -08:00
James Nguyen bd44a32e83 Magit: Declare more variables (#449) 2021-01-24 11:12:29 -08:00
Benjamin Motz ef90687fe4 magit: (visual) set "y" to magit-copy-section-value 2021-01-24 00:17:49 -08:00
James Nguyen ffbf149f0e Magit: Replace evil-define-key with evil-collection-define-key 2021-01-17 12:41:05 -08:00
James Nguyen 75ee9eea7b Magit: Add more maps for rotation (#433) 2021-01-17 12:41:05 -08:00
James Nguyen 6ac763fd88 Magit: Wrap rebase define-keys with (kbd)
Later we use lookup-key in this way:

(lookup-key aux-map (kbd (car cmd)))

which was slightly different from how we were defining the keymap which resulted
in M-j & M-k not being bound or displayed properly.
2021-01-04 22:34:39 -08:00
Benjamin Motz 4615b8ca45 magit: make gj/gk behave consistently
Both should do the same thing, which is magit-section-{forward,backward}-sibling.
2021-01-01 18:20:46 -08:00
James Nguyen 05ed92a129 Remove extra commas 2020-11-27 16:03:31 -08:00
James Nguyen dc12892a1e Magit: Fix a few more cases where binds aren't set (#407) 2020-11-27 13:45:53 -08:00
James Nguyen 2cf81f91ea Magit: Use kbd with S-SPC and S-DEL (#406) 2020-11-25 13:10:40 -08:00
James Nguyen e24469514a Update latest changes to evil-magit
Fix test failure in when testing original section bindings:

+  `((,(copy-keymap magit-file-section-map) "\C-j" magit-diff-visit-worktree-file)
+    (,(copy-keymap magit-hunk-section-map) "\C-j" magit-diff-visit-worktree-file))
2020-11-24 12:00:03 -08:00
James Nguyen eff6f710ef Port over evil-magit 2020-11-24 12:00:03 -08:00
Justin Burkett 95dad4c734 Use subdirectories for setup files (+READMEs)
Move setup files into subdirectories. Move mode directories to modes subdir.
This will make it easy to specify a recipe in melpa that maintains the directory
structure. Add interactive functions to jump to .el and README files

See #170
2019-10-09 19:41:45 -07:00