
* 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.
280 lines
11 KiB
EmacsLisp
280 lines
11 KiB
EmacsLisp
;;; icons.el --- Handling icons -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 2022-2024 Free Software Foundation, Inc.
|
|
|
|
;; Author: Lars Ingebrigtsen <larsi@gnus.org>
|
|
;; Keywords: icons buttons
|
|
|
|
;; 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:
|
|
|
|
;;; Code:
|
|
|
|
(require 'cl-lib)
|
|
|
|
(defface icon
|
|
'((t :underline nil))
|
|
"Face for buttons."
|
|
:version "29.1"
|
|
:group 'customize)
|
|
|
|
(defface icon-button
|
|
'((((type x w32 ns haiku pgtk) (class color))
|
|
:inherit icon
|
|
:box (:line-width (3 . -1) :color "#404040" :style flat-button)
|
|
:background "#808080"
|
|
:foreground "black"))
|
|
"Face for buttons."
|
|
:version "29.1"
|
|
:group 'customize)
|
|
|
|
(defcustom icon-preference '(image emoji symbol text)
|
|
"List of icon types to use, in order of preference.
|
|
Emacs will choose the icon of the highest preference possible
|
|
on the current display, and \"degrade\" gracefully to an icon
|
|
type that's available."
|
|
:version "29.1"
|
|
:group 'customize
|
|
:type '(repeat (choice (const :tag "Images" image)
|
|
(const :tag "Colorful Emojis" emoji)
|
|
(const :tag "Monochrome Symbols" symbol)
|
|
(const :tag "Text Only" text))))
|
|
|
|
(defmacro define-icon (name parent specification documentation &rest keywords)
|
|
"Define an icon identified by NAME.
|
|
If non-nil, inherit the specification from PARENT. Entries from
|
|
SPECIFICATION will override inherited specifications.
|
|
|
|
SPECIFICATION is an alist of entries where the first element is
|
|
the type, and the rest are icons of that type. Valid types are
|
|
`image', `emoji', `symbol' and `text'.
|
|
|
|
KEYWORDS specify additional information. Valid keywords are:
|
|
|
|
`:version': The first Emacs version to include this icon; this is
|
|
mandatory.
|
|
|
|
`:group': The customization group the icon belongs in; this is
|
|
inferred if not present.
|
|
|
|
`:help-echo': Informational text that explains what happens if
|
|
the icon is used as a button and you click it."
|
|
(declare (doc-string 4) (indent 2))
|
|
(unless (symbolp name)
|
|
(error "NAME must be a symbol: %S" name))
|
|
(unless (plist-get keywords :version)
|
|
(error "There must be a :version keyword in `define-icon'"))
|
|
`(icons--register ',name ',parent ,specification ,documentation
|
|
',keywords))
|
|
|
|
(defun icons--register (name parent spec doc keywords)
|
|
(put name 'icon--properties (list parent spec doc keywords))
|
|
(custom-add-to-group
|
|
(or (plist-get keywords :group)
|
|
(custom-current-group))
|
|
name 'custom-icon))
|
|
|
|
(defun icon-spec-keywords (spec)
|
|
(seq-drop-while (lambda (e) (not (keywordp e))) (cdr spec)))
|
|
|
|
(defun icon-spec-values (spec)
|
|
(seq-take-while (lambda (e) (not (keywordp e))) (cdr spec)))
|
|
|
|
(defun iconp (object)
|
|
"Return nil if OBJECT is not an icon.
|
|
If OBJECT is an icon, return the icon properties."
|
|
(get object 'icon--properties))
|
|
|
|
(defun icon-documentation (icon)
|
|
"Return the documentation for ICON."
|
|
(let ((props (iconp icon)))
|
|
(unless props
|
|
(user-error "%s is not a valid icon" icon))
|
|
(nth 2 props)))
|
|
|
|
(defun icons--spec (icon)
|
|
(nth 1 (iconp icon)))
|
|
|
|
(defun icons--copy-spec (spec)
|
|
(mapcar #'copy-sequence spec))
|
|
|
|
(defun icon-complete-spec (icon &optional inhibit-theme inhibit-inheritance)
|
|
"Return the merged spec for ICON."
|
|
(pcase-let ((`(,parent ,spec _ _) (iconp icon)))
|
|
;; We destructively modify `spec' when merging, so copy it.
|
|
(setq spec (icons--copy-spec spec))
|
|
;; Let the Customize theme override.
|
|
(unless inhibit-theme
|
|
(when-let* ((theme-spec (cadr (car (get icon 'theme-icon)))))
|
|
(setq spec (icons--merge-spec (icons--copy-spec theme-spec) spec))))
|
|
;; Inherit from the parent spec (recursively).
|
|
(unless inhibit-inheritance
|
|
(while parent
|
|
(let ((parent-props (get parent 'icon--properties)))
|
|
(when parent-props
|
|
(setq spec (icons--merge-spec spec (cadr parent-props))))
|
|
(setq parent (car parent-props)))))
|
|
spec))
|
|
|
|
(defun icon-string (name)
|
|
"Return a string suitable for display in the current buffer for icon NAME."
|
|
(let ((props (iconp name)))
|
|
(unless props
|
|
(user-error "%s is not a valid icon" name))
|
|
(pcase-let ((`(_ ,spec _ ,keywords) props))
|
|
(setq spec (icon-complete-spec name))
|
|
;; We now have a full spec, so check the intersection of what
|
|
;; the user wants and what this Emacs is capable of showing.
|
|
(let ((icon-string
|
|
(catch 'found
|
|
(dolist (type icon-preference)
|
|
(let* ((type-spec (assq type spec))
|
|
;; Find the keywords at the end of the section
|
|
;; (if any).
|
|
(type-keywords (icon-spec-keywords type-spec)))
|
|
;; Go through all the variations in this section
|
|
;; and return the first one we can display.
|
|
(dolist (icon (icon-spec-values type-spec))
|
|
(when-let* ((result
|
|
(icons--create type icon type-keywords)))
|
|
(throw 'found
|
|
(if-let* ((face (plist-get type-keywords :face)))
|
|
(propertize result 'face face)
|
|
result)))))))))
|
|
(unless icon-string
|
|
(error "Couldn't find any way to display the %s icon" name))
|
|
(when-let* ((help (plist-get keywords :help-echo)))
|
|
(setq icon-string (propertize icon-string 'help-echo help)))
|
|
(propertize icon-string 'rear-nonsticky t)))))
|
|
|
|
(defun icon-elements (name)
|
|
"Return the elements of icon NAME.
|
|
The elements are represented as a plist where the keys are
|
|
`string', `face' and `image'. The `image' element is only
|
|
present if the icon is represented by an image."
|
|
(let ((string (icon-string name)))
|
|
(list 'face (get-text-property 0 'face string)
|
|
'image (get-text-property 0 'display string)
|
|
'string (substring-no-properties string))))
|
|
|
|
(defun icons--merge-spec (merged parent-spec)
|
|
(dolist (elem parent-spec)
|
|
(let ((current (assq (car elem) merged)))
|
|
(if (not current)
|
|
;; Just add the entry.
|
|
(push elem merged)
|
|
;; See if there are any keywords to inherit.
|
|
(let ((parent-keywords (icon-spec-keywords elem))
|
|
(current-keywords (icon-spec-keywords current)))
|
|
(while parent-keywords
|
|
(unless (plist-get current-keywords (car parent-keywords))
|
|
(nconc current (take 2 parent-keywords)))
|
|
(setq parent-keywords (cddr parent-keywords)))))))
|
|
merged)
|
|
|
|
(cl-defmethod icons--create ((_type (eql 'image)) icon keywords)
|
|
(let* ((file (if (file-name-absolute-p icon)
|
|
icon
|
|
(and (fboundp 'image-search-load-path)
|
|
(image-search-load-path icon))))
|
|
(file-exists (and (stringp file) (file-readable-p file))))
|
|
(and file-exists
|
|
(display-images-p)
|
|
(fboundp 'image-supported-file-p)
|
|
(image-supported-file-p file)
|
|
(propertize
|
|
" " 'display
|
|
(let ((props
|
|
(append
|
|
(if-let* ((height (plist-get keywords :height)))
|
|
(list :height (if (eq height 'line)
|
|
(window-default-line-height)
|
|
height)))
|
|
(if-let* ((width (plist-get keywords :width)))
|
|
(list :width (if (eq width 'font)
|
|
(default-font-width)
|
|
width)))
|
|
'(:scale 1)
|
|
(if-let* ((rotation (plist-get keywords :rotation)))
|
|
(list :rotation rotation))
|
|
(if-let* ((margin (plist-get keywords :margin)))
|
|
(list :margin margin))
|
|
(list :ascent (if (plist-member keywords :ascent)
|
|
(plist-get keywords :ascent)
|
|
'center)))))
|
|
(apply 'create-image file nil nil props))))))
|
|
|
|
(cl-defmethod icons--create ((_type (eql 'emoji)) icon _keywords)
|
|
(when-let* ((font (and (display-multi-font-p)
|
|
;; FIXME: This is not enough for ensuring
|
|
;; display of color Emoji.
|
|
(car (internal-char-font nil ?🟠)))))
|
|
(and (font-has-char-p font (aref icon 0))
|
|
icon)))
|
|
|
|
(cl-defmethod icons--create ((_type (eql 'symbol)) icon _keywords)
|
|
(and (cl-every #'char-displayable-p icon)
|
|
icon))
|
|
|
|
(cl-defmethod icons--create ((_type (eql 'text)) icon _keywords)
|
|
icon)
|
|
|
|
(define-icon button nil
|
|
'((image :face icon-button)
|
|
(emoji "🔵" :face icon)
|
|
(symbol "●" :face icon-button)
|
|
(text "button" :face icon-button))
|
|
"Base icon for buttons."
|
|
:version "29.1")
|
|
|
|
;;;###autoload
|
|
(defun describe-icon (icon)
|
|
"Pop to a buffer to describe ICON."
|
|
(interactive
|
|
(list (intern (completing-read "Describe icon: " obarray 'iconp t))))
|
|
(let ((help-buffer-under-preparation t))
|
|
(help-setup-xref (list #'describe-icon icon)
|
|
(called-interactively-p 'interactive))
|
|
(with-help-window (help-buffer)
|
|
(with-current-buffer standard-output
|
|
(insert "Icon: " (symbol-name icon) "\n\n")
|
|
(insert "Documentation:\n"
|
|
(substitute-command-keys (icon-documentation icon)))
|
|
(ensure-empty-lines)
|
|
(let ((spec (icon-complete-spec icon))
|
|
(plain (icon-complete-spec icon t t)))
|
|
(insert "Specification including inheritance and theming:\n")
|
|
(icons--describe-spec spec)
|
|
(unless (equal spec plain)
|
|
(insert "\nSpecification not including inheritance and theming:\n")
|
|
(icons--describe-spec plain)))))))
|
|
|
|
(defun icons--describe-spec (spec)
|
|
(dolist (elem spec)
|
|
(let ((type (car elem))
|
|
(values (icon-spec-values elem))
|
|
(keywords (icon-spec-keywords elem)))
|
|
(when (or values keywords)
|
|
(insert (format "\nType: %s\n" type))
|
|
(dolist (value values)
|
|
(insert (format " %s\n" value)))
|
|
(while keywords
|
|
(insert (format " %s: %s\n" (pop keywords) (pop keywords))))))))
|
|
|
|
(provide 'icons)
|
|
|
|
;;; icons.el ends here
|