mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-21 06:55:39 +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.
518 lines
21 KiB
EmacsLisp
518 lines
21 KiB
EmacsLisp
;;; window-tool-bar.el --- Add tool bars inside windows -*- lexical-binding: t -*-
|
||
|
||
;; Copyright (C) 2023-2024 Free Software Foundation, Inc.
|
||
|
||
;; Author: Jared Finder <jared@finder.org>
|
||
;; Created: Nov 21, 2023
|
||
;; Version: 0.2.1
|
||
;; Keywords: mouse
|
||
;; Package-Requires: ((emacs "27.1") (compat "29.1"))
|
||
|
||
;; This is a GNU ELPA :core package. Avoid adding functionality that
|
||
;; is not available in the version of Emacs recorded above or any of
|
||
;; the package dependencies.
|
||
|
||
;; 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 <http://www.gnu.org/licenses/>.
|
||
|
||
;;; Commentary:
|
||
;;
|
||
;; This package puts a tool bar in each window. This allows you to see
|
||
;; multiple tool bars simultaneously directly next to the buffer it
|
||
;; acts on which feels much more intuitive. Emacs "browsing" modes
|
||
;; generally have sensible tool bars, for example: *info*, *help*, and
|
||
;; *eww* have them.
|
||
;;
|
||
;; It does this while being mindful of screen real estate. If
|
||
;; `tool-bar-map' is nil, then this package will not take up any space
|
||
;; for an empty tool bar. Most modes do not define a custom tool bar,
|
||
;; so calling (setq tool-bar-map nil) in your init file will make most
|
||
;; buffers not take up space for a tool bar.
|
||
;;
|
||
;; To get the default behavior, run (global-window-tool-bar-mode 1) or
|
||
;; enable via M-x customize-group RET window-tool-bar RET. This uses
|
||
;; the per-window tab line to show the tool bar.
|
||
;;
|
||
;; If you want to share space with an existing tab line, mode line, or
|
||
;; header line, add (:eval (window-tool-bar-string)) to
|
||
;; `tab-line-format', `mode-line-format', or `header-line-format'.
|
||
;;
|
||
;; For additional documentation, see info node `(emacs)Window Tool
|
||
;; Bar'
|
||
|
||
;;; Known issues:
|
||
;;
|
||
;; On GNU Emacs 29.1, terminals dragging to resize windows will error
|
||
;; with message "<tab-line> <mouse-movement> is undefined". This is a
|
||
;; bug in GNU Emacs,
|
||
;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67457>.
|
||
;;
|
||
;; On GNU Emacs 29, performance in terminals is lower than on
|
||
;; graphical frames. This is due to a workaround, see "Workaround for
|
||
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68334", below.
|
||
|
||
;;; Todo:
|
||
;;
|
||
;; Not all features planned are implemented yet. Eventually I would
|
||
;; like to also generally make tool bars better.
|
||
;;
|
||
;; Targeting 0.3:
|
||
;; * Properly support remaining less frequently used tool bar item specs. From
|
||
;; `parse_tool_bar_item':
|
||
;; * :visible
|
||
;; * :filter
|
||
;; * :button
|
||
;; * :wrap
|
||
;; * Add display customization similar to `tool-bar-style'.
|
||
;;
|
||
;; Targeting 1.0:
|
||
;;
|
||
;; * Clean up Emacs tool bars
|
||
;; * Default: Remove default tool-bar entirely
|
||
;; * grep, vc: Remove default tool-bar inherited
|
||
;; * info: Remove Next / Prev / Up, which is already in the header
|
||
;; * smerge: Add tool bar for next/prev
|
||
;;
|
||
;; Post 1.0 work:
|
||
;;
|
||
;; * Show keyboard shortcut on help text.
|
||
;;
|
||
;; * Add a bit more documentation.
|
||
;; * Add customization option: ignore-default-tool-bar-map
|
||
;; * Make tab-line dragging resize the window
|
||
|
||
;;; Code:
|
||
|
||
(require 'compat)
|
||
(require 'mwheel)
|
||
(require 'tab-line)
|
||
(require 'tool-bar)
|
||
|
||
;;; Benchmarking code
|
||
;;
|
||
;; Refreshing the tool bar is computationally simple, but generates a
|
||
;; lot of garbage. So this benchmarking focuses on garbage
|
||
;; generation. Since it has to run after most commands, generating
|
||
;; significantly more garbage will cause noticeable performance
|
||
;; degradation.
|
||
;;
|
||
;; The refresh has two steps:
|
||
;;
|
||
;; Step 1: Look up the <tool-bar> map.
|
||
;; Step 2: Generate a Lisp string using text properties for the tool
|
||
;; bar string.
|
||
;;
|
||
;; Additionally, we keep track of the percentage of commands that
|
||
;; actually created a refresh.
|
||
(defvar window-tool-bar--memory-use-delta-step1 (make-list 7 0)
|
||
"Absolute delta of memory use counters during step 1.
|
||
This is a list in the same structure as `memory-use-counts'.")
|
||
(defvar window-tool-bar--memory-use-delta-step2 (make-list 7 0)
|
||
"Absolute delta of memory use counters during step 2.
|
||
This is a list in the same structure as `memory-use-counts'.")
|
||
(defvar window-tool-bar--refresh-done-count 0
|
||
"Number of tool bar string refreshes run.
|
||
The total number of requests is the sum of this and
|
||
`window-tool-bar--refresh-skipped-count'.")
|
||
(defvar window-tool-bar--refresh-skipped-count 0
|
||
"Number of tool bar string refreshes that were skipped.
|
||
The total number of requests is the sum of this and
|
||
`window-tool-bar--refresh-done-count'.")
|
||
|
||
(defun window-tool-bar--memory-use-avg-step1 ()
|
||
"Return average memory use delta during step 1."
|
||
(mapcar (lambda (elt) (/ (float elt) window-tool-bar--refresh-done-count))
|
||
window-tool-bar--memory-use-delta-step1))
|
||
|
||
(defun window-tool-bar--memory-use-avg-step2 ()
|
||
"Return average memory use delta during step 2."
|
||
(mapcar (lambda (elt) (/ (float elt) window-tool-bar--refresh-done-count))
|
||
window-tool-bar--memory-use-delta-step2))
|
||
|
||
(declare-function time-stamp-string "time-stamp")
|
||
|
||
(defun window-tool-bar-debug-show-memory-use ()
|
||
"Development-only command to show memory used by `window-tool-bar-string'."
|
||
(interactive)
|
||
(require 'time-stamp)
|
||
(save-selected-window
|
||
(pop-to-buffer "*WTB Memory Report*")
|
||
(unless (derived-mode-p 'special-mode)
|
||
(special-mode))
|
||
|
||
(goto-char (point-max))
|
||
(let ((inhibit-read-only t))
|
||
(insert (propertize (concat "Function: window-tool-bar-string "
|
||
(time-stamp-string))
|
||
'face 'underline 'font-lock-face 'underline)
|
||
"\n\n")
|
||
(window-tool-bar--insert-memory-use
|
||
"Step 1" (window-tool-bar--memory-use-avg-step1))
|
||
(window-tool-bar--insert-memory-use
|
||
"Step 2" (window-tool-bar--memory-use-avg-step2))
|
||
(insert (format "Refresh count %d\n" window-tool-bar--refresh-done-count)
|
||
(format "Refresh executed percent %.2f\n"
|
||
(/ (float window-tool-bar--refresh-done-count)
|
||
(+ window-tool-bar--refresh-done-count
|
||
window-tool-bar--refresh-skipped-count)))
|
||
"\n"))))
|
||
|
||
(defun window-tool-bar--insert-memory-use (label avg-memory-use)
|
||
"Insert memory use into current buffer.
|
||
|
||
LABEL is a prefix string to be in front of the data.
|
||
AVG-MEMORY-USE is a list of averages, with the same meaning as
|
||
`memory-use-counts'."
|
||
(let* ((label-len (length label))
|
||
(padding (make-string label-len ?\s)))
|
||
(cl-loop for usage in avg-memory-use
|
||
for usage-label in '("Conses" "Floats" "Vector cells" "Symbols"
|
||
"String chars" "Intervals" "Strings")
|
||
for idx from 0
|
||
do (insert (format "%s %8.2f %s\n"
|
||
(if (= idx 0) label padding)
|
||
usage
|
||
usage-label)))))
|
||
|
||
(defgroup window-tool-bar nil
|
||
"Tool bars per-window."
|
||
:group 'convenience
|
||
:prefix "window-tool-bar-")
|
||
|
||
(defvar-keymap window-tool-bar--button-keymap
|
||
:doc "Keymap used by `window-tool-bar--keymap-entry-to-string'."
|
||
"<follow-link>" 'mouse-face
|
||
;; Follow link on all clicks of mouse-1 and mouse-2 since the tool
|
||
;; bar is not a place the point can travel to.
|
||
"<tab-line> <mouse-1>" #'window-tool-bar--call-button
|
||
"<tab-line> <double-mouse-1>" #'window-tool-bar--call-button
|
||
"<tab-line> <triple-mouse-1>" #'window-tool-bar--call-button
|
||
"<tab-line> <mouse-2>" #'window-tool-bar--call-button
|
||
"<tab-line> <double-mouse-2>" #'window-tool-bar--call-button
|
||
"<tab-line> <triple-mouse-2>" #'window-tool-bar--call-button
|
||
|
||
;; Mouse down events do nothing. A binding is needed so isearch
|
||
;; does not exit when the tab bar is clicked.
|
||
"<tab-line> <down-mouse-1>" #'window-tool-bar--ignore
|
||
"<tab-line> <double-down-mouse-1>" #'window-tool-bar--ignore
|
||
"<tab-line> <triple-down-mouse-1>" #'window-tool-bar--ignore
|
||
"<tab-line> <down-mouse-2>" #'window-tool-bar--ignore
|
||
"<tab-line> <double-down-mouse-2>" #'window-tool-bar--ignore
|
||
"<tab-line> <triple-down-mouse-2>" #'window-tool-bar--ignore)
|
||
(fset 'window-tool-bar--button-keymap window-tool-bar--button-keymap) ; So it can be a keymap property
|
||
|
||
;; Register bindings that stay in isearch. Technically, these
|
||
;; commands don't pop up a menu but they act very similar in that they
|
||
;; are caused by mouse input and may call commands via
|
||
;; `call-interactively'.
|
||
(push 'window-tool-bar--call-button isearch-menu-bar-commands)
|
||
(push 'window-tool-bar--ignore isearch-menu-bar-commands)
|
||
|
||
(defvar-local window-tool-bar-string--cache nil
|
||
"Cache for previous result of `window-tool-bar-string'.")
|
||
|
||
;;;###autoload
|
||
(defun window-tool-bar-string ()
|
||
"Return a (propertized) string for the tool bar.
|
||
|
||
This is for when you want more customizations than
|
||
`window-tool-bar-mode' provides. Commonly added to the variable
|
||
`tab-line-format', `header-line-format', or `mode-line-format'"
|
||
(if (or (null window-tool-bar-string--cache)
|
||
(window-tool-bar--last-command-triggers-refresh-p))
|
||
(let* ((mem0 (memory-use-counts))
|
||
(toolbar-menu (window-tool-bar--get-keymap))
|
||
(mem1 (memory-use-counts))
|
||
(result (mapconcat #'window-tool-bar--keymap-entry-to-string
|
||
(cdr toolbar-menu) ;Skip 'keymap
|
||
;; Without spaces between the text, hovering
|
||
;; highlights all adjacent buttons.
|
||
(if (window-tool-bar--use-images)
|
||
(propertize " " 'invisible t)
|
||
" ")))
|
||
(mem2 (memory-use-counts)))
|
||
(cl-mapl (lambda (l-init l0 l1)
|
||
(cl-incf (car l-init) (- (car l1) (car l0))))
|
||
window-tool-bar--memory-use-delta-step1 mem0 mem1)
|
||
(cl-mapl (lambda (l-init l1 l2)
|
||
(cl-incf (car l-init) (- (car l2) (car l1))))
|
||
window-tool-bar--memory-use-delta-step2 mem1 mem2)
|
||
|
||
(setf window-tool-bar-string--cache
|
||
(concat
|
||
;; The tool bar face by default puts boxes around the
|
||
;; buttons. However, this box is not displayed if the
|
||
;; box starts at the leftmost pixel of the tab-line.
|
||
;; Add a single space in this case so the box displays
|
||
;; correctly.
|
||
(and (display-supports-face-attributes-p
|
||
'(:box (line-width 1)))
|
||
(propertize " " 'display '(space :width (1))))
|
||
result))
|
||
(cl-incf window-tool-bar--refresh-done-count))
|
||
(cl-incf window-tool-bar--refresh-skipped-count))
|
||
|
||
window-tool-bar-string--cache)
|
||
|
||
(defconst window-tool-bar--graphical-separator
|
||
(concat
|
||
(propertize " " 'display '(space :width (4)))
|
||
(propertize " " 'display '(space :width (1) face (:inverse-video t)))
|
||
(propertize " " 'display '(space :width (4)))))
|
||
|
||
(defun window-tool-bar--keymap-entry-to-string (menu-item)
|
||
"Convert MENU-ITEM into a (propertized) string representation.
|
||
|
||
MENU-ITEM is a menu item to convert. See info node `(elisp)Tool Bar'."
|
||
(pcase-exhaustive menu-item
|
||
;; Separators
|
||
((or `(,_ "--")
|
||
`(,_ menu-item ,(and (pred stringp)
|
||
(pred (string-prefix-p "--")))))
|
||
(if (window-tool-bar--use-images)
|
||
window-tool-bar--graphical-separator
|
||
"|"))
|
||
|
||
;; Menu item, turn into propertized string button
|
||
(`(,key menu-item ,name-expr ,binding . ,plist)
|
||
(when binding ; If no binding exists, then button is hidden.
|
||
(let* ((name (eval name-expr))
|
||
(str (upcase-initials (or (plist-get plist :label)
|
||
(string-trim-right name "\\.+"))))
|
||
(len (length str))
|
||
(enable-form (plist-get plist :enable))
|
||
(enabled (or (not enable-form)
|
||
(eval enable-form))))
|
||
(if enabled
|
||
(add-text-properties 0 len
|
||
'(mouse-face window-tool-bar-button-hover
|
||
keymap window-tool-bar--button-keymap
|
||
face window-tool-bar-button)
|
||
str)
|
||
(put-text-property 0 len
|
||
'face
|
||
'window-tool-bar-button-disabled
|
||
str))
|
||
(when-let* ((spec (and (window-tool-bar--use-images)
|
||
(plist-get menu-item :image))))
|
||
(put-text-property 0 len
|
||
'display
|
||
(append spec
|
||
(if enabled '(:margin 2 :ascent center)
|
||
'(:margin 2 :ascent center
|
||
:conversion disabled)))
|
||
str))
|
||
(put-text-property 0 len
|
||
'help-echo
|
||
(or (plist-get plist :help) name)
|
||
str)
|
||
(put-text-property 0 len 'tool-bar-key key str)
|
||
str)))))
|
||
|
||
(defun window-tool-bar--call-button ()
|
||
"Call the button that was clicked on in the tab line."
|
||
(interactive)
|
||
(when (mouse-event-p last-command-event)
|
||
(let ((posn (event-start last-command-event)))
|
||
;; Commands need to execute with the right buffer and window
|
||
;; selected. The selection needs to be permanent for isearch.
|
||
(select-window (posn-window posn))
|
||
(let* ((str (posn-string posn))
|
||
(key (get-text-property (cdr str) 'tool-bar-key (car str)))
|
||
(cmd (lookup-key (window-tool-bar--get-keymap) (vector key))))
|
||
(call-interactively cmd)))))
|
||
|
||
(defun window-tool-bar--ignore ()
|
||
"Internal command so isearch does not exit on button-down events."
|
||
(interactive)
|
||
nil)
|
||
|
||
;; static-if was added in Emacs 30, but this packages supports earlier
|
||
;; versions.
|
||
(defmacro window-tool-bar--static-if (condition then-form &rest else-forms)
|
||
"A conditional compilation macro.
|
||
Evaluate CONDITION at macro-expansion time. If it is non-nil,
|
||
expand the macro to THEN-FORM. Otherwise expand it to ELSE-FORMS
|
||
enclosed in a `progn' form. ELSE-FORMS may be empty."
|
||
(declare (indent 2)
|
||
(debug (sexp sexp &rest sexp)))
|
||
(if (eval condition lexical-binding)
|
||
then-form
|
||
(cons 'progn else-forms)))
|
||
|
||
(defvar window-tool-bar--ignored-event-types
|
||
(let ((list (append
|
||
'(mouse-movement pinch
|
||
wheel-down wheel-up wheel-left wheel-right)
|
||
;; Prior to emacs 30, wheel events could also surface as
|
||
;; mouse-<NUM> buttons.
|
||
(window-tool-bar--static-if (version< emacs-version "30")
|
||
(list
|
||
mouse-wheel-down-event mouse-wheel-up-event
|
||
mouse-wheel-left-event mouse-wheel-right-event
|
||
(bound-and-true-p mouse-wheel-down-alternate-event)
|
||
(bound-and-true-p mouse-wheel-up-alternate-event)
|
||
(bound-and-true-p mouse-wheel-left-alternate-event)
|
||
(bound-and-true-p mouse-wheel-right-alternate-event))
|
||
nil))))
|
||
(delete-dups (delete nil list)))
|
||
"Cache for `window-tool-bar--last-command-triggers-refresh-p'.")
|
||
|
||
(defun window-tool-bar--last-command-triggers-refresh-p ()
|
||
"Test if the recent command or event should trigger a tool bar refresh."
|
||
(let ((type (event-basic-type last-command-event)))
|
||
(and
|
||
;; Assume that key presses and button presses are the only user
|
||
;; interactions that can alter the tool bar. Specifically, this
|
||
;; excludes mouse movement, mouse wheel scroll, and pinch.
|
||
(not (member type window-tool-bar--ignored-event-types))
|
||
;; Assume that any command that triggers shift select can't alter
|
||
;; the tool bar. This excludes pure navigation commands.
|
||
(not (window-tool-bar--command-triggers-shift-select-p last-command))
|
||
;; Assume that self-insert-command won't alter the tool bar.
|
||
;; This is the most commonly executed command.
|
||
(not (eq last-command 'self-insert-command)))))
|
||
|
||
(defun window-tool-bar--command-triggers-shift-select-p (command)
|
||
"Test if COMMAND would trigger shift select."
|
||
(let* ((form (interactive-form command))
|
||
(spec (car-safe (cdr-safe form))))
|
||
(and (eq (car-safe form) 'interactive)
|
||
(stringp spec)
|
||
(seq-position spec ?^))))
|
||
|
||
;;;###autoload
|
||
(define-minor-mode window-tool-bar-mode
|
||
"Toggle display of the tool bar in the tab line of the current buffer."
|
||
:global nil
|
||
(let ((should-display (and window-tool-bar-mode
|
||
tool-bar-map))
|
||
(default-value '(:eval (window-tool-bar-string))))
|
||
|
||
;; Preserve existing tab-line set outside of this mode
|
||
(if (or (null tab-line-format)
|
||
(equal tab-line-format default-value))
|
||
(if should-display
|
||
(setq tab-line-format default-value)
|
||
(setq tab-line-format nil))
|
||
(message
|
||
"tab-line-format set outside of window-tool-bar-mode, currently `%S'"
|
||
tab-line-format))))
|
||
|
||
;;;###autoload
|
||
(define-globalized-minor-mode global-window-tool-bar-mode
|
||
window-tool-bar-mode window-tool-bar--turn-on
|
||
:group 'window-tool-bar
|
||
(add-hook 'isearch-mode-hook #'window-tool-bar--turn-on)
|
||
(add-hook 'isearch-mode-end-hook #'window-tool-bar--turn-on))
|
||
|
||
(defvar window-tool-bar--allow-images t
|
||
"Internal debug flag to force text mode.")
|
||
|
||
(defun window-tool-bar--use-images ()
|
||
"Internal function.
|
||
Respects `window-tool-bar--allow-images' as well as frame
|
||
capabilities."
|
||
(and window-tool-bar--allow-images
|
||
(display-images-p)))
|
||
|
||
;;; Display styling:
|
||
(defface window-tool-bar-button
|
||
'((default
|
||
:inherit tab-line)
|
||
(((class color) (min-colors 88) (supports :box t))
|
||
:box (:line-width -1 :style released-button)
|
||
:background "grey85")
|
||
;; If the box is not supported, dim the button background a bit.
|
||
(((class color) (min-colors 88))
|
||
:background "grey70")
|
||
(t
|
||
:inverse-video t))
|
||
"Face used for buttons when the mouse is not hovering over the button."
|
||
:group 'window-tool-bar)
|
||
|
||
(defface window-tool-bar-button-hover
|
||
'((default
|
||
:inherit tab-line)
|
||
(((class color) (min-colors 88))
|
||
:box (:line-width -1 :style released-button)
|
||
:background "grey95")
|
||
(t
|
||
:inverse-video t))
|
||
"Face used for buttons when the mouse is hovering over the button."
|
||
:group 'window-tool-bar)
|
||
|
||
(defface window-tool-bar-button-disabled
|
||
'((default
|
||
:inherit tab-line)
|
||
(((class color) (min-colors 88))
|
||
:box (:line-width -1 :style released-button)
|
||
:background "grey50"
|
||
:foreground "grey70")
|
||
(t
|
||
:inverse-video t
|
||
:background "brightblack"))
|
||
"Face used for buttons when the button is disabled."
|
||
:group 'window-tool-bar)
|
||
|
||
;;; Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68334.
|
||
|
||
;; This special variable is added in Emacs 30.1.
|
||
(defvar tool-bar-always-show-default)
|
||
|
||
(defun window-tool-bar--get-keymap ()
|
||
"Return the tool bar keymap."
|
||
(let ((tool-bar-always-show-default nil))
|
||
(if (and (version< emacs-version "30")
|
||
(not (window-tool-bar--use-images)))
|
||
;; This code path is a less efficient workaround.
|
||
(window-tool-bar--make-keymap-1)
|
||
(keymap-global-lookup "<tool-bar>"))))
|
||
|
||
(declare-function image-mask-p "image.c" (spec &optional frame))
|
||
|
||
(defun window-tool-bar--make-keymap-1 ()
|
||
"Patched copy of `tool-bar-make-keymap-1'."
|
||
(mapcar (lambda (bind)
|
||
(let (image-exp plist)
|
||
(when (and (eq (car-safe (cdr-safe bind)) 'menu-item)
|
||
;; For the format of menu-items, see node
|
||
;; `Extended Menu Items' in the Elisp manual.
|
||
(setq plist (nthcdr (if (consp (nth 4 bind)) 5 4)
|
||
bind))
|
||
(setq image-exp (plist-get plist :image))
|
||
(consp image-exp)
|
||
(not (eq (car image-exp) 'image))
|
||
(fboundp (car image-exp)))
|
||
(let ((image (and (display-images-p)
|
||
(eval image-exp))))
|
||
(unless (and image (image-mask-p image))
|
||
(setq image (append image '(:mask heuristic))))
|
||
(setq bind (copy-sequence bind)
|
||
plist (nthcdr (if (consp (nth 4 bind)) 5 4)
|
||
bind))
|
||
(plist-put plist :image image)))
|
||
bind))
|
||
tool-bar-map))
|
||
|
||
(defun window-tool-bar--turn-on ()
|
||
"Internal function called by `global-window-tool-bar-mode'."
|
||
(when global-window-tool-bar-mode
|
||
(window-tool-bar-mode 1)))
|
||
|
||
(provide 'window-tool-bar)
|
||
|
||
;;; window-tool-bar.el ends here
|