mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-23 07:19:15 +00:00
8903106bb7
* lisp/subr.el (if-let*, when-let*, if-let, when-let): Mark if-let and when-let obsolete (bug#73853 and elsewhere). Move docstring text around so that if-let* and when-let* descriptions no longer refer to if-let and when-let. * etc/NEWS: Announce the change. * admin/admin.el (reminder-for-release-blocking-bugs): * doc/misc/erc.texi (display-buffer): * lisp/ansi-color.el (ansi-color-apply) (ansi-color--face-vec-face): * lisp/ansi-osc.el (ansi-osc-apply-on-region) (ansi-osc-hyperlink): * lisp/arc-mode.el (archive-goto-file) (archive-next-file-displayer): * lisp/auth-source-pass.el (auth-source-pass-search) (auth-source-pass--parse-data) (auth-source-pass--find-match-many): * lisp/autorevert.el (auto-revert-notify-rm-watch): * lisp/buff-menu.el (Buffer-menu-unmark-all-buffers) (Buffer-menu-group-by-root): * lisp/calendar/parse-time.el (parse-iso8601-time-string): * lisp/cedet/pulse.el (pulse-tick): * lisp/comint.el (comint--fontify-input-ppss-flush-indirect) (comint--intersect-regions): * lisp/completion-preview.el (completion-preview--try-table) (completion-preview--capf-wrapper, completion-preview--update): * lisp/cus-edit.el (setopt--set) (custom-dirlocals-maybe-update-cons, custom-dirlocals-validate): * lisp/custom.el (load-theme): * lisp/descr-text.el (describe-char): * lisp/desktop.el (desktop--emacs-pid-running-p): * lisp/dired-x.el (menu): * lisp/dired.el (dired-font-lock-keywords) (dired-insert-directory, dired--insert-disk-space, dired-mode): * lisp/dnd.el (dnd-handle-multiple-urls): * lisp/dom.el (dom-remove-attribute): * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): * lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare): * lisp/emacs-lisp/comp-common.el (comp-function-type-spec): * lisp/emacs-lisp/comp-cstr.el (comp--all-classes) (comp-cstr-set-range-for-arithm, comp--cstr-union-1-no-mem) (comp-cstr-intersection-no-mem, comp-cstr-fixnum-p) (comp-cstr-type-p): * lisp/emacs-lisp/comp-run.el (comp-subr-trampoline-install) (native--compile-async): * lisp/emacs-lisp/comp.el (comp--get-function-cstr) (comp--function-pure-p, comp--intern-func-in-ctxt) (comp--addr-to-bb-name, comp--emit-assume, comp--maybe-add-vmvar) (comp--add-call-cstr, comp--compute-dominator-tree) (comp--dom-tree-walker, comp--ssa-rename) (comp--function-call-maybe-fold, comp--fwprop-call) (comp--call-optim-func): * lisp/emacs-lisp/edebug.el (edebug-global-prefix) (edebug-remove-instrumentation): * lisp/emacs-lisp/eieio.el (initialize-instance): * lisp/emacs-lisp/ert-x.el (ert-resource-directory): * lisp/emacs-lisp/ert.el (ert--expand-should-1) (ert-test-location, ert-write-junit-test-report) (ert-test--erts-test): * lisp/emacs-lisp/icons.el (icon-complete-spec, icon-string) (icons--create): * lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p): * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload) (loaddefs-generate--parse-file): * lisp/emacs-lisp/multisession.el (multisession-edit-mode--revert, multisession-edit-value): * lisp/emacs-lisp/package-vc.el (package-vc--read-archive-data) (package-vc--version, package-vc--clone): * lisp/emacs-lisp/package.el (package--reload-previously-loaded): * lisp/emacs-lisp/pp.el (pp--insert-lisp): * lisp/emacs-lisp/subr-x.el (add-display-text-property): * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): * lisp/emacs-lisp/timer.el (run-at-time): * lisp/emacs-lisp/vtable.el (vtable-goto-table) (vtable-goto-column, vtable-update-object, vtable--insert-line) (vtable--compute-widths, vtable--make-keymap): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/epa.el (epa-show-key): * lisp/erc/erc-backend.el (erc--split-line, erc--conceal-prompt) (PRIVMSG, erc--get-isupport-entry): * lisp/erc/erc-button.el (erc-button-add-nickname-buttons) (erc--button-next): * lisp/erc/erc-common.el (erc--find-group): * lisp/erc/erc-fill.el (erc-fill, erc-fill-static) (erc-fill--wrap-escape-hidden-speaker) (erc-fill--wrap-unmerge-on-date-stamp) (erc-fill--wrap-massage-initial-message-post-clear) (erc-fill-wrap, erc-fill--wrap-rejigger-region): * lisp/erc/erc-goodies.el (erc--scrolltobottom-all) (erc--keep-place-indicator-on-window-buffer-change) (keep-place-indicator, erc--keep-place-indicator-adjust-on-clear) (erc-keep-place-move, erc--command-indicator-display): * lisp/erc/erc-ibuffer.el (erc-members): * lisp/erc/erc-join.el (erc-join--remove-requested-channel) (erc-autojoin--join): * lisp/erc/erc-networks.el (erc-networks--id-qualifying-init-parts, erc-networks--id-reload) (erc-networks--id-ensure-comparable) (erc-networks--reclaim-orphaned-target-buffers) (erc-networks--server-select): * lisp/erc/erc-nicks.el (erc-nicks-invert) (erc-nicks--redirect-face-widget-link, erc-nicks--highlight) (erc-nicks--highlight-button) (erc-nicks--list-faces-help-button-action, erc-nicks-list-faces) (erc-nicks-refresh, erc-nicks--colors-from-faces) (erc-nicks--track-prioritize) (erc-nicks--remember-face-for-track): * lisp/erc/erc-notify.el (querypoll, erc--querypoll-get-next) (erc--querypoll-on-352, erc--querypoll-send): * lisp/erc/erc-sasl.el (erc-sasl--read-password): * lisp/erc/erc-services.el (erc-services-issue-ghost-and-retry-nick): * lisp/erc/erc-speedbar.el (erc-speedbar--ensure, nickbar) (erc-speedbar-toggle-nicknames-window-lock) (erc-speedbar--compose-nicks-face): * lisp/erc/erc-stamp.el (erc-stamp--recover-on-reconnect) (erc-stamp-prefix-log-filter, erc--conceal-prompt) (erc--insert-timestamp-left, erc-insert-timestamp-right) (erc-stamp--defer-date-insertion-on-post-modify) (erc-insert-timestamp-left-and-right) (erc-stamp--redo-right-stamp-post-clear) (erc-stamp--reset-on-clear, erc-stamp--dedupe-date-stamps): * lisp/erc/erc-status-sidebar.el (bufbar) (erc-status-sidebar-prefer-target-as-name) (erc-status-sidebar-default-allsort, erc-status-sidebar-click): * lisp/erc/erc-track.el (erc-track--shortened-names-get) (erc-track--setup, erc-track--select-mode-line-face) (erc-track-modified-channels, erc-track--collect-faces-in) (erc-track--switch-buffer, erc-track--replace-killed-buffer): * lisp/erc/erc-truncate.el (erc-truncate--setup) (erc-truncate-buffer): * lisp/erc/erc.el (erc--ensure-query-member) (erc--ensure-query-members, erc--remove-channel-users-but) (erc--cusr-change-status, erc--find-mode, erc--update-modules) (erc-log-irc-protocol, erc--refresh-prompt) (erc--restore-important-text-props) (erc--order-text-properties-from-hash, erc-send-input-line) (erc-cmd-IGNORE, erc--unignore-user, erc-cmd-QUERY) (erc-cmd-BANLIST, erc--speakerize-nick) (erc--format-speaker-input-message, erc-channel-receive-names) (erc-send-current-line, erc-format-target-and/or-network) (erc-kill-buffer-function, erc-restore-text-properties) (erc--get-eq-comparable-cmd): * lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias--which) (eshell-maybe-replace-by-alias): * lisp/eshell/em-glob.el (eshell-glob-convert): * lisp/eshell/em-pred.el (eshell-pred-user-or-group) (eshell-pred-file-time, eshell-pred-file-type) (eshell-pred-file-mode, eshell-pred-file-links) (eshell-pred-file-size): * lisp/eshell/em-prompt.el (eshell-forward-paragraph) (eshell-next-prompt): * lisp/eshell/esh-arg.el (eshell-resolve-current-argument): * lisp/eshell/esh-cmd.el (eshell-do-eval, eshell/which) (eshell-plain-command--which, eshell-plain-command): * lisp/eshell/esh-io.el (eshell-duplicate-handles) (eshell-protect-handles, eshell-get-target, eshell-close-target): * lisp/eshell/esh-proc.el (eshell-sentinel): * lisp/eshell/esh-var.el (eshell-parse-variable-ref) (eshell-get-variable, eshell-set-variable): * lisp/faces.el (face-at-point): * lisp/ffap.el (ffap-in-project): * lisp/filenotify.el (file-notify--rm-descriptor): * lisp/files-x.el (read-dir-locals-file) (connection-local-update-profile-variables) (connection-local-value): * lisp/files.el (file-remote-p, abbreviate-file-name) (set-auto-mode, hack-local-variables) (revert-buffer-restore-read-only): * lisp/find-dired.el (find-dired-sort-by-filename): * lisp/font-lock.el (font-lock--filter-keywords): * lisp/gnus/gnus-art.el (article-emojize-symbols): * lisp/gnus/gnus-int.el (gnus-close-server): * lisp/gnus/gnus-search.el (gnus-search-transform) (gnus-search-indexed-parse-output, gnus-search-server-to-engine): * lisp/gnus/gnus-sum.el (gnus-collect-urls, gnus-shorten-url): * lisp/gnus/gnus.el (gnus-check-backend-function): * lisp/gnus/message.el (message-send-mail): * lisp/gnus/mml.el (mml-generate-mime, mml-insert-mime-headers): * lisp/gnus/nnatom.el (nnatom--read-feed, nnatom--read-article) (nnatom--read-article-or-group-authors, nnatom--read-publish) (nnatom--read-update, nnatom--read-links): * lisp/gnus/nnfeed.el (nnfeed--read-server, nnfeed--write-server) (nnfeed--parse-feed, nnfeed--group-data, nnfeed-retrieve-article) (nnfeed-retrieve-headers, nnfeed--print-part) (nnfeed-request-article, nnfeed-request-group) (nnfeed-request-list, nnfeed--group-description) (nnfeed-request-group-description) (nnfeed-request-list-newsgroups, nnfeed-request-rename-group): * lisp/gnus/nnmh.el (nnmh-update-gnus-unreads): * lisp/help-fns.el (help-find-source) (help-fns--insert-menu-bindings, help-fns--mention-first-release) (help-fns--mention-shortdoc-groups) (help-fns--customize-variable-version) (help-fns--face-custom-version-info, describe-mode): * lisp/help-mode.el (help-make-xrefs): * lisp/help.el (help-key-description, help--describe-command): * lisp/hfy-cmap.el (htmlfontify-load-rgb-file): * lisp/ibuf-ext.el (ibuffer-jump-to-filter-group) (ibuffer-kill-filter-group, ibuffer-kill-line) (ibuffer-save-filter-groups, ibuffer-save-filters, filename) (basename, file-extension, ibuffer-diff-buffer-with-file-1) (ibuffer-mark-by-file-name-regexp) (ibuffer-mark-by-content-regexp): * lisp/ibuf-macs.el (ibuffer-aif, ibuffer-awhen): * lisp/ibuffer.el (ibuffer-mouse-toggle-mark) (ibuffer-toggle-marks, ibuffer-mark-interactive) (ibuffer-compile-format, process, ibuffer-map-lines): * lisp/image.el (image--compute-map) (image--compute-original-map): * lisp/image/exif.el (exif-parse-buffer): * lisp/image/image-converter.el (image-convert-p, image-convert) (image-converter--find-converter): * lisp/image/image-dired-util.el (image-dired-file-name-at-point): * lisp/image/image-dired.el (image-dired-track-original-file) (image-dired--on-file-in-dired-buffer) (image-dired--with-thumbnail-buffer) (image-dired-jump-original-dired-buffer) (image-dired--slideshow-step, image-dired-display-image): * lisp/image/wallpaper.el (wallpaper--init-action-kill) (wallpaper--find-setter, wallpaper--find-command) (wallpaper--find-command-args, wallpaper--x-monitor-name): * lisp/info-look.el (info-lookup-interactive-arguments) (info-complete)::(:mode): * lisp/info.el (info-pop-to-buffer, Info-read-node-name-1): * lisp/international/emoji.el (emoji--adjust-displayable-1) (emoji--add-recent): * lisp/jsonrpc.el (jsonrpc--call-deferred) (jsonrpc--process-sentinel, jsonrpc--remove): * lisp/keymap.el (keymap-local-lookup): * lisp/mail/emacsbug.el (report-emacs-bug-hook) (submit-emacs-patch): * lisp/mail/ietf-drums.el (ietf-drums-parse-addresses): * lisp/mail/mailclient.el (mailclient-send-it): * lisp/mail/rfc6068.el (rfc6068-parse-mailto-url): * lisp/mail/undigest.el (rmail-digest-parse-mixed-mime): * lisp/minibuffer.el (completion-metadata-get) (completions--after-change) (minibuffer-visible-completions--filter): * lisp/net/browse-url.el (browse-url-url-at-point) (browse-url-file-url, browse-url-emacs): * lisp/net/dbus.el (dbus-byte-array-to-string) (dbus-monitor-goto-serial): * lisp/net/dictionary.el (dictionary-search): * lisp/net/eww.el (eww--download-directory) (eww-auto-rename-buffer, eww-open-in-new-buffer, eww-submit) (eww-follow-link, eww-read-alternate-url) (eww-copy-alternate-url): * lisp/net/goto-addr.el (goto-address-at-point): * lisp/net/mailcap.el (mailcap-mime-info): * lisp/net/rcirc.el (rcirc, rcirc-connect, rcirc-send-string) (rcirc-kill-buffer-hook, rcirc-print, rcirc-when) (rcirc-color-attributes, rcirc-handler-NICK) (rcirc-handler-TAGMSG, rcirc-handler-BATCH): * lisp/net/shr.el (shr-descend, shr-adaptive-fill-function) (shr-correct-dom-case, shr-tag-a): * lisp/net/sieve.el (sieve-manage-quit): * lisp/outline.el (outline-cycle-buffer): * lisp/pcmpl-git.el (pcmpl-git--tracked-file-predicate): * lisp/proced.el (proced-auto-update-timer): * lisp/progmodes/bug-reference.el (bug-reference-try-setup-from-vc): * lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph): * lisp/progmodes/c-ts-mode.el (c-ts-mode--preproc-offset) (c-ts-mode--anchor-prev-sibling, c-ts-mode-indent-defun): * lisp/progmodes/compile.el (compilation-error-properties) (compilation-find-file-1): * lisp/progmodes/eglot.el (eglot--check-object) (eglot--read-server, eglot-upgrade-eglot) (eglot-handle-notification, eglot--CompletionParams) (eglot-completion-at-point, eglot--sig-info) (eglot-register-capability): * lisp/progmodes/elisp-mode.el (emacs-lisp-native-compile-and-load) (elisp-eldoc-var-docstring-with-value): * lisp/progmodes/erts-mode.el (erts-mode--goto-start-of-test): * lisp/progmodes/flymake.el (flymake--update-eol-overlays) (flymake-eldoc-function): * lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom) (gdb-frame-handler): * lisp/progmodes/go-ts-mode.el (go-ts-mode-docstring) (go-ts-mode--comment-on-previous-line-p) (go-ts-mode--get-test-regexp-at-point) (go-ts-mode-test-this-file): * lisp/progmodes/grep.el (lgrep, rgrep-default-command) (grep-file-at-point): * lisp/progmodes/perl-mode.el (perl--end-of-format-p): * lisp/progmodes/php-ts-mode.el (php-ts-mode--anchor-prev-sibling, php-ts-mode--indent-defun): * lisp/progmodes/project.el (project--other-place-command) (project--find-default-from, project--transplant-file-name) (project-prefixed-buffer-name, project--remove-from-project-list) (project-prompt-project-name, project-remember-projects-under) (project--switch-project-command) (project-uniquify-dirname-transform, project-mode-line-format): * lisp/progmodes/python.el (python-font-lock-keywords-maximum-decoration) (python--treesit-fontify-union-types) (python-shell-get-process-name, python-shell-restart) (python-shell-completion-at-point, python-ffap-module-path) (python-util-comint-end-of-output-p, python--import-sources) (python-add-import, python-remove-import, python-fix-imports): * lisp/progmodes/xref.el (xref--add-log-current-defun): * lisp/repeat.el (repeat-echo-message-string): * lisp/saveplace.el (save-place-dired-hook): * lisp/server.el (server-save-buffers-kill-terminal): * lisp/shadowfile.el (shadow-make-fullname) (shadow-contract-file-name, shadow-define-literal-group): * lisp/shell.el (shell-highlight-undef-mode): * lisp/simple.el (command-completion-using-modes-p) (command-execute, file-user-uid, file-group-gid) (first-completion, last-completion, switch-to-completions): * lisp/startup.el (startup--load-user-init-file): * lisp/tab-line.el (tab-line-tabs-buffer-group-by-project): * lisp/tar-mode.el (tar-goto-file, tar-next-file-displayer): * lisp/term/android-win.el (android-encode-select-string) (gui-backend-set-selection): * lisp/term/haiku-win.el (haiku-dnd-convert-string) (haiku-select-encode-xstring, haiku-select-encode-utf-8-string): * lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize): * lisp/textmodes/ispell.el (ispell-completion-at-point): * lisp/textmodes/sgml-mode.el (sgml-validate) (html-mode--complete-at-point): * lisp/textmodes/tex-mode.el (tex-recenter-output-buffer) (xref-backend-references): * lisp/thingatpt.el (thing-at-point-file-at-point) (thing-at-point-face-at-point): * lisp/thread.el (thread-list--get-status): * lisp/time.el (world-clock-copy-time-as-kill, world-clock): * lisp/touch-screen.el (touch-screen-handle-touch): * lisp/treesit.el (treesit-language-at, treesit-node-at) (treesit-node-on, treesit-buffer-root-node) (treesit-node-field-name, treesit-local-parsers-at) (treesit-local-parsers-on, treesit--cleanup-local-range-overlays) (treesit-font-lock-recompute-features) (treesit-font-lock-fontify-region, treesit-transpose-sexps) (treesit-add-log-current-defun, treesit-major-mode-setup) (treesit--explorer-refresh, treesit-install-language-grammar): * lisp/url/url.el (url-retrieve-synchronously): * lisp/vc/smerge-mode.el (smerge-diff): * lisp/vc/vc-dir.el (vc-dir): * lisp/vc/vc-dispatcher.el (vc-do-async-command): * lisp/vc/vc-git.el (vc-git-dir--branch-headers) (vc-git-dir--stash-headers, vc-git--log-edit-summary-check) (vc-git-stash-list): * lisp/vc/vc.el (vc-responsible-backend, vc-buffer-sync-fileset) (vc-clone): * lisp/visual-wrap.el (visual-wrap--apply-to-line): * lisp/wid-edit.el (widget-text) (widget-editable-list-insert-before): * lisp/window-tool-bar.el (window-tool-bar--keymap-entry-to-string): * lisp/window.el (display-buffer, display-buffer-full-frame) (window-point-context-set, window-point-context-use) (window-point-context-use-default-function): * lisp/xdg.el (xdg-current-desktop): * lisp/xwidget.el (xwidget-webkit-callback): * lisp/yank-media.el (yank-media--get-selection) (yank-media-types): * test/lisp/comint-tests.el (comint-tests/test-password-function): * test/lisp/completion-preview-tests.el (completion-preview-tests--capf): * test/lisp/cus-edit-tests.el (with-cus-edit-test): * test/lisp/erc/erc-scenarios-base-local-modules.el (-phony-sblm-): * test/lisp/erc/erc-scenarios-stamp.el (erc-scenarios-stamp--on-post-modify): * test/lisp/erc/erc-services-tests.el (erc-services-tests--asp-parse-entry): * test/lisp/erc/erc-tests.el (erc-modules--internal-property) (erc--find-mode, erc-tests--update-modules): * test/lisp/erc/resources/erc-d/erc-d-i.el (erc-d-i--parse-message): * test/lisp/erc/resources/erc-d/erc-d-t.el (erc-d-t-kill-related-buffers, erc-d-t-with-cleanup): * test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d-i--parse-message--irc-parser-tests): * test/lisp/erc/resources/erc-d/erc-d-u.el (erc-d-u--read-exchange-slowly): * test/lisp/erc/resources/erc-d/erc-d.el (erc-d--expire) (erc-d--finalize-done, erc-d--command-handle-all): * test/lisp/erc/resources/erc-scenarios-common.el (erc-scenarios-common-with-cleanup): * test/lisp/erc/resources/erc-tests-common.el (erc-tests--common-display-message) (erc-tests-common-create-subprocess): * test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058): * test/lisp/international/mule-tests.el (mule-cmds-tests--ucs-names-missing-names): * test/lisp/progmodes/python-tests.el (python-tests-get-shell-interpreter) (python-tests--get-interpreter-info): * test/lisp/progmodes/ruby-ts-mode-tests.el (ruby-ts-resource-file): * test/lisp/replace-tests.el (replace-tests-with-undo): * test/src/emacs-tests.el (emacs-tests--seccomp-debug): * test/src/process-tests.el (process-tests--emacs-command) (process-tests--emacs-binary, process-tests--dump-file): * test/src/treesit-tests.el (treesit--ert-test-defun-navigation): Replace use of the now-obsolete if-let and when-let.
770 lines
32 KiB
EmacsLisp
770 lines
32 KiB
EmacsLisp
;;; keymap.el --- Keymap functions -*- lexical-binding: t; -*-
|
||
|
||
;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
|
||
|
||
;; Maintainer: emacs-devel@gnu.org
|
||
;; Keywords: internal
|
||
;; Package: emacs
|
||
|
||
;; This file is part of GNU Emacs.
|
||
|
||
;; GNU Emacs is free software: you can redistribute it and/or modify
|
||
;; it under the terms of the GNU General Public License as published by
|
||
;; the Free Software Foundation, either version 3 of the License, or
|
||
;; (at your option) any later version.
|
||
|
||
;; GNU Emacs is distributed in the hope that it will be useful,
|
||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
;; GNU General Public License for more details.
|
||
|
||
;; You should have received a copy of the GNU General Public License
|
||
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
||
|
||
;;; Commentary:
|
||
|
||
;; This library deals with the "new" keymap binding interface: The
|
||
;; only key syntax allowed by these functions is the `kbd' one.
|
||
|
||
;;; Code:
|
||
|
||
|
||
|
||
(defun keymap--check (key)
|
||
"Signal an error if KEY doesn't have a valid syntax."
|
||
(unless (key-valid-p key)
|
||
(error "%S is not a valid key definition; see `key-valid-p'" key)))
|
||
|
||
(defun keymap--compile-check (&rest keys)
|
||
(dolist (key keys)
|
||
(when (or (vectorp key)
|
||
(and (stringp key) (not (key-valid-p key))))
|
||
(byte-compile-warn "Invalid `kbd' syntax: %S" key))))
|
||
|
||
(defun keymap-set (keymap key definition)
|
||
"Set KEY to DEFINITION in KEYMAP.
|
||
KEY is a string that satisfies `key-valid-p'.
|
||
If DEFINITION is a string, it must also satisfy `key-valid-p'.
|
||
|
||
DEFINITION is anything that can be a key's definition:
|
||
nil (means key is undefined in this keymap),
|
||
a command (a Lisp function suitable for interactive calling),
|
||
a string (treated as a keyboard macro or a sequence of input events),
|
||
a keymap (to define a prefix key),
|
||
a symbol (when the key is looked up, the symbol will stand for its
|
||
function definition, which should at that time be one of the above,
|
||
or another symbol whose function definition is used, etc.),
|
||
a cons (STRING . DEFN), meaning that DEFN is the definition
|
||
(DEFN should be a valid definition in its own right) and
|
||
STRING is the menu item name (which is used only if the containing
|
||
keymap has been created with a menu name, see `make-keymap'),
|
||
or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP,
|
||
or an extended menu item definition.
|
||
(See info node `(elisp)Extended Menu Items'.)"
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form)))
|
||
(keymap--check key)
|
||
;; If we're binding this key to another key, then parse that other
|
||
;; key, too.
|
||
(when (stringp definition)
|
||
(keymap--check definition)
|
||
(setq definition (key-parse definition)))
|
||
(define-key keymap (key-parse key) definition))
|
||
|
||
(defun keymap-global-set (key command &optional interactive)
|
||
"Give KEY a global binding as COMMAND.
|
||
When called interactively, KEY is a key sequence. When called from
|
||
Lisp, KEY is a string that must satisfy `key-valid-p'.
|
||
|
||
COMMAND is the command definition to use. When called interactively,
|
||
this function prompts for COMMAND and accepts only names of known
|
||
commands, i.e., symbols that satisfy the `commandp' predicate. When
|
||
called from Lisp, COMMAND can be anything that `keymap-set' accepts
|
||
as its DEFINITION argument.
|
||
|
||
If COMMAND is a string (which can only happen when this function is
|
||
called from Lisp), it must satisfy `key-valid-p'.
|
||
|
||
The `key-description' convenience function converts a simple
|
||
string of characters to an equivalent form that is acceptable for
|
||
COMMAND.
|
||
|
||
Note that if KEY has a local binding in the current buffer,
|
||
that local binding will continue to shadow any global binding
|
||
that you make with this function."
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form))
|
||
(advertised-calling-convention (key command) "29.1"))
|
||
(interactive "KSet key globally: \nCSet key %s globally to command: \np")
|
||
(when interactive
|
||
(setq key (key-description key)))
|
||
(keymap-set (current-global-map) key command))
|
||
|
||
(defun keymap-local-set (key command &optional interactive)
|
||
"Give KEY a local binding as COMMAND.
|
||
When called interactively, KEY is a key sequence. When called from
|
||
Lisp, KEY is a string that must satisfy `key-valid-p'.
|
||
|
||
COMMAND is the command definition to use. When called interactively,
|
||
this function prompts for COMMAND and accepts only names of known
|
||
commands, i.e., symbols that satisfy the `commandp' predicate. When
|
||
called from Lisp, COMMAND can be anything that `keymap-set' accepts
|
||
as its DEFINITION argument.
|
||
|
||
If COMMAND is a string (which can only happen when this function is
|
||
called from Lisp), it must satisfy `key-valid-p'.
|
||
|
||
The `key-description' convenience function converts a simple
|
||
string of characters to an equivalent form that is acceptable for
|
||
COMMAND.
|
||
|
||
The binding goes in the current buffer's local keymap, which in most
|
||
cases is shared with all other buffers in the same major mode."
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form))
|
||
(advertised-calling-convention (key command) "29.1"))
|
||
(interactive "KSet key locally: \nCSet key %s locally to command: \np")
|
||
(let ((map (current-local-map)))
|
||
(unless map
|
||
(use-local-map (setq map (make-sparse-keymap))))
|
||
(when interactive
|
||
(setq key (key-description key)))
|
||
(keymap-set map key command)))
|
||
|
||
(defun keymap-global-unset (key &optional remove)
|
||
"Remove global binding of KEY (if any).
|
||
When called interactively, KEY is a key sequence. When called from
|
||
Lisp, KEY is a string that satisfies `key-valid-p'.
|
||
|
||
If REMOVE is non-nil (interactively, the prefix arg), remove the
|
||
binding instead of unsetting it. See `keymap-unset' for details."
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form)))
|
||
(interactive
|
||
(list (key-description (read-key-sequence "Unset key globally: "))
|
||
current-prefix-arg))
|
||
(keymap-unset (current-global-map) key remove))
|
||
|
||
(defun keymap-local-unset (key &optional remove)
|
||
"Remove local binding of KEY (if any).
|
||
When called interactively, KEY is a key sequence. When called from
|
||
Lisp, KEY is a string that satisfies `key-valid-p'.
|
||
|
||
If REMOVE is non-nil (interactively, the prefix arg), remove the
|
||
binding instead of unsetting it. See `keymap-unset' for details."
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form)))
|
||
(interactive
|
||
(list (key-description (read-key-sequence "Unset key locally: "))
|
||
current-prefix-arg))
|
||
(when (current-local-map)
|
||
(keymap-unset (current-local-map) key remove)))
|
||
|
||
(defun keymap-unset (keymap key &optional remove)
|
||
"Remove key sequence KEY from KEYMAP.
|
||
KEY is a string that satisfies `key-valid-p'.
|
||
|
||
If REMOVE is non-nil, remove the binding instead of unsetting it.
|
||
This only makes a difference when there's a parent keymap. When
|
||
unsetting a key in a child map, it will still shadow the same key
|
||
in the parent keymap. Removing the binding will allow the key in
|
||
the parent keymap to be used."
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form)))
|
||
(keymap--check key)
|
||
(define-key keymap (key-parse key) nil remove))
|
||
|
||
(defun keymap-substitute (keymap olddef newdef &optional oldmap prefix)
|
||
"Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
|
||
In other words, OLDDEF is replaced with NEWDEF wherever it appears.
|
||
Alternatively, if optional fourth argument OLDMAP is specified, we redefine
|
||
in KEYMAP as NEWDEF those keys that are defined as OLDDEF in OLDMAP.
|
||
|
||
If you don't specify OLDMAP, you can usually get the same results
|
||
in a cleaner way with command remapping, like this:
|
||
(define-key KEYMAP [remap OLDDEF] NEWDEF)
|
||
\n(fn KEYMAP OLDDEF NEWDEF &optional OLDMAP)"
|
||
;; Don't document PREFIX in the doc string because we don't want to
|
||
;; advertise it. It's meant for recursive calls only. Here's its
|
||
;; meaning
|
||
|
||
;; If optional argument PREFIX is specified, it should be a key
|
||
;; prefix, a string. Redefined bindings will then be bound to the
|
||
;; original key, with PREFIX added at the front.
|
||
(unless prefix
|
||
(setq prefix ""))
|
||
(let* ((scan (or oldmap keymap))
|
||
(prefix1 (vconcat prefix [nil]))
|
||
(key-substitution-in-progress
|
||
(cons scan key-substitution-in-progress)))
|
||
;; Scan OLDMAP, finding each char or event-symbol that
|
||
;; has any definition, and act on it with hack-key.
|
||
(map-keymap
|
||
(lambda (char defn)
|
||
(aset prefix1 (length prefix) char)
|
||
(substitute-key-definition-key defn olddef newdef prefix1 keymap))
|
||
scan)))
|
||
|
||
(defun keymap-set-after (keymap key definition &optional after)
|
||
"Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding.
|
||
This is like `keymap-set' except that the binding for KEY is placed
|
||
just after the binding for the event AFTER, instead of at the beginning
|
||
of the map. Note that AFTER must be an event type (like KEY), NOT a command
|
||
\(like DEFINITION).
|
||
|
||
If AFTER is t or omitted, the new binding goes at the end of the keymap.
|
||
AFTER should be a single event type--a symbol or a character, not a sequence.
|
||
|
||
Bindings are always added before any inherited map.
|
||
|
||
The order of bindings in a keymap matters only when it is used as
|
||
a menu, so this function is not useful for non-menu keymaps."
|
||
(declare (indent defun)
|
||
(compiler-macro (lambda (form) (keymap--compile-check key) form)))
|
||
(keymap--check key)
|
||
(when (eq after t) (setq after nil)) ; nil and t are treated the same
|
||
(when (stringp after)
|
||
(keymap--check after)
|
||
(setq after (key-parse after)))
|
||
;; If we're binding this key to another key, then parse that other
|
||
;; key, too.
|
||
(when (stringp definition)
|
||
(keymap--check definition)
|
||
(setq definition (key-parse definition)))
|
||
(define-key-after keymap (key-parse key) definition
|
||
after))
|
||
|
||
(defun key-parse (keys)
|
||
"Convert KEYS to the internal Emacs key representation.
|
||
KEYS should be a string describing a key sequence in the format
|
||
returned by \\[describe-key] (`describe-key')."
|
||
(declare (pure t) (side-effect-free t))
|
||
;; A pure function is expected to preserve the match data.
|
||
(save-match-data
|
||
(let ((case-fold-search nil)
|
||
(len (length keys)) ; We won't alter keys in the loop below.
|
||
(pos 0)
|
||
(res []))
|
||
(while (and (< pos len)
|
||
(string-match "[^ \t\n\f]+" keys pos))
|
||
(let* ((word-beg (match-beginning 0))
|
||
(word-end (match-end 0))
|
||
(word (substring keys word-beg len))
|
||
(times 1)
|
||
key)
|
||
;; Try to catch events of the form "<as df>".
|
||
(if (string-match "\\`<[^ <>\t\n\f][^>\t\n\f]*>" word)
|
||
(setq word (match-string 0 word)
|
||
pos (+ word-beg (match-end 0)))
|
||
(setq word (substring keys word-beg word-end)
|
||
pos word-end))
|
||
(when (string-match "\\([0-9]+\\)\\*." word)
|
||
(setq times (string-to-number (substring word 0 (match-end 1))))
|
||
(setq word (substring word (1+ (match-end 1)))))
|
||
(cond ((string-match "^<<.+>>$" word)
|
||
(setq key (vconcat (if (eq (key-binding [?\M-x])
|
||
'execute-extended-command)
|
||
[?\M-x]
|
||
(or (car (where-is-internal
|
||
'execute-extended-command))
|
||
[?\M-x]))
|
||
(substring word 2 -2) "\r")))
|
||
((and (string-match "^\\(\\([ACHMsS]-\\)*\\)<\\(.+\\)>$" word)
|
||
(progn
|
||
(setq word (concat (match-string 1 word)
|
||
(match-string 3 word)))
|
||
(not (string-match
|
||
"\\<\\(NUL\\|RET\\|LFD\\|TAB\\|ESC\\|SPC\\|DEL\\)$"
|
||
word))))
|
||
(setq key (list (intern word))))
|
||
((or (equal word "REM") (string-match "^;;" word))
|
||
(setq pos (string-match "$" keys pos)))
|
||
(t
|
||
(let ((orig-word word) (prefix 0) (bits 0))
|
||
(while (string-match "^[ACHMsS]-." word)
|
||
(setq bits (+ bits
|
||
(cdr
|
||
(assq (aref word 0)
|
||
'((?A . ?\A-\0) (?C . ?\C-\0)
|
||
(?H . ?\H-\0) (?M . ?\M-\0)
|
||
(?s . ?\s-\0) (?S . ?\S-\0))))))
|
||
(setq prefix (+ prefix 2))
|
||
(setq word (substring word 2)))
|
||
(when (string-match "^\\^.$" word)
|
||
(setq bits (+ bits ?\C-\0))
|
||
(setq prefix (1+ prefix))
|
||
(setq word (substring word 1)))
|
||
(let ((found (assoc word '(("NUL" . "\0") ("RET" . "\r")
|
||
("LFD" . "\n") ("TAB" . "\t")
|
||
("ESC" . "\e") ("SPC" . " ")
|
||
("DEL" . "\177")))))
|
||
(when found (setq word (cdr found))))
|
||
(when (string-match "^\\\\[0-7]+$" word)
|
||
(let ((n 0))
|
||
(dolist (ch (cdr (string-to-list word)))
|
||
(setq n (+ (* n 8) ch -48)))
|
||
(setq word (vector n))))
|
||
(cond ((= bits 0)
|
||
(setq key word))
|
||
((and (= bits ?\M-\0) (stringp word)
|
||
(string-match "^-?[0-9]+$" word))
|
||
(setq key (mapcar (lambda (x) (+ x bits))
|
||
(append word nil))))
|
||
((/= (length word) 1)
|
||
(error "%s must prefix a single character, not %s"
|
||
(substring orig-word 0 prefix) word))
|
||
((and (/= (logand bits ?\C-\0) 0) (stringp word)
|
||
;; We used to accept . and ? here,
|
||
;; but . is simply wrong,
|
||
;; and C-? is not used (we use DEL instead).
|
||
(string-match "[@-_a-z]" word))
|
||
(setq key (list (+ bits (- ?\C-\0)
|
||
(logand (aref word 0) 31)))))
|
||
(t
|
||
(setq key (list (+ bits (aref word 0)))))))))
|
||
(when key
|
||
(dolist (_ (number-sequence 1 times))
|
||
(setq res (vconcat res key))))))
|
||
res)))
|
||
|
||
(defun key-valid-p (keys)
|
||
"Return non-nil if KEYS, a string, is a valid key sequence.
|
||
KEYS should be a string consisting of one or more key strokes,
|
||
with a single space character separating one key stroke from another.
|
||
|
||
Each key stroke is either a single character, or the name of an
|
||
event, surrounded by angle brackets <like-this>. In addition, any
|
||
key stroke may be preceded by one or more modifier keys. Finally,
|
||
a limited number of characters have a special shorthand syntax.
|
||
|
||
Here are some example of valid key sequences.
|
||
|
||
\"f\" (the key `f')
|
||
\"S o m\" (a three-key sequence of the keys `S', `o' and `m')
|
||
\"C-c o\" (a two-key sequence: the key `c' with the control modifier
|
||
followed by the key `o')
|
||
\"H-<left>\" (the function key named \"left\" with the hyper modifier)
|
||
\"M-RET\" (the \"return\" key with a meta modifier)
|
||
\"C-M-<space>\" (the \"space\" key with both the control and meta modifiers)
|
||
|
||
These are the characters that have special shorthand syntax:
|
||
NUL, RET, TAB, LFD, ESC, SPC, DEL.
|
||
|
||
Modifiers have to be specified in this order:
|
||
|
||
A-C-H-M-S-s
|
||
|
||
which is
|
||
|
||
Alt-Control-Hyper-Meta-Shift-super"
|
||
(declare (pure t) (side-effect-free error-free))
|
||
(let ((case-fold-search nil))
|
||
(and
|
||
(stringp keys)
|
||
(string-match-p "\\`[^ ]+\\( [^ ]+\\)*\\'" keys)
|
||
(save-match-data
|
||
(catch 'exit
|
||
(let ((prefixes
|
||
"\\(A-\\)?\\(C-\\)?\\(H-\\)?\\(M-\\)?\\(S-\\)?\\(s-\\)?"))
|
||
(dolist (key (split-string keys " "))
|
||
;; Every key might have these modifiers, and they should be
|
||
;; in this order.
|
||
(when (string-match (concat "\\`" prefixes) key)
|
||
(setq key (substring key (match-end 0))))
|
||
(unless (or (and (= (length key) 1)
|
||
;; Don't accept control characters as keys.
|
||
(not (< (aref key 0) ?\s))
|
||
;; Don't accept Meta'd characters as keys.
|
||
(or (multibyte-string-p key)
|
||
(not (<= 127 (aref key 0) 255))))
|
||
(and (string-match-p "\\`<[-_A-Za-z0-9]+>\\'" key)
|
||
;; Don't allow <M-C-down>.
|
||
(= (progn
|
||
(string-match
|
||
(concat "\\`<" prefixes) key)
|
||
(match-end 0))
|
||
1))
|
||
(string-match-p
|
||
"\\`\\(NUL\\|RET\\|TAB\\|LFD\\|ESC\\|SPC\\|DEL\\)\\'"
|
||
key))
|
||
;; Invalid.
|
||
(throw 'exit nil)))
|
||
t))))))
|
||
|
||
(defun key-translate (from to)
|
||
"Translate character FROM to TO on the current terminal.
|
||
|
||
This function creates a `keyboard-translate-table' if necessary
|
||
and then modifies one entry in it.
|
||
|
||
Both FROM and TO should be specified by strings that satisfy `key-valid-p'.
|
||
If TO is nil, remove any existing translation for FROM.
|
||
|
||
Interactively, prompt for FROM and TO with `read-char'."
|
||
(declare (compiler-macro
|
||
(lambda (form) (keymap--compile-check from to) form)))
|
||
;; Using `key-description' is a necessary evil here, so that the
|
||
;; values can be passed to keymap-* functions, even though those
|
||
;; functions immediately undo it with `key-parse'.
|
||
(interactive `(,(key-description `[,(read-char "From: ")])
|
||
,(key-description `[,(read-char "To: ")])))
|
||
(keymap--check from)
|
||
(when to
|
||
(keymap--check to))
|
||
(let ((from-key (key-parse from))
|
||
(to-key (and to (key-parse to))))
|
||
(cond
|
||
((= (length from-key) 0)
|
||
(error "FROM key is empty"))
|
||
((> (length from-key) 1)
|
||
(error "FROM key %s is not a single key" from)))
|
||
(cond
|
||
((and to (= (length to-key) 0))
|
||
(error "TO key is empty"))
|
||
((and to (> (length to-key) 1))
|
||
(error "TO key %s is not a single key" to)))
|
||
(or (char-table-p keyboard-translate-table)
|
||
(setq keyboard-translate-table
|
||
(make-char-table 'keyboard-translate-table nil)))
|
||
(aset keyboard-translate-table
|
||
(aref from-key 0)
|
||
(and to (aref to-key 0)))))
|
||
|
||
(defun key-translate-select ()
|
||
"Prompt for a current keyboard translation pair with `completing-read'.
|
||
|
||
Each pair is formatted as \"FROM -> TO\".
|
||
|
||
Return the \"FROM\" as a key string."
|
||
(let* ((formatted-trans-alist nil)
|
||
;; Alignment helpers
|
||
(pad 0)
|
||
(key-code-func
|
||
(lambda (kc trans)
|
||
(let* ((desc (key-description `[,kc]))
|
||
(len (length desc)))
|
||
(when (> len pad)
|
||
(setq pad len))
|
||
(push
|
||
`(,desc . ,(key-description `[,trans]))
|
||
formatted-trans-alist))))
|
||
(format-func
|
||
(lambda (pair) ;; (key . value)
|
||
(format
|
||
"%s -> %s"
|
||
(string-pad (key-description `[,(car pair)]) pad)
|
||
(key-description `[,(cdr pair)])))))
|
||
;; Set `pad' and `formatted-trans-alist'
|
||
(map-char-table
|
||
(lambda (chr trans)
|
||
(if (characterp chr)
|
||
(funcall key-code-func chr trans)
|
||
(require 'range)
|
||
(declare-function range-map "range" (func range))
|
||
(range-map
|
||
(lambda (kc) (funcall key-code-func kc trans))
|
||
chr)))
|
||
keyboard-translate-table)
|
||
(car
|
||
(split-string
|
||
(completing-read
|
||
"Key Translation: "
|
||
(mapcar format-func formatted-trans-alist)
|
||
nil t)))))
|
||
|
||
(defun key-translate-remove (from)
|
||
"Remove translation of FROM from `keyboard-translate-table'.
|
||
|
||
FROM must satisfy `key-valid-p'. If FROM has no entry in
|
||
`keyboard-translate-table', this has no effect."
|
||
(interactive (list (key-translate-select)))
|
||
(key-translate from nil))
|
||
|
||
(defun keymap-lookup (keymap key &optional accept-default no-remap position)
|
||
"Return the binding for command KEY in KEYMAP.
|
||
KEY is a string that satisfies `key-valid-p'.
|
||
|
||
If KEYMAP is nil, look up in the current keymaps. If non-nil, it
|
||
should either be a keymap or a list of keymaps, and only these
|
||
keymap(s) will be consulted.
|
||
|
||
The binding is probably a symbol with a function definition.
|
||
|
||
Normally, `keymap-lookup' ignores bindings for t, which act as
|
||
default bindings, used when nothing else in the keymap applies;
|
||
this makes it usable as a general function for probing keymaps.
|
||
However, if the optional second argument ACCEPT-DEFAULT is
|
||
non-nil, `keymap-lookup' does recognize the default bindings,
|
||
just as `read-key-sequence' does.
|
||
|
||
Like the normal command loop, `keymap-lookup' will remap the
|
||
command resulting from looking up KEY by looking up the command
|
||
in the current keymaps. However, if the optional third argument
|
||
NO-REMAP is non-nil, `keymap-lookup' returns the unmapped
|
||
command.
|
||
|
||
If KEY is a mouse gesture, the keymaps used depend on the clicked
|
||
mouse position with regards to the buffer, and local keymaps, if any,
|
||
on display and overlay strings.
|
||
|
||
If the optional argument POSITION is non-nil, it specifies a mouse
|
||
position as returned by `event-start' and `event-end', and the lookup
|
||
occurs in the keymaps associated with it instead of KEY. It can also
|
||
be a number or marker, in which case the keymap properties at the
|
||
specified buffer position are used instead of point."
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form)))
|
||
(keymap--check key)
|
||
(when (and keymap position)
|
||
(error "Can't pass in both keymap and position"))
|
||
(if keymap
|
||
(let ((value (lookup-key keymap (key-parse key) accept-default)))
|
||
(if (and (not no-remap)
|
||
(symbolp value))
|
||
(or (command-remapping value) value)
|
||
value))
|
||
(key-binding (key-parse key) accept-default no-remap position)))
|
||
|
||
(defun keymap-local-lookup (keys &optional accept-default)
|
||
"Return the binding for command KEYS in current local keymap only.
|
||
KEY is a string that satisfies `key-valid-p'.
|
||
|
||
The binding is probably a symbol with a function definition.
|
||
|
||
If optional argument ACCEPT-DEFAULT is non-nil, recognize default
|
||
bindings; see the description of `keymap-lookup' for more details
|
||
about this."
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check keys) form)))
|
||
(when-let* ((map (current-local-map)))
|
||
(keymap-lookup map keys accept-default)))
|
||
|
||
(defun keymap-global-lookup (keys &optional accept-default message)
|
||
"Return the binding for command KEYS in current global keymap only.
|
||
KEY is a string that satisfies `key-valid-p'.
|
||
|
||
The binding is probably a symbol with a function definition.
|
||
This function's return values are the same as those of `keymap-lookup'
|
||
\(which see).
|
||
|
||
If optional argument ACCEPT-DEFAULT is non-nil, recognize default
|
||
bindings; see the description of `keymap-lookup' for more details
|
||
about this.
|
||
|
||
If MESSAGE (and interactively), message the result."
|
||
(declare (compiler-macro (lambda (form) (keymap--compile-check keys) form)))
|
||
(interactive
|
||
(list (key-description (read-key-sequence "Look up key in global keymap: "))
|
||
nil t))
|
||
(let ((def (keymap-lookup (current-global-map) keys accept-default)))
|
||
(when message
|
||
(message "%s is bound to %s globally" keys def))
|
||
def))
|
||
|
||
|
||
;;; define-keymap and defvar-keymap
|
||
|
||
(defun define-keymap--compile (form &rest args)
|
||
;; This compiler macro is only there for compile-time
|
||
;; error-checking; it does not change the call in any way.
|
||
(while (and args
|
||
(keywordp (car args))
|
||
(not (eq (car args) :menu)))
|
||
(unless (memq (car args) '(:full :keymap :parent :suppress :name :prefix))
|
||
(byte-compile-warn-x (car args) "Invalid keyword: %s" (car args)))
|
||
(setq args (cdr args))
|
||
(when (null args)
|
||
(byte-compile-warn-x form "Uneven number of keywords in %S" form))
|
||
(setq args (cdr args)))
|
||
;; Bindings.
|
||
(while args
|
||
(let* ((wargs args)
|
||
(key (pop args)))
|
||
(when (and (stringp key) (not (key-valid-p key)))
|
||
(byte-compile-warn-x wargs "Invalid `kbd' syntax: %S" key)))
|
||
(when (null args)
|
||
(byte-compile-warn-x form "Uneven number of key bindings in %S" form))
|
||
(setq args (cdr args)))
|
||
form)
|
||
|
||
(defun define-keymap (&rest definitions)
|
||
"Create a new keymap and define KEY/DEFINITION pairs as key bindings.
|
||
Return the new keymap.
|
||
|
||
Options can be given as keywords before the KEY/DEFINITION
|
||
pairs. Available keywords are:
|
||
|
||
:full If non-nil, create a chartable alist (see `make-keymap').
|
||
If nil (i.e., the default), create a sparse keymap (see
|
||
`make-sparse-keymap').
|
||
|
||
:suppress If non-nil, the keymap will be suppressed (see `suppress-keymap').
|
||
If `nodigits', treat digits like other chars.
|
||
|
||
:parent If non-nil, this should be a keymap to use as the parent
|
||
(see `set-keymap-parent').
|
||
|
||
:keymap If non-nil, instead of creating a new keymap, the given keymap
|
||
will be destructively modified instead.
|
||
|
||
:name If non-nil, this should be a string to use as the menu for
|
||
the keymap in case you use it as a menu with `x-popup-menu'.
|
||
|
||
:prefix If non-nil, this should be a symbol to be used as a prefix
|
||
command (see `define-prefix-command'). If this is the case,
|
||
this symbol is returned instead of the map itself.
|
||
|
||
KEY/DEFINITION pairs are as KEY and DEF in `keymap-set'. KEY can
|
||
also be the special symbol `:menu', in which case DEFINITION
|
||
should be a MENU form as accepted by `easy-menu-define'.
|
||
|
||
\(fn &key FULL PARENT SUPPRESS NAME PREFIX KEYMAP &rest [KEY DEFINITION]...)"
|
||
(declare (indent defun)
|
||
(compiler-macro define-keymap--compile))
|
||
(let (full suppress parent name prefix keymap)
|
||
;; Handle keywords.
|
||
(while (and definitions
|
||
(keywordp (car definitions))
|
||
(not (eq (car definitions) :menu)))
|
||
(let ((keyword (pop definitions)))
|
||
(unless definitions
|
||
(error "Missing keyword value for %s" keyword))
|
||
(let ((value (pop definitions)))
|
||
(pcase keyword
|
||
(:full (setq full value))
|
||
(:keymap (setq keymap value))
|
||
(:parent (setq parent value))
|
||
(:suppress (setq suppress value))
|
||
(:name (setq name value))
|
||
(:prefix (setq prefix value))
|
||
(_ (error "Invalid keyword: %s" keyword))))))
|
||
|
||
(when (and prefix
|
||
(or full parent suppress keymap))
|
||
(error "A prefix keymap can't be defined with :full/:parent/:suppress/:keymap keywords"))
|
||
|
||
(when (and keymap full)
|
||
(error "Invalid combination: :keymap with :full"))
|
||
|
||
(let ((keymap (cond
|
||
(keymap keymap)
|
||
(prefix (define-prefix-command prefix nil name))
|
||
(full (make-keymap name))
|
||
(t (make-sparse-keymap name))))
|
||
seen-keys)
|
||
(when suppress
|
||
(suppress-keymap keymap (eq suppress 'nodigits)))
|
||
(when parent
|
||
(set-keymap-parent keymap parent))
|
||
|
||
;; Do the bindings.
|
||
(while definitions
|
||
(let ((key (pop definitions)))
|
||
(unless definitions
|
||
(error "Uneven number of key/definition pairs"))
|
||
(let ((def (pop definitions)))
|
||
(if (eq key :menu)
|
||
(easy-menu-define nil keymap "" def)
|
||
(when (member key seen-keys)
|
||
;; Since the keys can be computed dynamically, it can
|
||
;; very well happen that we get duplicate definitions
|
||
;; due to some unfortunate configuration rather than
|
||
;; due to an actual bug. While such duplicates are
|
||
;; not desirable, they shouldn't prevent the users
|
||
;; from getting their job done.
|
||
(message "Duplicate definition for key: %S %s" key keymap))
|
||
(push key seen-keys)
|
||
(keymap-set keymap key def)))))
|
||
keymap)))
|
||
|
||
(defmacro defvar-keymap (variable-name &rest defs)
|
||
"Define VARIABLE-NAME as a variable with a keymap definition.
|
||
See `define-keymap' for an explanation of the keywords and KEY/DEFINITION.
|
||
|
||
In addition to the keywords accepted by `define-keymap', this
|
||
macro also accepts a `:doc' keyword, which (if present) is used
|
||
as the variable documentation string.
|
||
|
||
The `:repeat' keyword can also be specified; it controls the
|
||
`repeat-mode' behavior of the bindings in the keymap. When it is
|
||
non-nil, all commands in the map will have the `repeat-map'
|
||
symbol property.
|
||
|
||
More control is available over which commands are repeatable; the
|
||
value can also be a property list with properties `:enter',
|
||
`:exit' and `:hints', for example:
|
||
|
||
:repeat (:enter (commands ...) :exit (commands ...)
|
||
:hints ((command . \"hint\") ...))
|
||
|
||
`:enter' specifies the list of additional commands that only
|
||
enter `repeat-mode'. When the list is empty, then only the
|
||
commands defined in the map enter `repeat-mode'. Specifying a
|
||
list of commands is useful when there are commands that have the
|
||
`repeat-map' symbol property, but don't exist in this specific
|
||
map.
|
||
|
||
`:exit' is a list of commands that exit `repeat-mode'. When the
|
||
list is empty, no commands in the map exit `repeat-mode'.
|
||
Specifying a list of commands is useful when those commands exist
|
||
in this specific map, but should not have the `repeat-map' symbol
|
||
property.
|
||
|
||
`:hints' is a list of cons pairs where car is a command and
|
||
cdr is a string that is displayed alongside of the repeatable key
|
||
in the echo area.
|
||
|
||
\(fn VARIABLE-NAME &key DOC FULL PARENT SUPPRESS NAME PREFIX KEYMAP REPEAT &rest [KEY DEFINITION]...)"
|
||
(declare (indent 1))
|
||
(let ((opts nil)
|
||
doc repeat props)
|
||
(while (and defs
|
||
(keywordp (car defs))
|
||
(not (eq (car defs) :menu)))
|
||
(let ((keyword (pop defs)))
|
||
(unless defs
|
||
(error "Uneven number of keywords"))
|
||
(cond
|
||
((eq keyword :doc) (setq doc (pop defs)))
|
||
((eq keyword :repeat) (setq repeat (pop defs)))
|
||
(t (push keyword opts)
|
||
(push (pop defs) opts)))))
|
||
(unless (zerop (% (length defs) 2))
|
||
(error "Uneven number of key/definition pairs: %s" defs))
|
||
|
||
(let ((defs defs)
|
||
key seen-keys)
|
||
(while defs
|
||
(setq key (pop defs))
|
||
(pop defs)
|
||
(when (not (eq key :menu))
|
||
(if (member key seen-keys)
|
||
(error "Duplicate definition for key '%s' in keymap '%s'"
|
||
key variable-name)
|
||
(push key seen-keys)))))
|
||
|
||
(when repeat
|
||
(let ((defs defs)
|
||
def)
|
||
(dolist (def (plist-get repeat :enter))
|
||
(push `(put ',def 'repeat-map ',variable-name) props))
|
||
(while defs
|
||
(pop defs)
|
||
(setq def (pop defs))
|
||
(when (and (memq (car def) '(function quote))
|
||
(not (memq (cadr def) (plist-get repeat :exit))))
|
||
(push `(put ,def 'repeat-map ',variable-name) props)))
|
||
(dolist (def (plist-get repeat :hints))
|
||
(push `(put ',(car def) 'repeat-hint ',(cdr def)) props))))
|
||
|
||
(let ((defvar-form
|
||
`(defvar ,variable-name
|
||
(define-keymap ,@(nreverse opts) ,@defs)
|
||
,@(and doc (list doc)))))
|
||
(if props
|
||
`(progn
|
||
,defvar-form
|
||
,@(nreverse props))
|
||
defvar-form))))
|
||
|
||
(defun make-non-key-event (symbol)
|
||
"Mark SYMBOL as an event that shouldn't be returned from `where-is'."
|
||
(put symbol 'non-key-event t)
|
||
symbol)
|
||
|
||
(provide 'keymap)
|
||
|
||
;;; keymap.el ends here
|