diff --git a/core/core-spacebind.el b/core/core-spacebind.el index 140548f9c..79e7e87cd 100644 --- a/core/core-spacebind.el +++ b/core/core-spacebind.el @@ -30,7 +30,7 @@ Otherwise binding happens at the next event loop.") "Binding stack for `spacemacs/set-leader-keys-for-major-mode'.") (defvar spacebind--bs-set-leader-keys-for-minor-mode '() "Binding stack for `spacemacs/set-leader-keys-for-minor-mode'.") -(defvar spacebind--bs-add-global-replacements '() +(defvar spacebind--bs-global-replacements '() "Binding stack for `which-key-add-key-based-replacements'.") (defvar spacebind--timer [t] @@ -94,7 +94,7 @@ Otherwise binding happens at the next event loop.") (spacemacs/set-leader-keys-for-minor-mode mode keys fn-sym))) ;; `which-key-add-key-based-replacements' - (dolist (args spacebind--bs-add-global-replacements) + (dolist (args spacebind--bs-global-replacements) (let ((keys (string-join (append `(,(spacemacs/leader-key)) (car args)) " ")) @@ -102,7 +102,7 @@ Otherwise binding happens at the next event loop.") (which-key-add-key-based-replacements keys label)))) ;; Reset stacks - (setq spacebind--bs-add-global-replacements nil + (setq spacebind--bs-global-replacements nil spacebind--bs-set-leader-keys-for-minor-mode nil spacebind--bs-set-leader-keys-for-major-mode nil spacebind--bs-set-leader-keys nil @@ -266,7 +266,7 @@ The forms will be concatenated and substituted by `spacebind' macro." form) (lambda (key-seq fn-symbol label) `(progn - (push (list ',key-seq ,label) spacebind--bs-add-global-replacements) + (push (list ',key-seq ,label) spacebind--bs-global-replacements) (push (list ',key-seq ',fn-symbol) spacebind--bs-set-leader-keys))) (lambda (key-prefix label) `(push (list ',key-prefix ,label) spacebind--bs-declare-prefix)))) diff --git a/tests/core/core-spacebind-utest.el b/tests/core/core-spacebind-utest.el index 9398c4d60..4fb485eff 100644 --- a/tests/core/core-spacebind-utest.el +++ b/tests/core/core-spacebind-utest.el @@ -102,7 +102,7 @@ The return value is a plist with the shape: :set-leader-keys :set-leader-keys-for-major-mode :set-leader-keys-for-minor-mode - :add-global-replacements ) + :global-replacements ) is a corresponding binding stack. @@ -126,9 +126,9 @@ NOTE: `spacebind--eager-bind' set to true." spacebind--bs-set-leader-keys-for-major-mode :set-leader-keys-for-minor-mode spacebind--bs-set-leader-keys-for-minor-mode - :add-global-replacements - spacebind--bs-add-global-replacements) - spacebind--bs-add-global-replacements nil + :global-replacements + spacebind--bs-global-replacements) + spacebind--bs-global-replacements nil spacebind--bs-set-leader-keys-for-minor-mode nil spacebind--bs-set-leader-keys-for-major-mode nil spacebind--bs-set-leader-keys nil @@ -165,7 +165,7 @@ NOTE: `spacebind--eager-bind' set to true. " (spacebind--bs-set-leader-keys '()) (spacebind--bs-set-leader-keys-for-major-mode '()) (spacebind--bs-set-leader-keys-for-minor-mode '()) - (spacebind--bs-add-global-replacements '()) + (spacebind--bs-global-replacements '()) (spacebind--timer [t]) (called nil) ((symbol-function 'spacebind//process-bind-stack) @@ -179,7 +179,7 @@ NOTE: `spacebind--eager-bind' set to true. " spacebind--bs-set-leader-keys spacebind--bs-set-leader-keys-for-major-mode spacebind--bs-set-leader-keys-for-minor-mode - spacebind--bs-add-global-replacements))) + spacebind--bs-global-replacements))) (when (listp el) ;; all list arguments are key sequences. (condition-case err (kbd (string-join el " ")) ((error nil) (push err invalid-key-seqs))))) @@ -205,7 +205,7 @@ NOTE: `spacebind--eager-bind' set to true. " :declare-prefix nil :set-leader-keys nil :set-leader-keys-for-minor-mode nil - :add-global-replacements nil)) + :global-replacements nil)) (eq nil) (should))) @@ -228,7 +228,7 @@ NOTE: `spacebind--eager-bind' set to true. " :declare-prefix nil :set-leader-keys nil :set-leader-keys-for-major-mode nil - :add-global-replacements nil)) + :global-replacements nil)) (eq nil) (should))) @@ -244,7 +244,7 @@ NOTE: `spacebind--eager-bind' set to true. " ((("a") "section under a key")) :set-leader-keys ((("a" "b") bar-fn)) - :add-global-replacements + :global-replacements ((("a" "b") "call bar-fn")) :minor-mode-replacements nil :major-mode-replacements nil @@ -306,7 +306,7 @@ NOTE: `spacebind--eager-bind' set to true. " (("a" foo-fn "This is a multi line string"))) (test-spacebind|log-stack-eval) - (plist-get :add-global-replacements) + (plist-get :global-replacements) (car) (equal '(("a") "This is a multi line string")) (should)) @@ -336,7 +336,7 @@ NOTE: `spacebind--eager-bind' set to true. " :global (("a" foo-fn "this part goes into label | that part omitted"))) (test-spacebind|log-stack-eval) - (plist-get :add-global-replacements) + (plist-get :global-replacements) (car) (equal '(("a") "this part goes into label")) (should)) @@ -446,7 +446,7 @@ NOTE: `spacebind--eager-bind' set to true. " ((some-another-minor-mode ("a" "b" "c" "b") baz-fn) (some-minor-mode ("a" "c" "d" "e") baz-fn) (some-minor-mode ("a" "b") foo-fn)) - :add-global-replacements + :global-replacements ((("C-v" "b") "call bar-fn")))) (eq nil) (should))) diff --git a/tests/layers/+distribution/spacemacs-base/spacebind-utest.el b/tests/layers/+distribution/spacemacs-base/spacebind-utest.el index 0d4965649..822c4c487 100644 --- a/tests/layers/+distribution/spacemacs-base/spacebind-utest.el +++ b/tests/layers/+distribution/spacemacs-base/spacebind-utest.el @@ -23,7 +23,7 @@ NOTE: `spacebind--eager-bind' set to true. " (spacebind--bs-set-leader-keys '()) (spacebind--bs-set-leader-keys-for-major-mode '()) (spacebind--bs-set-leader-keys-for-minor-mode '()) - (spacebind--bs-add-global-replacements '()) + (spacebind--bs-global-replacements '()) (spacebind--timer [t]) (called nil) ((symbol-function 'spacebind//process-bind-stack)