Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for remapped and aliased modes #9

Merged
merged 1 commit into from
Mar 7, 2024
Merged

add support for remapped and aliased modes #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 46 additions & 1 deletion bind-map.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,32 @@
:group 'bind-map
:type 'string)

(defcustom bind-map-use-remapped-modes t
"If non-nil, bind-map will be aware of remapped modes. For
example, suppose you used `bind-map' to define a keymap for
`foo-mode', but use `major-mode-remap-alist' to remap `foo-mode'
to `bar-mode'. If `bind-map-use-remapped-modes' is non-nil, then,
when `bar-mode' is activated
(either directly or by activating `foo-mode'), the keymap for
`foo-mode' will be active. If you define separate keymaps for
`foo-mode' and `bar-mode' yet leave this option non-nil, chaos
may ensue."
:group 'bind-map
:type 'boolean)

(defcustom bind-map-use-aliased-modes t
"If non-nil, bind-map will be aware of aliased modes. For example,
suppose you used `bind-map' to define a keymap for `foo-mode',
but `foo-mode' is actually an alias for `bar-mode'. If
`bind-map-use-aliased-modes' is non-nil, then, when `bar-mode' is
activated (either directly or by activating `foo-mode'), the
keymap for `foo-mode' will be active. If you define separate
keymaps for `foo-mode' and `bar-mode' yet leave this option
non-nil, chaos may ensue."
:group 'bind-map
:type 'boolean)


(defvar bind-map-evil-local-bindings '()
"Each element takes the form (OVERRIDE-MODE STATE KEY DEF) and
corresponds to a binding for an evil local state map.
Expand Down Expand Up @@ -173,11 +199,30 @@ when the major mode is an element of the cdr. See
(dolist (entry bind-map-major-modes-alist)
(if (boundp (car entry))
(setf (symbol-value (car entry))
(not (null (member major-mode (cdr entry)))))
(not
(null
(member major-mode
(mapcan
#'bind-map--lookup-major-modes (cdr entry))))))
(message "bind-map: %s is void in change major mode hook" (car entry)))))
(add-hook 'change-major-mode-after-body-hook
'bind-map-change-major-mode-after-body-hook)

(defun bind-map--lookup-major-modes (mode)
"Return a list of implicated modes depending on the values of
`bind-map-use-remapped-modes' and `bind-map-use-aliased-modes'.
If both are nil, just return `mode'. If
`bind-map-use-remapped-modes' is non-nil, also return mode to
which it has been remapped in `major-mode-remap-alist' (if
applicable). If `bind-map-use-aliased-modes' is non-nil, also
return any modes for which `mode' is an alias (if applicable)."
(let ((r-mode
(or (and bind-map-use-remapped-modes
(boundp 'major-mode-remap-alist)
(alist-get mode major-mode-remap-alist))))
(a-modes (and bind-map-use-aliased-modes (function-alias-p mode))))
(delq nil (append (list mode r-mode) a-modes))))

(defun bind-map-add-to-major-mode-list (activate-var major-mode-list)
"Add (ACTIVATE-VAR . MAJOR-MODE-LIST) to
`bind-map-major-modes-alist'. If ACTIVATE-VAR is already a key,
Expand Down