Commit graph

263 commits

Author SHA1 Message Date
Samuel Tschiedel
9b73ce3ad8 fix(magit): remap magit-browse-thing to forge-browse-*
When using evil +everywhere, we disable the default forge bindings.
We must then explicitly remap magit-browse-thing, as it's just a
placeholder command (bound in multiple places).
2022-09-21 00:54:09 +02:00
Henrik Lissner
20c50755e8
fix(magit): end-of-file error
Due to an unbalanced paren in d8f87ad.

Amend: d8f87ada96
2022-09-07 00:55:51 +02:00
Henrik Lissner
ea84212d0a
fix(magit): void-function (:files) error
Due to a missed syntax error in d8f87ad.

Amend: d8f87ada96
2022-09-07 00:52:49 +02:00
casswedson
d8f87ada96 fix(magit): only install forge if asked 2022-09-07 00:25:52 +02:00
Henrik Lissner
aa54383b5d
refactor: deprecate doom-etc-dir for doom-data-dir
doom-etc-dir will be renamed to doom-data-dir, to better reflect its
purpose, and align it with XDG_DATA_HOME (where it will be moved to in
v3, where Doom will begin to obey XDG directory conventions more
closely).
2022-08-14 20:43:35 +02:00
Henrik Lissner
ad6a3d0f33
refactor: deprecate featurep! for modulep!
featurep! will be renamed modulep! in the future, so it's been
deprecated. They have identical interfaces, and can be replaced without
issue.

featurep! was never quite the right name for this macro. It implied that
it had some connection to featurep, which it doesn't (only that it was
similar in purpose; still, Doom modules are not features). To undo such
implications and be consistent with its namespace (and since we're
heading into a storm of breaking changes with the v3 release anyway),
now was the best opportunity to begin the transition.
2022-08-14 20:43:35 +02:00
Henrik Lissner
1abcf913aa
revert: fix(docs): set mode in file-local vars
emacs-straight/org-mode@e22b4eb7aa introduced a breaking change that
made it impossible to rely on .dir-locals.el to change org-mode buffers
in $EMACSDIR to doom-docs-org-mode (without infinite recursion), so we
used file-local variables in 7e400ab.

emacs-straight/org-mode@215de6176b reverted that change, so we can use
.dir-locals.el again, and this is my preference, since it requires less
boilerplate across our hundreds of org files.

Ref: emacs-straight/org-mode@215de6176b
Ref: emacs-straight/org-mode@e22b4eb7aa
Revert: 7e400abdc0
2022-08-07 19:08:07 +02:00
Henrik Lissner
1f8bf7accb
merge: rewrite-docs
I've omitted docs/*.org from this merge, as there is still work left to
do there, but I am pushing the module docs early so folks can benefit
from the new docs sooner.
2022-08-03 03:27:50 +02:00
Henrik Lissner
7e400abdc0
fix(docs): set mode in file-local vars
Due to emacs-straight/org-mode@e22b4eb, a replacement major mode (for
org-mode) can no longer be specified from .dir-locals.el, as it spirals
into infinite recursion. Therefore, a mode: line is needed in all Doom
docs.

Ref: emacs-straight/org-mode@e22b4eb7aa
2022-08-03 02:46:33 +02:00
Henrik Lissner
1255315bfc
refactor(docs): replace nav menus with virtual one
Now that the header is dynamically generated (when doom-docs-mode is
active), a literal header is unnecessary.
2022-08-02 19:37:07 +02:00
Henrik Lissner
e77a45bc22
docs: use lowercase keywords
As per Org's new defaults, which we're adopting elsewhere, so may as
well adopt it here.
2022-08-02 16:23:43 +02:00
Henrik Lissner
dd34802523
revert: compat
emacs-straight/compat@2a9cf8b7bd -> emacs-straight/compat@cc1924fd8b

compat is a dependency of magit and doom-modeline (among other
packages), but a recent bug on compat@2a9cf8b caused #6583, so I am
pinning it to a stable commit. It's not common that Doom pins 2nd/3rd
order dependencies, but I will consider doing that more going forward.

