From 46bcd7e922f5370043252f23cd150d2a3fa33012 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 18 Apr 2024 13:38:03 -0400 Subject: [PATCH 1/4] bump: :lang go dominikh/go-mode.el@8dce1e3ba1cd -> dominikh/go-mode.el@6f4ff9ef874d weijiangan/flycheck-golangci-lint@9def093e416e -> weijiangan/flycheck-golangci-lint@91c59b128aa6 - Fixes weijiangan/flycheck-golangci-lint#15: golangci-lint's renamed the --deadline option to --timeout. (#7833, #7834) Close: #7833 Close: #7834 Ref: weijiangan/flycheck-golangci-lint#15 Co-authored-by: blez Co-authored-by: samcrang --- modules/lang/go/packages.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/lang/go/packages.el b/modules/lang/go/packages.el index fc019527b..b7dc06af1 100644 --- a/modules/lang/go/packages.el +++ b/modules/lang/go/packages.el @@ -2,8 +2,8 @@ ;;; lang/go/packages.el (package! go-eldoc :pin "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd") -(package! go-guru :pin "8dce1e3ba1cdc34a856ad53c8421413cfe33660e") -(package! go-mode :pin "8dce1e3ba1cdc34a856ad53c8421413cfe33660e") +(package! go-guru :pin "6f4ff9ef874d151ed8d297a80f1bf27db5d9dbf0") +(package! go-mode :pin "6f4ff9ef874d151ed8d297a80f1bf27db5d9dbf0") (package! gorepl-mode :pin "6a73bf352e8d893f89cad36c958c4db2b5e35e07") (package! go-tag :pin "33f2059551d5298ca228d90f525b99d1a8d70364") (package! go-gen-test :pin "af00a9abbaba2068502327ecdef574fd894a884b") @@ -13,4 +13,4 @@ (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) - (package! flycheck-golangci-lint :pin "9def093e416e9a6ddd3cae8590dbb7ff6314925a")) + (package! flycheck-golangci-lint :pin "91c59b128aa6f719069cfb3e5df77588691a3e14")) From 2f7b30925238d02d43a59b23c7fc06224d0fe935 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 18 Apr 2024 13:46:21 -0400 Subject: [PATCH 2/4] tweak(default): remove +vc/gutter-hydra keybind Not only is this keybind always overshadowed by the magit-file-dispatch keybind on the same key, the hydra module is deprecated, so I will simply remove it. Fix: #5388 --- modules/config/default/+evil-bindings.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index bdd55d7bd..80829a762 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -476,8 +476,6 @@ (:when (modulep! :ui hydra) :desc "SMerge" "m" #'+vc/smerge-hydra/body) (:when (modulep! :ui vc-gutter) - (:when (modulep! :ui hydra) - :desc "VCGutter" "." #'+vc/gutter-hydra/body) :desc "Revert hunk at point" "r" #'+vc-gutter/revert-hunk :desc "stage hunk at point" "s" #'+vc-gutter/stage-hunk :desc "Git time machine" "t" #'git-timemachine-toggle From 0349dab09abf6fe918a2fb59a6723d3573d8b4b3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 18 Apr 2024 13:48:36 -0400 Subject: [PATCH 3/4] tweak(default): ensure ' g S' is silent magit-stage-file prompts the user to select a file to stage, but the intention for these two keys has always been to (un)stage the current file (and without prompting). This ensures that is the case. I've also tweaked their description to make that intention clearer. --- modules/config/default/+evil-bindings.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 80829a762..5cf674b1e 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -493,8 +493,8 @@ :desc "Magit clone" "C" #'magit-clone :desc "Magit fetch" "F" #'magit-fetch :desc "Magit buffer log" "L" #'magit-log-buffer-file - :desc "Git stage file" "S" #'magit-stage-file - :desc "Git unstage file" "U" #'magit-unstage-file + :desc "Git stage this file" "S" #'magit-stage-buffer-file + :desc "Git unstage this file" "U" #'magit-unstage-file (:prefix ("f" . "find") :desc "Find file" "f" #'magit-find-file :desc "Find gitconfig file" "g" #'magit-find-git-config-file From 9620bb45ac4cd7b0274c497b2d9d93c4ad9364ee Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 18 Apr 2024 13:50:28 -0400 Subject: [PATCH 4/4] fix(evil): ]f/[f opening broken symlinks --- modules/editor/evil/autoload/unimpaired.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/evil/autoload/unimpaired.el b/modules/editor/evil/autoload/unimpaired.el index 0e64d427b..b698b56ea 100644 --- a/modules/editor/evil/autoload/unimpaired.el +++ b/modules/editor/evil/autoload/unimpaired.el @@ -113,7 +113,7 @@ See `+evil/next-preproc-directive' for details." (user-error "Must be called from a file-visiting buffer")) (let* ((directory (file-name-directory buffer-file-name)) (filename (file-name-nondirectory buffer-file-name)) - (files (cl-remove-if #'file-directory-p (doom-glob (file-name-directory buffer-file-name) "[!.]*"))) + (files (cl-remove-if-not #'file-regular-p (doom-glob (file-name-directory buffer-file-name) "[!.]*"))) (index (cl-position filename files :test #'file-equal-p))) (when (null index) (user-error "Couldn't find this file in current directory"))