Pinning them across multiple modules isn't elegant, but a better
solution is in the works as part of #4273.

Fix: #6583
Ref: #4273
2022-07-31 16:56:14 +02:00
Ellis Kenyő
6ceb1e0bbe fix(magit): only revert if buffer file exists 2022-06-18 17:19:23 +02:00
Henrik Lissner
608acd9a3a
bump: :tools
SavchenkoValeriy/emacs-powerthesaurus@810a25056c -> SavchenkoValeriy/emacs-powerthesaurus@88bc5229cb
Silex/docker.el@fbd896e313 -> Silex/docker.el@44f0bbec9b
editorconfig/editorconfig-emacs@1d4acc3ec7 -> editorconfig/editorconfig-emacs@1f6f16c24f
emacs-citar/citar@ee98b94f7f -> emacs-citar/citar@dd028c6a4d
emacs-straight/rainbow-mode@949166cc01 -> emacs-straight/rainbow-mode@55a8c15782
emacsorphanage/quickrun@c680f5137c -> emacsorphanage/quickrun@314beae43c
jacktasia/dumb-jump@dbb915441a -> jacktasia/dumb-jump@1dd583011f
magit/forge@66b3993c98 -> magit/forge@36208c43bf
magit/magit@a4a78d341a -> magit/magit@c1fb53d3de
millejoh/emacs-ipython-notebook@e04e1e19c6 -> millejoh/emacs-ipython-notebook@7b9b14435c
purcell/envrc@57d78f0138 -> purcell/envrc@7f36664fc6
rafalcieslak/emacs-company-terraform@2d11a21fee -> rafalcieslak/emacs-company-terraform@8d5a16d1bb
rejeep/prodigy.el@168f5ace16 -> rejeep/prodigy.el@a3be00d3b9
tkf/emacs-request@c769cf33f2 -> tkf/emacs-request@38ed1d2e64
tmalsburg/helm-bibtex@db73156576 -> tmalsburg/helm-bibtex@ce8c17690d
2022-06-17 21:53:56 +02:00
Henrik Lissner
0a3c123d72
fix(magit): {1-4} overriding evil keybinds
evil-collection-magit-section introduces some redundant keybinds on
number keys 1-4, so our hack to correct these keys needed an adjustment.

And by unbinding these keys at the source (magit-section-mode-map), we
don't have to do the same for each inheriting keymap (like
code-review-mode-map and magit-mode-map).

Ref: emacs-evil/evil-collection@e26c869735
Amend: 31519d393a
2022-06-17 21:52:18 +02:00
Ellis Kenyo
e4184c6bc3 bump: :tools magit
magit/forge@eed613db88 -> magit/forge@66b3993c98
magit/magit@b4be194de1 -> magit/magit@a4a78d341a
wandersoncferreira/code-review@85ab2080e4 -> wandersoncferreira/code-review@d38fbe5930
2022-05-27 02:57:59 +02:00
Henrik Lissner
bab5bffa5d
bump: :tools
SavchenkoValeriy/emacs-powerthesaurus@02c9d11a3f -> SavchenkoValeriy/emacs-powerthesaurus@810a25056c
Silex/docker.el@8d64cf4f84 -> Silex/docker.el@fbd896e313
alphapapa/magit-todos@60152d5c4e -> alphapapa/magit-todos@67fd80c2f1
bdarcus/citar@79512aefdf -> bdarcus/citar@ee98b94f7f
editorconfig/editorconfig-emacs@3c03cef311 -> editorconfig/editorconfig-emacs@1d4acc3ec7
emacsorphanage/quickrun@78317951cd -> emacsorphanage/quickrun@c680f5137c
joaotavora/eglot@83a61f673a -> joaotavora/eglot@fd9a5646d1
magit/forge@5586863f98 -> magit/forge@eed613db88
magit/magit@4e29d5827c -> magit/magit@b4be194de1
millejoh/emacs-ipython-notebook@6063cee7fb -> millejoh/emacs-ipython-notebook@e04e1e19c6
tkf/emacs-request@3336eaa97d -> tkf/emacs-request@c769cf33f2
vedang/pdf-tools@72ef774320 -> vedang/pdf-tools@326552eef7
zx2c4/password-store@eea24967a0 -> zx2c4/password-store@c4d8a1d815
2022-03-31 19:25:50 +02:00
Luis Osa
09b3004abe
feat(magit): add evil keybinds for code-review
Add the two main keybindings expected in the README of code-review: `r`
for a transient menu with all actions and `RET` to add or edit a
comment. Both should only be enabled while in a `*Code Review*` buffer.

Ref: https://github.com/wandersoncferreira/code-review
2022-03-19 16:18:58 +01:00
Henrik Lissner
aac2c65826
tweak(magit): shrink right fringe
The right fringe isn't used for anything, so it was wasted space.

Also applies to org-roam's backlinks buffer.
2022-02-14 21:24:46 +01:00
Henrik Lissner
8cbfbce394 fix(magit,org): show fringe in org-roam side window
Otherwise, the fringe (and its nice magit chevrons) aren't visible to
org-roam users.
2022-02-06 03:27:08 +01:00
Henrik Lissner
7246db457c docs: replace doom-source with doom-repo links
I will later use "source" to refer to module sources, so better we avoid
the terminology for now.
2022-02-01 18:55:27 +01:00
Henrik Lissner
b05b9c5405 bump: :tools
andras-simonyi/citeproc-el@9f783967c1 -> andras-simonyi/citeproc-el@ba49516265
bdarcus/citar@b24b5b94b7 -> bdarcus/citar@79512aefdf
cjohansson/emacs-ssh-deploy@7c5fe8af2d -> cjohansson/emacs-ssh-deploy@9311f9b4f8
editorconfig/editorconfig-emacs@2ab86dc9a8 -> editorconfig/editorconfig-emacs@3c03cef311
emacs-lsp/lsp-mode@f49ea4e365 -> emacs-lsp/lsp-mode@cb7ec94435
joaotavora/eglot@dade5a1487 -> joaotavora/eglot@0f352213fc
k1LoW/emacs-ansible@40af0d2bbb -> k1LoW/emacs-ansible@d89ac0ee57
magit/forge@0ff9b8a0de -> magit/forge@5586863f98
magit/magit@0ac05f3962 -> magit/magit@4e29d5827c
paradoxxxzero/jinja2-mode@ecd19a40b7 -> paradoxxxzero/jinja2-mode@03e5430a7e
purcell/envrc@456c4100de -> purcell/envrc@e161624b91
tmalsburg/helm-bibtex@aa775340ba -> tmalsburg/helm-bibtex@db73156576
tmalsburg/helm-bibtex@aa775340ba -> tmalsburg/helm-bibtex@db73156576
tumashu/posframe@6c0e63d6b3 -> tumashu/posframe@c91d4d53fa
vedang/pdf-tools@4e6c778194 -> vedang/pdf-tools@72ef774320
zx2c4/password-store@04cd3023f4 -> zx2c4/password-store@eea24967a0
2022-01-30 02:42:54 +01:00
Henrik Lissner
3df8903071 bump: :tools
andras-simonyi/citeproc-el@538fed794c -> andras-simonyi/citeproc-el@9f783967c1
bdarcus/citar@51b30f2e40 -> bdarcus/citar@b24b5b94b7
emacs-lsp/lsp-mode@3d6a01dde9 -> emacs-lsp/lsp-mode@c228bce435
gagbo/consult-lsp@aaa9a31bc8 -> gagbo/consult-lsp@f4f195046b
joaotavora/eglot@28092ba3af -> joaotavora/eglot@2c0f262c24
magit/forge@a44afa81f1 -> magit/forge@0ff9b8a0de
magit/magit@2e73b66c29 -> magit/magit@0ac05f3962
millejoh/emacs-ipython-notebook@c6696c12eb -> millejoh/emacs-ipython-notebook@6063cee7fb
purcell/envrc@8a9a142cf9 -> purcell/envrc@456c4100de
realgud/realgud@978b455d7d -> realgud/realgud@3c88611c4e
tumashu/posframe@3b1dc400d2 -> tumashu/posframe@6c0e63d6b3
vedang/pdf-tools@a8847b75d3 -> vedang/pdf-tools@4e6c778194
wandersoncferreira/code-review@136c0933ba -> wandersoncferreira/code-review@ccc3795a72
yoshiki/yaml-mode@63b637f846 -> yoshiki/yaml-mode@a79d2a7b92

Close: #5977
Ref: emacs-lsp/lsp-mode#3295
2022-01-12 01:55:34 +01:00
Henrik Lissner
f491dd9e7b fix(magit): gate code-review behind +forge
code-review requires forge, therefore it shouldn't be available if
+forge isn't enabled on the :tools magit module.

Ref: 2d3a68df49
Fix: #5935
2022-01-03 19:13:09 +01:00
Björn Larsson
1a0fd1b7ec fix(magit): unbind M-1 etc. for code-review
code-review is built on magit-sections so it will have the same default
bindings for M-1, M-2 etc. To be consistent with the rest of doom, those
should be used for switching workspace and z1, z2 etc should be used for
toggling outlines in a magit-sections buffer.

This only affects users with :editor (evil +everywhere) enabled.

Amend: 2d3a68df49
2022-01-03 18:10:17 +01:00
Henrik Lissner
e8551ded5f bump: :tools magit
magit/forge@402773ef7e -> magit/forge@a44afa81f1
magit/magit@65c4485e19 -> magit/magit@2e73b66c29
wandersoncferreira/code-review@b0bedbdb30 -> wandersoncferreira/code-review@136c0933ba

Close: #5947
2022-01-03 16:51:51 +01:00
Björn Larsson
45a55c0ec9 fix(magit): move code-review files to etc dir
These files were put directly in .emacs.d causing the repository to
appear dirty. This should follow the doom convention of putting the
files in the .local/etc dir.

Amend: 2d3a68df49
2021-12-16 15:05:28 +01:00
Ellis Kenyő
a5f8d44d15
docs(magit): add docs for #5846
Ref: #5846
2021-12-15 15:17:45 +01:00
Ellis Kenyo
8169b6a87e
bump: :tools magit
magit/forge@41efa674cf -> magit/forge@402773ef7e
magit/magit@877c389ca0 -> magit/magit@65c4485e19
wandersoncferreira/code-review@f1a79c20ae -> wandersoncferreira/code-review@b0bedbdb30
2021-12-15 07:07:08 +00:00
Ellis Kenyo
2d3a68df49
feat(magit): replace github-review for code-review 2021-12-15 07:06:49 +00:00
Henrik Lissner
88844e9cec docs: simplify internal docs links
Fewer links means less confusion.

- Merge doom-issue and doom-commit links into doom-ref (for auto-linking
  Issue/PR/commit references).
- Merge doom-module-source and doom-docs-source links into doom-source.
- Rename doom-report-issue to doom-report.
- Use '!' as the icon for module issues link.
- Remove doom-repo (replaced with "doom:*" in :lang org module).
- Add doomdir and emacsdir links to :lang org module.
2021-11-21 20:04:28 +01:00
Henrik Lissner
6da20e45bd docs(:tools): update READMEs to new format 2021-11-21 20:04:28 +01:00
Henrik Lissner
1b0e1c2cd3 fix(magit): missing "N" keybind error on forge startup
An incompatibility between forge and evil-collection-forge causes this
error when starting Forge:

  Cannot insert ("N" "Forge" forge-dispatch) into magit-dispatch; o not
  found
2021-11-21 16:21:34 +01:00
Henrik Lissner
4cb1880945 bump: :tools magit
charignon/github-review@2a24e75dfc -> charignon/github-review@725fbc7b38
magit/forge@72b29bd7bc -> magit/forge@41efa674cf
magit/magit@aba0a59611 -> magit/magit@877c389ca0
2021-11-21 16:10:49 +01:00
Kirill A. Korinsky
0869d28483
bump: :emacs vc :tools magit
charignon/github-review@4d91dd6c56 -> charignon/github-review@2a24e75dfc
magit/forge@8264234db6 -> magit/forge@72b29bd7bc
magit/git-modes@433e1c57a6 -> magit/git-modes@62fbf2e5b8
magit/magit@1e40d00217 -> magit/magit@aba0a59611

- gitconfig-mode and gitignore-mode were merged into git-modes.

Close: #5665
Fix: #5667
2021-10-21 12:27:42 +02:00
Henrik Lissner
b15abdbd74 bump: :tools magit
charignon/github-review@341b7a1352 -> charignon/github-review@4d91dd6c56
magit/forge@22f905c4e8 -> magit/forge@8264234db6
magit/magit@f53148a569 -> magit/magit@bb7b7a4020
2021-10-10 20:16:03 +02:00
Kirill A. Korinsky
db51c6be88
bump: :tools magit
magit/forge@bae6a527a7 -> magit/forge@22f905c4e8

Fix magit/forge#382
2021-09-29 20:09:47 +02:00
Kirill A. Korinsky
79ebefa154
bump: :tools magit
magit/magit@1e40d00217 -> magit/magit@f53148a569
magit/forge@f97bc47e9e -> magit/forge@483baae56d

Fix magit/forge#382
Fix #5530
2021-09-29 18:39:25 +02:00
Kirill A. Korinsky
ca8892ee2e bump: :tools magit
magit/forge@6e8ab6c67e -> magit/forge@6e8ab6c67e

To fix https://github.com/magit/forge/issues/414
2021-09-15 23:04:34 +02:00
Henrik Lissner
e0bac80447 fix(magit): shut up magit-version
To prevent Magit's harmless, but annoying, "Cannot determine Magit's
version" errors.
2021-09-14 18:41:18 +02:00
Henrik Lissner
358f6f57b0 bump: :tools magit :emacs vc
alphapapa/magit-todos@78d24cf419 -> alphapapa/magit-todos@60152d5c4e
magit/forge@49da45ac45 -> magit/forge@6e8ab6c67e
magit/git-modes@7678ead3cd -> magit/git-modes@433e1c57a6
magit/magit@0f4963b0ec -> magit/magit@1e40d00217
pidu/git-timemachine@8d675750e9 -> pidu/git-timemachine@3381797bcb

Close #5465
2021-09-14 14:30:06 +02:00
Henrik Lissner
cf1fa4eeba Fix #5297: don't defer lv incrementally on magit
transient no longer depends on it.
2021-07-26 02:57:33 -04:00
Henrik Lissner
2ff51f7809 Bump :tools magit
magit/forge@b4fd066 -> magit/forge@49da45a
magit/magit@9b7b25f -> magit/magit@0f4963b

Fixes magit's handling of binary file headers (magit/magit@d3a729b1)
2021-07-23 15:44:12 -04:00
Henrik Lissner
6997adb654 Bump :tools
Silex/docker.el@bc2dc09 -> Silex/docker.el@9bcefbe
cjohansson/emacs-ssh-deploy@fce4ea3 -> cjohansson/emacs-ssh-deploy@7c5fe8a
emacs-lsp/dap-mode@4347846 -> emacs-lsp/dap-mode@01d9297
emacs-lsp/lsp-mode@9aa22de -> emacs-lsp/lsp-mode@aec8968
emacs-lsp/lsp-ui@9953a48 -> emacs-lsp/lsp-ui@cb02972
emacs-pe/docker-tramp.el@8e2b671 -> emacs-pe/docker-tramp.el@aaee11c
emacsorphanage/terraform-mode@a9fa5bd -> emacsorphanage/terraform-mode@e560caa
jacktasia/dumb-jump@8f70acb -> jacktasia/dumb-jump@542e72d
joaotavora/eglot@a5b7b7d -> joaotavora/eglot@5cc8df6
magit/forge@551e515 -> magit/forge@b4fd066
magit/magit@b68a760 -> magit/magit@9b7b25f
tumashu/posframe@739d8fd -> tumashu/posframe@f97c4af
xuchunyang/osx-dictionary.el@4d4cc19 -> xuchunyang/osx-dictionary.el@1a4479d
zx2c4/password-store@4e73cdc -> zx2c4/password-store@3dd1469
2021-07-09 17:42:18 -04:00
Henrik Lissner
364e74a96b Bump :emacs vc :tools magit
magit/forge@37aa4e4 -> magit/forge@551e515
magit/git-modes@14adca2 -> magit/git-modes@7678ead
magit/magit@e378827 -> magit/magit@b68a760
rmuslimov/browse-at-remote@fadf99d -> rmuslimov/browse-at-remote@e02ad21

Fixes #5095: breakage due to upstream refactors
2021-05-25 13:39:26 -04:00
Henrik Lissner
c525666688 Bump :tools
DamienCassou/auth-password-store@468bba2 -> DamienCassou/auth-password-store@fa8b964
Silex/docker.el@ed0cdf0 -> Silex/docker.el@bc2dc09
cjohansson/emacs-ssh-deploy@cc91b56 -> cjohansson/emacs-ssh-deploy@fce4ea3
editorconfig/editorconfig-emacs@9da2dab -> editorconfig/editorconfig-emacs@e10fa22
emacs-lsp/dap-mode@49af1b8 -> emacs-lsp/dap-mode@4347846
emacs-lsp/lsp-ivy@4dcb635 -> emacs-lsp/lsp-ivy@bccd860
emacs-lsp/lsp-mode@3dc87f6 -> emacs-lsp/lsp-mode@aec8968
emacs-lsp/lsp-ui@efae00e -> emacs-lsp/lsp-ui@cb02972
emacsorphanage/quickrun@57db985 -> emacsorphanage/quickrun@35e91f4
jacktasia/dumb-jump@8bc1950 -> jacktasia/dumb-jump@8f70acb
joaotavora/eglot@b06589b -> joaotavora/eglot@a5b7b7d
magit/forge@f4c95dd -> magit/forge@37aa4e4
magit/magit@577f16d -> magit/magit@e378827
millejoh/emacs-ipython-notebook@142ff50 -> millejoh/emacs-ipython-notebook@09af858
purcell/envrc@110a221 -> purcell/envrc@8a9a142
realgud/realgud@34557f8 -> realgud/realgud@7a70b27
spotify/dockerfile-mode@3b13745 -> spotify/dockerfile-mode@ad06a41
tkf/emacs-request@accd430 -> tkf/emacs-request@f3a5b43
tmalsburg/helm-bibtex@ca09076 -> tmalsburg/helm-bibtex@9f6ea92
vedang/pdf-tools@35e12b0 -> vedang/pdf-tools@d262cf9
yoshiki/yaml-mode@fc5e1c5 -> yoshiki/yaml-mode@3a57058
zx2c4/password-store@918992c -> zx2c4/password-store@4e73cdc
2021-05-22 22:43:56 -04:00
Henrik Lissner
6824b9270d tools/magit: larger fringe in magit-mode
Since Doom sets a small fringe by default, magit's fringe indicators are
obscured, so we increase it only while a magit-mode buffer is visible.
2021-05-22 22:31:39 -04:00
Henrik Lissner
195ad0fec6 Fix #5003: rethink +magit/quit
Changes +magit/quit to behave more like canonical
magit-mode-bury-buffer, but after burying/killing the last magit buffer
for the current repo, kill all the other buried ones too.

Also binds Q in magit to kill all magit buffers for the current repo.
2021-05-07 14:17:04 -04:00
Henrik Lissner
9d643b14ed Revise comments 2021-04-29 13:25:48 -04:00
Henrik Lissner
3e425ab2f2 tools/magit: reveal point if in invisible region
When visiting a file from magit.

Fix #4895
2021-04-21 21:45:04 -04:00