[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8903106bb78: Mark if-let and when-let obsolete
|
From: |
Sean Whitton |
|
Subject: |
master 8903106bb78: Mark if-let and when-let obsolete |
|
Date: |
Thu, 24 Oct 2024 04:51:05 -0400 (EDT) |
branch: master
commit 8903106bb783c2825233c149b6799960aacdea57
Author: Sean Whitton <spwhitton@spwhitton.name>
Commit: Sean Whitton <spwhitton@spwhitton.name>
Mark if-let and when-let obsolete
* 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.
---
admin/admin.el | 12 +-
doc/misc/erc.texi | 4 +-
etc/NEWS | 7 +
lisp/ansi-color.el | 8 +-
lisp/ansi-osc.el | 4 +-
lisp/arc-mode.el | 4 +-
lisp/auth-source-pass.el | 6 +-
lisp/autorevert.el | 8 +-
lisp/buff-menu.el | 4 +-
lisp/calendar/parse-time.el | 2 +-
lisp/cedet/pulse.el | 2 +-
lisp/comint.el | 4 +-
lisp/completion-preview.el | 16 +--
lisp/cus-edit.el | 6 +-
lisp/custom.el | 2 +-
lisp/descr-text.el | 8 +-
lisp/desktop.el | 2 +-
lisp/dired-x.el | 2 +-
lisp/dired.el | 20 +--
lisp/dnd.el | 4 +-
lisp/dom.el | 2 +-
lisp/emacs-lisp/byte-opt.el | 2 +-
lisp/emacs-lisp/bytecomp.el | 6 +-
lisp/emacs-lisp/comp-common.el | 4 +-
lisp/emacs-lisp/comp-cstr.el | 20 +--
lisp/emacs-lisp/comp-run.el | 6 +-
lisp/emacs-lisp/comp.el | 72 +++++-----
lisp/emacs-lisp/edebug.el | 8 +-
lisp/emacs-lisp/eieio.el | 8 +-
lisp/emacs-lisp/ert-x.el | 4 +-
lisp/emacs-lisp/ert.el | 34 ++---
lisp/emacs-lisp/icons.el | 26 ++--
lisp/emacs-lisp/lisp-mode.el | 12 +-
lisp/emacs-lisp/loaddefs-gen.el | 8 +-
lisp/emacs-lisp/multisession.el | 6 +-
lisp/emacs-lisp/package-vc.el | 8 +-
lisp/emacs-lisp/package.el | 32 ++---
lisp/emacs-lisp/pp.el | 4 +-
lisp/emacs-lisp/subr-x.el | 2 +-
lisp/emacs-lisp/tabulated-list.el | 4 +-
lisp/emacs-lisp/timer.el | 2 +-
lisp/emacs-lisp/vtable.el | 28 ++--
lisp/emacs-lisp/warnings.el | 2 +-
lisp/epa-file.el | 2 +-
lisp/epa.el | 2 +-
lisp/erc/erc-backend.el | 30 ++---
lisp/erc/erc-button.el | 40 +++---
lisp/erc/erc-common.el | 4 +-
lisp/erc/erc-fill.el | 78 +++++------
lisp/erc/erc-goodies.el | 58 ++++-----
lisp/erc/erc-ibuffer.el | 8 +-
lisp/erc/erc-join.el | 6 +-
lisp/erc/erc-networks.el | 16 +--
lisp/erc/erc-nicks.el | 72 +++++-----
lisp/erc/erc-notify.el | 16 +--
lisp/erc/erc-sasl.el | 22 ++--
lisp/erc/erc-services.el | 14 +-
lisp/erc/erc-speedbar.el | 28 ++--
lisp/erc/erc-stamp.el | 92 ++++++-------
lisp/erc/erc-status-sidebar.el | 22 ++--
lisp/erc/erc-track.el | 36 ++---
lisp/erc/erc-truncate.el | 6 +-
lisp/erc/erc.el | 152 +++++++++++-----------
lisp/eshell/em-alias.el | 4 +-
lisp/eshell/em-glob.el | 4 +-
lisp/eshell/em-pred.el | 14 +-
lisp/eshell/em-prompt.el | 6 +-
lisp/eshell/esh-arg.el | 4 +-
lisp/eshell/esh-cmd.el | 14 +-
lisp/eshell/esh-io.el | 8 +-
lisp/eshell/esh-proc.el | 2 +-
lisp/eshell/esh-var.el | 16 +--
lisp/faces.el | 2 +-
lisp/ffap.el | 2 +-
lisp/filenotify.el | 2 +-
lisp/files-x.el | 8 +-
lisp/files.el | 12 +-
lisp/find-dired.el | 6 +-
lisp/font-lock.el | 10 +-
lisp/gnus/gnus-art.el | 4 +-
lisp/gnus/gnus-int.el | 2 +-
lisp/gnus/gnus-search.el | 14 +-
lisp/gnus/gnus-sum.el | 8 +-
lisp/gnus/gnus.el | 6 +-
lisp/gnus/message.el | 4 +-
lisp/gnus/mml.el | 4 +-
lisp/gnus/nnatom.el | 108 +++++++--------
lisp/gnus/nnfeed.el | 140 ++++++++++----------
lisp/gnus/nnmh.el | 8 +-
lisp/help-fns.el | 18 +--
lisp/help-mode.el | 2 +-
lisp/help.el | 6 +-
lisp/hfy-cmap.el | 2 +-
lisp/ibuf-ext.el | 26 ++--
lisp/ibuf-macs.el | 6 +-
lisp/ibuffer.el | 14 +-
lisp/image.el | 4 +-
lisp/image/exif.el | 4 +-
lisp/image/image-converter.el | 10 +-
lisp/image/image-dired-util.el | 2 +-
lisp/image/image-dired.el | 14 +-
lisp/image/wallpaper.el | 56 ++++----
lisp/info-look.el | 6 +-
lisp/info.el | 10 +-
lisp/international/emoji.el | 6 +-
lisp/jsonrpc.el | 6 +-
lisp/keymap.el | 2 +-
lisp/mail/emacsbug.el | 4 +-
lisp/mail/ietf-drums.el | 10 +-
lisp/mail/mailclient.el | 2 +-
lisp/mail/rfc6068.el | 2 +-
lisp/mail/undigest.el | 2 +-
lisp/minibuffer.el | 10 +-
lisp/net/browse-url.el | 6 +-
lisp/net/dbus.el | 6 +-
lisp/net/dictionary.el | 2 +-
lisp/net/eww.el | 20 +--
lisp/net/goto-addr.el | 2 +-
lisp/net/mailcap.el | 8 +-
lisp/net/rcirc.el | 40 +++---
lisp/net/shr.el | 20 +--
lisp/net/sieve.el | 2 +-
lisp/outline.el | 4 +-
lisp/pcmpl-git.el | 8 +-
lisp/proced.el | 8 +-
lisp/progmodes/bug-reference.el | 18 +--
lisp/progmodes/c-ts-common.el | 4 +-
lisp/progmodes/c-ts-mode.el | 18 +--
lisp/progmodes/compile.el | 14 +-
lisp/progmodes/eglot.el | 56 ++++----
lisp/progmodes/elisp-mode.el | 4 +-
lisp/progmodes/erts-mode.el | 4 +-
lisp/progmodes/flymake.el | 4 +-
lisp/progmodes/gdb-mi.el | 4 +-
lisp/progmodes/go-ts-mode.el | 18 +--
lisp/progmodes/grep.el | 10 +-
lisp/progmodes/perl-mode.el | 4 +-
lisp/progmodes/php-ts-mode.el | 16 +--
lisp/progmodes/project.el | 32 ++---
lisp/progmodes/python.el | 54 ++++----
lisp/progmodes/xref.el | 2 +-
lisp/repeat.el | 4 +-
lisp/saveplace.el | 22 ++--
lisp/server.el | 2 +-
lisp/shadowfile.el | 8 +-
lisp/shell.el | 4 +-
lisp/simple.el | 26 ++--
lisp/startup.el | 6 +-
lisp/subr.el | 42 +++---
lisp/tab-line.el | 2 +-
lisp/tar-mode.el | 4 +-
lisp/term/android-win.el | 4 +-
lisp/term/haiku-win.el | 6 +-
lisp/textmodes/emacs-news-mode.el | 2 +-
lisp/textmodes/ispell.el | 2 +-
lisp/textmodes/sgml-mode.el | 28 ++--
lisp/textmodes/tex-mode.el | 18 +--
lisp/thingatpt.el | 4 +-
lisp/thread.el | 2 +-
lisp/time.el | 4 +-
lisp/touch-screen.el | 4 +-
lisp/treesit.el | 102 +++++++--------
lisp/url/url.el | 8 +-
lisp/vc/smerge-mode.el | 2 +-
lisp/vc/vc-dir.el | 6 +-
lisp/vc/vc-dispatcher.el | 2 +-
lisp/vc/vc-git.el | 46 +++----
lisp/vc/vc.el | 12 +-
lisp/visual-wrap.el | 6 +-
lisp/wid-edit.el | 6 +-
lisp/window-tool-bar.el | 4 +-
lisp/window.el | 36 ++---
lisp/xdg.el | 2 +-
lisp/xwidget.el | 2 +-
lisp/yank-media.el | 4 +-
test/lisp/comint-tests.el | 6 +-
test/lisp/completion-preview-tests.el | 2 +-
test/lisp/cus-edit-tests.el | 2 +-
test/lisp/erc/erc-scenarios-base-local-modules.el | 2 +-
test/lisp/erc/erc-scenarios-stamp.el | 2 +-
test/lisp/erc/erc-services-tests.el | 2 +-
test/lisp/erc/erc-tests.el | 8 +-
test/lisp/erc/resources/erc-d/erc-d-i.el | 14 +-
test/lisp/erc/resources/erc-d/erc-d-t.el | 8 +-
test/lisp/erc/resources/erc-d/erc-d-tests.el | 8 +-
test/lisp/erc/resources/erc-d/erc-d-u.el | 2 +-
test/lisp/erc/resources/erc-d/erc-d.el | 6 +-
test/lisp/erc/resources/erc-scenarios-common.el | 4 +-
test/lisp/erc/resources/erc-tests-common.el | 8 +-
test/lisp/ibuffer-tests.el | 2 +-
test/lisp/international/mule-tests.el | 2 +-
test/lisp/progmodes/python-tests.el | 6 +-
test/lisp/progmodes/ruby-ts-mode-tests.el | 4 +-
test/lisp/replace-tests.el | 2 +-
test/src/emacs-tests.el | 4 +-
test/src/process-tests.el | 16 +--
test/src/treesit-tests.el | 8 +-
197 files changed, 1357 insertions(+), 1346 deletions(-)
diff --git a/admin/admin.el b/admin/admin.el
index b3f63eef5bb..4a152cdc26b 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1169,12 +1169,12 @@ changes (in a non-trivial way). This function does not
check for that."
(declare-function mail-position-on-field "sendmail" (field &optional soft))
(declare-function mail-text "sendmail" ())
- (when-let ((id (alist-get version debbugs-gnu-emacs-blocking-reports
- nil nil #'string-equal))
- (status-id (debbugs-get-status id))
- (blockedby-ids (debbugs-get-attribute (car status-id) 'blockedby))
- (blockedby-status
- (apply #'debbugs-get-status (sort blockedby-ids #'<))))
+ (when-let* ((id (alist-get version debbugs-gnu-emacs-blocking-reports
+ nil nil #'string-equal))
+ (status-id (debbugs-get-status id))
+ (blockedby-ids (debbugs-get-attribute (car status-id)
'blockedby))
+ (blockedby-status
+ (apply #'debbugs-get-status (sort blockedby-ids #'<))))
(reporter-submit-bug-report
"<emacs-devel@gnu.org>" ; to-address
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index a3802c8c6bf..0f6b6b8c5be 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -1915,8 +1915,8 @@ interactve contexts covered by the option
@lisp
(defun my-erc-interactive-display-buffer (buffer action)
"Pop to BUFFER when running \\[erc-tls], clicking a link, etc."
- (when-let ((alist (cdr action))
- (found (alist-get 'erc-interactive-display alist)))
+ (when-let* ((alist (cdr action))
+ (found (alist-get 'erc-interactive-display alist)))
(if (eq found 'erc-tls)
(pop-to-buffer-same-window buffer action)
(pop-to-buffer buffer action))))
diff --git a/etc/NEWS b/etc/NEWS
index a6c2c895985..64e4f22b9d3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -641,6 +641,13 @@ All the characters that belong to the 'symbol' script
(according to
cc-compat.el, info-edit.el, meese.el, otodo-mode.el, rcompile.el,
sup-mouse.el, terminal.el, vi.el, vip.el, ws-mode.el, and yow.el.
++++
+** 'if-let' and 'when-let' are now obsolete.
+Use 'if-let*', 'when-let*' and 'and-let*' instead.
+
+This effectively obsoletes the old '(if-let (SYMBOL SOMETHING) ...)'
+single binding syntax, which we'd kept only for backwards compatibility.
+
* Lisp Changes in Emacs 31.1
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index b492eb8f07c..4c0969492a0 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -532,7 +532,7 @@ This function can be added to
`comint-preoutput-filter-functions'."
(while (setq end (string-match ansi-color-control-seq-regexp string start))
(let ((esc-end (match-end 0)))
;; Colorize the old block from start to end using old face.
- (when-let ((face (ansi-color--face-vec-face face-vec)))
+ (when-let* ((face (ansi-color--face-vec-face face-vec)))
(put-text-property start end 'font-lock-face
face string))
(push (substring string start end) result)
@@ -550,7 +550,7 @@ This function can be added to
`comint-preoutput-filter-functions'."
(when (<= cur-pos esc-end)
(string-to-number (match-string 1 string))))))))))
;; if the rest of the string should have a face, put it there
- (when-let ((face (ansi-color--face-vec-face face-vec)))
+ (when-let* ((face (ansi-color--face-vec-face face-vec)))
(put-text-property start (length string)
'font-lock-face face string))
;; save context, add the remainder of the string to the result
@@ -597,7 +597,7 @@ code. It is usually stored as the car of the variable
(bright (and ansi-color-bold-is-bright (aref basic-faces 1)))
(faces nil))
- (when-let ((fg (car colors)))
+ (when-let* ((fg (car colors)))
(push
`(:foreground
,(or (ansi-color--code-as-hex fg)
@@ -608,7 +608,7 @@ code. It is usually stored as the car of the variable
(mod fg 8))
nil 'default)))
faces))
- (when-let ((bg (cadr colors)))
+ (when-let* ((bg (cadr colors)))
(push
`(:background
,(or (ansi-color--code-as-hex bg)
diff --git a/lisp/ansi-osc.el b/lisp/ansi-osc.el
index 8dbaeb45132..6c647c879ad 100644
--- a/lisp/ansi-osc.el
+++ b/lisp/ansi-osc.el
@@ -84,7 +84,7 @@ located."
pos1 (match-beginning 0))))
(setq ansi-osc--marker nil)
(delete-region pos0 (point))
- (when-let ((fun (cdr (assoc-string code ansi-osc-handlers))))
+ (when-let* ((fun (cdr (assoc-string code ansi-osc-handlers))))
(funcall fun code text)))
(put-text-property pos0 end 'invisible t)
(setq ansi-osc--marker (copy-marker pos0)))))))
@@ -137,7 +137,7 @@ and `shell-dirtrack-mode'."
(define-button-type 'ansi-osc-hyperlink
'keymap ansi-osc-hyperlink-map
'help-echo (lambda (_ buffer pos)
- (when-let ((url (get-text-property pos 'browse-url-data
buffer)))
+ (when-let* ((url (get-text-property pos 'browse-url-data
buffer)))
(format "mouse-2, C-c RET: Open %s" url))))
(defvar-local ansi-osc-hyperlink--state nil)
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index bf9def681c3..978c07dfddc 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1075,7 +1075,7 @@ return nil. Otherwise point is returned."
(while (and (not found)
(not (eobp)))
(forward-line 1)
- (when-let ((descr (archive-get-descr t)))
+ (when-let* ((descr (archive-get-descr t)))
(when (equal (archive--file-desc-ext-file-name descr) file)
(setq found t))))
(if (not found)
@@ -1097,7 +1097,7 @@ return nil. Otherwise point is returned."
(beginning-of-line)
(bobp)))))
(archive-next-line n)
- (when-let ((descr (archive-get-descr t)))
+ (when-let* ((descr (archive-get-descr t)))
(let ((candidate (archive--file-desc-ext-file-name descr))
(buffer (current-buffer)))
(when (and candidate
diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el
index dd93d414d5e..08abcf6b572 100644
--- a/lisp/auth-source-pass.el
+++ b/lisp/auth-source-pass.el
@@ -88,7 +88,7 @@ HOST, USER, PORT, REQUIRE, and MAX."
(auth-source-pass-extra-query-keywords
(auth-source-pass--build-result-many host port user require max))
(t
- (when-let ((result (auth-source-pass--build-result host port user)))
+ (when-let* ((result (auth-source-pass--build-result host port user)))
(list result)))))
(defun auth-source-pass--build-result (hosts port user)
@@ -220,7 +220,7 @@ CONTENTS is the contents of a password-store formatted
file."
(let ((lines (cdr (split-string contents "\n" t "[ \t]+"))))
(seq-remove #'null
(mapcar (lambda (line)
- (when-let ((pos (seq-position line ?:)))
+ (when-let* ((pos (seq-position line ?:)))
(cons (string-trim (substring line 0 pos))
(string-trim (substring line (1+ pos))))))
lines))))
@@ -291,7 +291,7 @@ HOSTS can be a string or a list of strings."
(dolist (user (or users (list u)))
(dolist (port (or ports (list p)))
(dolist (e entries)
- (when-let
+ (when-let*
((m (or (gethash e seen) (auth-source-pass--retrieve-parsed
seen e (integerp port))))
((equal host (plist-get m :host)))
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 94082df4502..8ffe7f07cee 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -643,10 +643,10 @@ will use an up-to-date value of `auto-revert-interval'."
(defun auto-revert-notify-rm-watch ()
"Disable file notification for current buffer's associated file."
- (when-let ((desc
- ;; Don't disable notifications if this is an indirect buffer.
- (and (null (buffer-base-buffer))
- auto-revert-notify-watch-descriptor)))
+ (when-let* ((desc
+ ;; Don't disable notifications if this is an indirect buffer.
+ (and (null (buffer-base-buffer))
+ auto-revert-notify-watch-descriptor)))
(setq auto-revert--buffer-by-watch-descriptor
(assoc-delete-all desc auto-revert--buffer-by-watch-descriptor))
(ignore-errors
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 9bd15dde59d..6c617566cd7 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -480,7 +480,7 @@ When called interactively prompt for MARK; RET remove all
marks."
(save-excursion
(goto-char (point-min))
(while (not (eobp))
- (when-let ((entry (tabulated-list-get-entry)))
+ (when-let* ((entry (tabulated-list-get-entry)))
(let ((xmarks (list (aref entry 0) (aref entry 2))))
(when (or (char-equal mark ?\r)
(member (char-to-string mark) xmarks))
@@ -891,7 +891,7 @@ See more at `Buffer-menu-filter-predicate'."
(declare-function project-root "project" (project))
(defun Buffer-menu-group-by-root (entry)
(with-current-buffer (car entry)
- (if-let ((project (project-current)))
+ (if-let* ((project (project-current)))
(project-root project)
default-directory)))
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index f6fc7a8c162..e6d8b672413 100644
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -214,7 +214,7 @@ This function is like `parse-time-string' except that it
returns
a Lisp timestamp when successful.
See `decode-time' for the meaning of FORM."
- (when-let ((time (parse-time-string date-string form)))
+ (when-let* ((time (parse-time-string date-string form)))
(encode-time time)))
(provide 'parse-time)
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 53256ba3a81..235e09d83c2 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -167,7 +167,7 @@ Optional argument FACE specifies the face to do the
highlighting."
(defun pulse-tick (colors stop-time)
(if (time-less-p nil stop-time)
- (when-let (color (elt colors pulse-momentary-iteration))
+ (when-let* ((color (elt colors pulse-momentary-iteration)))
(set-face-background 'pulse-highlight-face color)
(setq pulse-momentary-iteration (1+ pulse-momentary-iteration)))
(pulse-momentary-unhighlight)))
diff --git a/lisp/comint.el b/lisp/comint.el
index 4961c4e3226..4268fa8dad2 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -4111,7 +4111,7 @@ setting."
(font-lock-flush))
(defun comint--fontify-input-ppss-flush-indirect (beg &rest rest)
- (when-let ((buf (comint-indirect-buffer t)))
+ (when-let* ((buf (comint-indirect-buffer t)))
(with-current-buffer buf
(when (memq #'syntax-ppss-flush-cache before-change-functions)
(apply #'syntax-ppss-flush-cache beg rest)))))
@@ -4170,7 +4170,7 @@ function called, or nil, if no function was called (if
BEG = END)."
(text-property-not-all beg1 end 'field 'output)
(text-property-any beg1 end 'field 'output))
end))
- (when-let ((fun (if is-output fun-output fun-input)))
+ (when-let* ((fun (if is-output fun-output fun-input)))
(save-restriction
(let ((beg2 beg1)
(end2 end1))
diff --git a/lisp/completion-preview.el b/lisp/completion-preview.el
index d379b3a1fa6..4564812e8a9 100644
--- a/lisp/completion-preview.el
+++ b/lisp/completion-preview.el
@@ -380,11 +380,11 @@ candidates or if there are multiple matching completions
and
(prefix (substring string base)))
(when last
(setcdr last nil)
- (when-let ((sorted (funcall sort-fn
- (delete prefix (all-completions prefix
all))))
- (common (try-completion prefix sorted))
- (lencom (length common))
- (suffixes sorted))
+ (when-let* ((sorted (funcall sort-fn
+ (delete prefix (all-completions prefix
all))))
+ (common (try-completion prefix sorted))
+ (lencom (length common))
+ (suffixes sorted))
(unless (and (cdr suffixes) completion-preview-exact-match-only)
;; Remove the common prefix from each candidate.
(while sorted
@@ -398,8 +398,8 @@ candidates or if there are multiple matching completions and
(and (consp res)
(not (functionp res))
(seq-let (beg end table &rest plist) res
- (or (when-let ((data (completion-preview--try-table
- table beg end plist)))
+ (or (when-let* ((data (completion-preview--try-table
+ table beg end plist)))
`(,(+ beg (length (car data))) ,end ,plist ,@data))
(unless (eq 'no (plist-get plist :exclusive))
;; Return non-nil to exclude other capfs.
@@ -411,7 +411,7 @@ candidates or if there are multiple matching completions and
(run-hook-wrapped
'completion-at-point-functions
#'completion-preview--capf-wrapper)
- (when-let ((suffix (car suffixes)))
+ (when-let* ((suffix (car suffixes)))
(set-text-properties 0 (length suffix)
(list 'face (if (cdr suffixes)
'completion-preview
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index b25dbad5919..8eba4270bcb 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1075,7 +1075,7 @@ even if it doesn't match the type.)
(defun setopt--set (variable value)
(custom-load-symbol variable)
;; Check that the type is correct.
- (when-let ((type (get variable 'custom-type)))
+ (when-let* ((type (get variable 'custom-type)))
(unless (widget-apply (widget-convert type) :match value)
(warn "Value `%S' for variable `%s' does not match its type \"%s\""
value variable type)))
@@ -5927,7 +5927,7 @@ The appropriate types are:
(defun custom-dirlocals-maybe-update-cons ()
"If focusing out from the first widget in a cons widget, update its value."
- (when-let ((w (widget-at)))
+ (when-let* ((w (widget-at)))
(when (widget-get w :custom-dirlocals-symbol)
(widget-value-set (widget-get w :parent)
(cons (widget-value w) ""))
@@ -6018,7 +6018,7 @@ Moves point into the widget that holds the value."
If at least an option doesn't validate, signals an error and moves point
to the widget with the invalid value."
(dolist (opt (custom-dirlocals-get-options))
- (when-let ((w (widget-apply opt :validate)))
+ (when-let* ((w (widget-apply opt :validate)))
(goto-char (widget-get w :from))
(error "%s" (widget-get w :error))))
t)
diff --git a/lisp/custom.el b/lisp/custom.el
index 1eb6bb7d64d..63d2eea4d94 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1362,7 +1362,7 @@ Return t if THEME was successfully loaded, nil otherwise."
t))))
(t
(error "Unable to load theme `%s'" theme))))
- (when-let ((obs (get theme 'byte-obsolete-info)))
+ (when-let* ((obs (get theme 'byte-obsolete-info)))
(display-warning 'initialization
(format "The `%s' theme is obsolete%s"
theme
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 524a6474cd4..1f8b79f5258 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -673,10 +673,10 @@ The character information includes:
(if display
(format "terminal code %s" display)
"not encodable for terminal"))))))
- ,@(when-let ((composition-name
- (and composition-string
- (eq (aref char-script-table char) 'emoji)
- (emoji-describe composition-string))))
+ ,@(when-let* ((composition-name
+ (and composition-string
+ (eq (aref char-script-table char) 'emoji)
+ (emoji-describe composition-string))))
(list (list "composition name" composition-name)))
,@(let ((face
(if (not (or disp-vector composition))
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 06f0bbb946e..3ca684efb49 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -699,7 +699,7 @@ DIRNAME omitted or nil means use `desktop-dirname'."
(defun desktop--emacs-pid-running-p (pid)
"Return non-nil if an Emacs process whose ID is PID might still be running."
- (when-let ((attr (process-attributes pid)))
+ (when-let* ((attr (process-attributes pid)))
(let ((proc-cmd (alist-get 'comm attr))
(my-cmd (file-name-nondirectory (car command-line-args)))
(case-fold-search t))
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 98cf09945da..1b78b2e2925 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -218,7 +218,7 @@ toggle between those two."
;;; Menu bindings
-(when-let ((menu (lookup-key dired-mode-map [menu-bar])))
+(when-let* ((menu (lookup-key dired-mode-map [menu-bar])))
(easy-menu-add-item menu '("Operate")
["Find Files" dired-do-find-marked-files
:help "Find current or marked files"]
diff --git a/lisp/dired.el b/lisp/dired.el
index 625de019d3b..f79a2220bea 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -861,7 +861,7 @@ Set it to nil for remote directories, which suffer from a
slow connection."
(if (not (connection-local-value dired-check-symlinks))
(search-forward-regexp
"\\(.+-> ?\\)\\(.+\\)" end t)
- (when-let ((file (dired-file-name-at-point)))
+ (when-let* ((file (dired-file-name-at-point)))
(let ((truename (ignore-errors (file-truename file))))
(and (or (not truename)
(not (file-directory-p truename)))
@@ -1741,11 +1741,11 @@ see `dired-use-ls-dired' for more details.")
(executable-find "sh")))
(switch (if remotep "-c" shell-command-switch)))
;; Enable globstar
- (when-let ((globstar dired-maybe-use-globstar)
- (enable-it
- (assoc-default
- (file-truename sh) dired-enable-globstar-in-shell
- (lambda (reg shell) (string-match reg shell)))))
+ (when-let* ((globstar dired-maybe-use-globstar)
+ (enable-it
+ (assoc-default
+ (file-truename sh) dired-enable-globstar-in-shell
+ (lambda (reg shell) (string-match reg shell)))))
(setq script (format "%s; %s" enable-it script)))
(unless
(zerop
@@ -1863,7 +1863,7 @@ see `dired-use-ls-dired' for more details.")
;; Replace "total" with "total used in directory" to
;; avoid confusion.
(replace-match "total used in directory" nil nil nil 1))
- (if-let ((available (get-free-disk-space file)))
+ (if-let* ((available (get-free-disk-space file)))
(cond
((eq dired-free-space 'separate)
(end-of-line)
@@ -2803,7 +2803,7 @@ Keybindings:
(let ((point (window-point w)))
(save-excursion
(goto-char point)
- (if-let ((f (dired-get-filename nil t)))
+ (if-let* ((f (dired-get-filename nil t)))
`((dired-filename . ,f))
`((position . ,(point)))))))))
(setq-local window-point-context-use-function
@@ -2811,9 +2811,9 @@ Keybindings:
(with-current-buffer (window-buffer w)
(let ((point (window-point w)))
(save-excursion
- (if-let ((f (alist-get 'dired-filename context)))
+ (if-let* ((f (alist-get 'dired-filename context)))
(dired-goto-file f)
- (when-let ((p (alist-get 'position context)))
+ (when-let* ((p (alist-get 'position context)))
(goto-char p)))
(setq point (point)))
(set-window-point w point)))))
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 411f0d5774c..bf8d3908619 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -270,8 +270,8 @@ for it will be modified."
;; assigned their own handlers.
(dolist (leftover urls)
(setq return-value 'private)
- (if-let ((handler (browse-url-select-handler leftover
- 'internal)))
+ (if-let* ((handler (browse-url-select-handler leftover
+ 'internal)))
(funcall handler leftover action)
(dnd-insert-text window action leftover)))
(or return-value 'private))))
diff --git a/lisp/dom.el b/lisp/dom.el
index b329379fdc3..616778051bf 100644
--- a/lisp/dom.el
+++ b/lisp/dom.el
@@ -65,7 +65,7 @@
(defun dom-remove-attribute (node attribute)
"Remove ATTRIBUTE from NODE."
(setq node (dom-ensure-node node))
- (when-let ((old (assoc attribute (cadr node))))
+ (when-let* ((old (assoc attribute (cadr node))))
(setcar (cdr node) (delq old (cadr node)))))
(defmacro dom-attr (node attr)
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index d8dbfa62bf9..0a89a33cbc3 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -483,7 +483,7 @@ There can be multiple entries for the same NAME if it has
several aliases.")
`(,fn ,name . ,optimized-rest)))
((guard (when for-effect
- (if-let ((tmp (byte-opt--fget fn 'side-effect-free)))
+ (if-let* ((tmp (byte-opt--fget fn 'side-effect-free)))
(or byte-compile-delete-errors
(eq tmp 'error-free)))))
(byte-compile-log " %s called for effect; deleted" fn)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 29e7882c851..f058fc48cc7 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -5470,9 +5470,9 @@ FORM is used to provide location,
`bytecomp--cus-function' and
(setq byte-compile-current-group name))
;; Check :local
- (when-let ((val (and (eq fun 'custom-declare-variable)
- (plist-get keyword-args :local)))
- (_ (not (member val '(t 'permanent 'permanent-only)))))
+ (when-let* ((val (and (eq fun 'custom-declare-variable)
+ (plist-get keyword-args :local)))
+ (_ (not (member val '(t 'permanent 'permanent-only)))))
(bytecomp--cus-warn form ":local keyword does not accept %S" val))))
(byte-compile-normal-call form))
diff --git a/lisp/emacs-lisp/comp-common.el b/lisp/emacs-lisp/comp-common.el
index e9b94681a4b..78720949b67 100644
--- a/lisp/emacs-lisp/comp-common.el
+++ b/lisp/emacs-lisp/comp-common.el
@@ -510,13 +510,13 @@ comes from `comp-primitive-type-specifiers' or the
function type declaration
itself."
(let ((kind 'declared)
type-spec)
- (when-let ((res (assoc function comp-primitive-type-specifiers)))
+ (when-let* ((res (assoc function comp-primitive-type-specifiers)))
;; Declared primitive
(setf type-spec (cadr res)))
(let ((f (and (symbolp function)
(symbol-function function))))
(when (and f (null type-spec))
- (if-let ((delc-type (function-get function 'function-type)))
+ (if-let* ((delc-type (function-get function 'function-type)))
;; Declared Lisp function
(setf type-spec delc-type)
(when (native-comp-function-p f)
diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
index 3f70b42774f..e1350370750 100644
--- a/lisp/emacs-lisp/comp-cstr.el
+++ b/lisp/emacs-lisp/comp-cstr.el
@@ -89,10 +89,10 @@ Integer values are handled in the `range' slot.")
"Return all non built-in type names currently defined."
(let (res)
(mapatoms (lambda (x)
- (when-let ((class (cl-find-class x))
- ;; Ignore EIEIO classes as they can be
- ;; redefined at runtime.
- (gate (not (eq 'eieio--class (type-of class)))))
+ (when-let* ((class (cl-find-class x))
+ ;; Ignore EIEIO classes as they can be
+ ;; redefined at runtime.
+ (gate (not (eq 'eieio--class (type-of class)))))
(push x res)))
obarray)
res))
@@ -528,8 +528,8 @@ Return them as multiple value."
`(with-comp-cstr-accessors
(if (or (neg src1) (neg src2))
(setf (typeset ,dst) '(number))
- (when-let ((r1 (range ,src1))
- (r2 (range ,src2)))
+ (when-let* ((r1 (range ,src1))
+ (r2 (range ,src2)))
(let* ((l1 (comp-cstr-smallest-in-range r1))
(l2 (comp-cstr-smallest-in-range r2))
(h1 (comp-cstr-greatest-in-range r1))
@@ -620,7 +620,7 @@ DST is returned."
;; Check first if we are in the simple case of all input non-negate
;; or negated so we don't have to cons.
- (when-let ((res (comp--cstrs-homogeneous srcs)))
+ (when-let* ((res (comp--cstrs-homogeneous srcs)))
(apply #'comp--cstr-union-homogeneous range dst srcs)
(cl-return-from comp--cstr-union-1-no-mem dst))
@@ -805,7 +805,7 @@ Non memoized version of `comp-cstr-intersection-no-mem'."
(range dst) ()
(neg dst) nil)
(cl-return-from comp-cstr-intersection-no-mem
dst)))
- (when-let ((res (comp--cstrs-homogeneous srcs)))
+ (when-let* ((res (comp--cstrs-homogeneous srcs)))
(if (eq res 'neg)
(apply #'comp--cstr-union-homogeneous t dst srcs)
(apply #'comp-cstr-intersection-homogeneous dst srcs))
@@ -917,7 +917,7 @@ Non memoized version of `comp-cstr-intersection-no-mem'."
(when (and (null (neg cstr))
(null (valset cstr))
(null (typeset cstr)))
- (when-let (range (range cstr))
+ (when-let* ((range (range cstr)))
(let* ((low (caar range))
(high (cdar (last range))))
(unless (or (eq low '-)
@@ -949,7 +949,7 @@ Non memoized version of `comp-cstr-intersection-no-mem'."
(or (null (typeset cstr))
(equal (typeset cstr) '(integer)))))))
(t
- (if-let ((pred (get type 'cl-deftype-satisfies)))
+ (if-let* ((pred (get type 'cl-deftype-satisfies)))
(and (null (range cstr))
(null (neg cstr))
(if (null (typeset cstr))
diff --git a/lisp/emacs-lisp/comp-run.el b/lisp/emacs-lisp/comp-run.el
index 3c7802c2ee0..b4f8b46b93a 100644
--- a/lisp/emacs-lisp/comp-run.el
+++ b/lisp/emacs-lisp/comp-run.el
@@ -370,8 +370,8 @@ Return the trampoline if found or nil otherwise."
(memq subr-name native-comp-never-optimize-functions)
(gethash subr-name comp-installed-trampolines-h))
(cl-assert (subr-primitive-p subr))
- (when-let ((trampoline (or (comp--trampoline-search subr-name)
- (comp-trampoline-compile subr-name))))
+ (when-let* ((trampoline (or (comp--trampoline-search subr-name)
+ (comp-trampoline-compile subr-name))))
(comp--install-trampoline subr-name trampoline)))))
;;;###autoload
@@ -423,7 +423,7 @@ bytecode definition was not changed in the meantime)."
(t (signal 'native-compiler-error
(list "Not a file nor directory" file-or-dir)))))
(dolist (file file-list)
- (if-let ((entry (seq-find (lambda (x) (string= file (car x)))
comp-files-queue)))
+ (if-let* ((entry (seq-find (lambda (x) (string= file (car x)))
comp-files-queue)))
;; Most likely the byte-compiler has requested a deferred
;; compilation, so update `comp-files-queue' to reflect that.
(unless (or (null load)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 96341b0a39f..da351e99d91 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -201,9 +201,9 @@ Useful to hook into pass checkers.")
"Given FUNCTION return the corresponding `comp-constraint'."
(when (symbolp function)
(or (gethash function comp-primitive-func-cstr-h)
- (when-let ((type (or (when-let ((f (comp--symbol-func-to-fun
function)))
- (comp-func-declared-type f))
- (function-get function 'function-type))))
+ (when-let* ((type (or (when-let* ((f (comp--symbol-func-to-fun
function)))
+ (comp-func-declared-type f))
+ (function-get function 'function-type))))
(comp-type-spec-to-cstr type)))))
;; Keep it in sync with the `cl-deftype-satisfies' property set in
@@ -617,7 +617,7 @@ In use by the back-end."
(defun comp--function-pure-p (f)
"Return t if F is pure."
(or (get f 'pure)
- (when-let ((func (comp--symbol-func-to-fun f)))
+ (when-let* ((func (comp--symbol-func-to-fun f)))
(comp-func-pure func))))
(defun comp--alloc-class-to-container (alloc-class)
@@ -819,7 +819,7 @@ clashes."
(defun comp--intern-func-in-ctxt (_ obj)
"Given OBJ of type `byte-to-native-lambda', create a function in
`comp-ctxt'."
- (when-let ((byte-func (byte-to-native-lambda-byte-func obj)))
+ (when-let* ((byte-func (byte-to-native-lambda-byte-func obj)))
(let* ((lap (byte-to-native-lambda-lap obj))
(top-l-form (cl-loop
for form in (comp-ctxt-top-level-forms comp-ctxt)
@@ -1705,7 +1705,7 @@ into the C code forwarding the compilation unit."
;; FIXME Actually we could have another hash for this.
(cl-flet ((pred (bb)
(equal (comp-block-lap-addr bb) addr)))
- (if-let ((pending (cl-find-if #'pred
+ (if-let* ((pending (cl-find-if #'pred
(comp-limplify-pending-blocks comp-pass))))
(comp-block-name pending)
(cl-loop for bb being the hash-value in (comp-func-blocks comp-func)
@@ -1882,9 +1882,9 @@ The assume is emitted at the beginning of the block BB."
rhs)))
(comp-block-insns bb))))
((pred comp--arithm-cmp-fun-p)
- (when-let ((kind (if negated
- (comp--negate-arithm-cmp-fun kind)
- kind)))
+ (when-let* ((kind (if negated
+ (comp--negate-arithm-cmp-fun kind)
+ kind)))
(push `(assume ,(make--comp-mvar :slot lhs-slot)
(,kind ,lhs
,(if-let* ((vld (comp-cstr-imm-vld-p rhs))
@@ -1900,10 +1900,10 @@ The assume is emitted at the beginning of the block BB."
(defun comp--maybe-add-vmvar (op cmp-res insns-seq)
"If CMP-RES is clobbering OP emit a new constrained mvar and return it.
Return OP otherwise."
- (if-let ((match (eql (comp-mvar-slot op) (comp-mvar-slot cmp-res)))
- (new-mvar (make--comp-mvar
- :slot
- (- (cl-incf (comp-func-vframe-size comp-func))))))
+ (if-let* ((match (eql (comp-mvar-slot op) (comp-mvar-slot cmp-res)))
+ (new-mvar (make--comp-mvar
+ :slot
+ (- (cl-incf (comp-func-vframe-size comp-func))))))
(progn
(push `(assume ,new-mvar ,op) (cdr insns-seq))
new-mvar)
@@ -2139,14 +2139,14 @@ TARGET-BB-SYM is the symbol name of the target block."
for bb being each hash-value of (comp-func-blocks comp-func)
do
(comp--loop-insn-in-block bb
- (when-let ((match
- (pcase insn
- (`(set ,lhs (,(pred comp--call-op-p) ,f . ,args))
- (when-let ((cstr-f (comp--get-function-cstr f)))
- (cl-values f cstr-f lhs args)))
- (`(,(pred comp--call-op-p) ,f . ,args)
- (when-let ((cstr-f (comp--get-function-cstr f)))
- (cl-values f cstr-f nil args))))))
+ (when-let* ((match
+ (pcase insn
+ (`(set ,lhs (,(pred comp--call-op-p) ,f . ,args))
+ (when-let* ((cstr-f (comp--get-function-cstr f)))
+ (cl-values f cstr-f lhs args)))
+ (`(,(pred comp--call-op-p) ,f . ,args)
+ (when-let* ((cstr-f (comp--get-function-cstr f)))
+ (cl-values f cstr-f nil args))))))
(cl-multiple-value-bind (f cstr-f lhs args) match
(cl-loop
with gen = (comp--lambda-list-gen (comp-cstr-f-args cstr-f))
@@ -2340,14 +2340,14 @@ blocks."
finger2 (comp-block-post-num b2))))
b1))
(first-processed (l)
- (if-let ((p (cl-find-if #'comp-block-idom l)))
+ (if-let* ((p (cl-find-if #'comp-block-idom l)))
p
(signal 'native-ice '("can't find first preprocessed")))))
- (when-let ((blocks (comp-func-blocks comp-func))
- (entry (gethash 'entry blocks))
- ;; No point to go on if the only bb is 'entry'.
- (bb0 (gethash 'bb_0 blocks)))
+ (when-let* ((blocks (comp-func-blocks comp-func))
+ (entry (gethash 'entry blocks))
+ ;; No point to go on if the only bb is 'entry'.
+ (bb0 (gethash 'bb_0 blocks)))
(cl-loop
with rev-bb-list = (comp--collect-rev-post-order entry)
with changed = t
@@ -2450,7 +2450,7 @@ blocks."
PRE-LAMBDA and POST-LAMBDA are called in pre or post-order if non-nil."
(when pre-lambda
(funcall pre-lambda bb))
- (when-let ((out-edges (comp-block-out-edges bb)))
+ (when-let* ((out-edges (comp-block-out-edges bb)))
(cl-loop for ed in out-edges
for child = (comp-edge-dst ed)
when (eq bb (comp-block-idom child))
@@ -2508,7 +2508,7 @@ PRE-LAMBDA and POST-LAMBDA are called in pre or
post-order if non-nil."
do (comp--ssa-rename-insn insn in-frame))
(setf (comp-block-final-frame bb)
(copy-sequence in-frame))
- (when-let ((out-edges (comp-block-out-edges bb)))
+ (when-let* ((out-edges (comp-block-out-edges bb)))
(cl-loop
for ed in out-edges
for child = (comp-edge-dst ed)
@@ -2668,7 +2668,7 @@ Return non-nil if the function is folded successfully."
;; should do basic block pruning in order to be sure that this
;; is not dead-code. This is now left to gcc, to be
;; implemented only if we want a reliable diagnostic here.
- (let* ((f (if-let (f-in-ctxt (comp--symbol-func-to-fun f))
+ (let* ((f (if-let* ((f-in-ctxt (comp--symbol-func-to-fun f)))
;; If the function is IN the compilation ctxt
;; and know to be pure.
(comp-func-byte-func f-in-ctxt)
@@ -2685,7 +2685,7 @@ Fold the call in case."
(comp-cstr-imm-vld-p (car args)))
(setf f (comp-cstr-imm (car args))
args (cdr args)))
- (when-let ((cstr-f (comp--get-function-cstr f)))
+ (when-let* ((cstr-f (comp--get-function-cstr f)))
(let ((cstr (comp-cstr-f-ret cstr-f)))
(when (comp-cstr-empty-p cstr)
;; Store it to be rewritten as non local exit.
@@ -2968,14 +2968,14 @@ FUNCTION can be a function-name or byte compiled
function."
do (comp--loop-insn-in-block b
(pcase insn
(`(set ,lval (callref funcall ,f . ,rest))
- (when-let ((ok (comp-cstr-imm-vld-p f))
- (new-form (comp--call-optim-form-call
- (comp-cstr-imm f) rest)))
+ (when-let* ((ok (comp-cstr-imm-vld-p f))
+ (new-form (comp--call-optim-form-call
+ (comp-cstr-imm f) rest)))
(setf insn `(set ,lval ,new-form))))
(`(callref funcall ,f . ,rest)
- (when-let ((ok (comp-cstr-imm-vld-p f))
- (new-form (comp--call-optim-form-call
- (comp-cstr-imm f) rest)))
+ (when-let* ((ok (comp-cstr-imm-vld-p f))
+ (new-form (comp--call-optim-form-call
+ (comp-cstr-imm f) rest)))
(setf insn new-form)))))))
(defun comp--call-optim (_)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index deebe5109bd..b96d2437b8a 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3922,8 +3922,8 @@ be installed in `emacs-lisp-mode-map'.")
(define-obsolete-variable-alias 'global-edebug-prefix
'edebug-global-prefix "28.1")
(defvar edebug-global-prefix
- (when-let ((binding
- (car (where-is-internal 'Control-X-prefix (list global-map)))))
+ (when-let* ((binding
+ (car (where-is-internal 'Control-X-prefix (list global-map)))))
(concat binding [?X]))
"Prefix key for global edebug commands, available from any buffer.")
@@ -4659,8 +4659,8 @@ instrumentation for, defaulting to all functions."
functions)))))
;; Remove instrumentation.
(dolist (symbol functions)
- (when-let ((unwrapped
- (edebug--unwrap*-symbol-function symbol)))
+ (when-let* ((unwrapped
+ (edebug--unwrap*-symbol-function symbol)))
(edebug--strip-plist symbol)
(defalias symbol unwrapped)))
(message "Removed edebug instrumentation from %s"
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 74f5e21db7d..98d9a2d2f4f 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -769,10 +769,10 @@ dynamically set from ARGS."
(let* ((slot (aref slots i))
(slot-name (eieio-slot-descriptor-name slot))
(initform (cl--slot-descriptor-initform slot)))
- (unless (or (when-let ((initarg
- (car (rassq slot-name
- (eieio--class-initarg-tuples
- this-class)))))
+ (unless (or (when-let* ((initarg
+ (car (rassq slot-name
+ (eieio--class-initarg-tuples
+ this-class)))))
(plist-get initargs initarg))
;; Those slots whose initform is constant already have
;; the right value set in the default-object.
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index cd60f9f457f..8469440c982 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -395,8 +395,8 @@ variable `ert-resource-directory-format'. Before
formatting, the
file name will be trimmed using `string-trim' with arguments
`ert-resource-directory-trim-left-regexp' and
`ert-resource-directory-trim-right-regexp'."
- `(when-let ((testfile ,(or (macroexp-file-name)
- buffer-file-name)))
+ `(when-let* ((testfile ,(or (macroexp-file-name)
+ buffer-file-name)))
(let ((default-directory (file-name-directory testfile)))
(file-truename
(if (file-accessible-directory-p "resources/")
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index fa1b7a60a90..97aa233f6e2 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -328,8 +328,8 @@ DATA is displayed to the user and should state the reason
for skipping."
(unless (eql ,value ',default-value)
(list :value ,value))
(unless (eql ,value ',default-value)
- (when-let ((-explainer-
- (ert--get-explainer ',fn-name)))
+ (when-let* ((-explainer-
+ (ert--get-explainer
',fn-name)))
(list :explanation
(apply -explainer- ,args)))))
value)
@@ -1352,10 +1352,10 @@ RESULT must be an `ert-test-result-with-condition'."
(defun ert-test-location (test)
"Return a string description the source location of TEST."
- (when-let ((loc
- (ignore-errors
- (find-function-search-for-symbol
- (ert-test-name test) 'ert-deftest (ert-test-file-name
test)))))
+ (when-let* ((loc
+ (ignore-errors
+ (find-function-search-for-symbol
+ (ert-test-name test) 'ert-deftest (ert-test-file-name
test)))))
(let* ((buffer (car loc))
(point (cdr loc))
(file (file-relative-name (buffer-file-name buffer)))
@@ -1548,11 +1548,11 @@ test packages depend on each other, it might be
helpful.")
"Write a JUnit test report, generated from STATS."
;;
https://www.ibm.com/docs/en/developer-for-zos/14.1.0?topic=formats-junit-xml-format
;; https://llg.cubic.org/docs/junit/
- (when-let ((symbol (car (apropos-internal "" #'ert-test-boundp)))
- (test-file (symbol-file symbol 'ert--test))
- (test-report
- (file-name-with-extension
- (or ert-load-file-name test-file) "xml")))
+ (when-let* ((symbol (car (apropos-internal "" #'ert-test-boundp)))
+ (test-file (symbol-file symbol 'ert--test))
+ (test-report
+ (file-name-with-extension
+ (or ert-load-file-name test-file) "xml")))
(with-temp-file test-report
(insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
(insert (format "<testsuites name=\"%s\" tests=\"%s\" errors=\"%s\"
failures=\"%s\" skipped=\"%s\" time=\"%s\">\n"
@@ -2906,10 +2906,10 @@ write erts files."
(setq end-before end-after
start-after start-before))
;; Update persistent specs.
- (when-let ((point-char (assq 'point-char specs)))
+ (when-let* ((point-char (assq 'point-char specs)))
(setq gen-specs
(map-insert gen-specs 'point-char (cdr point-char))))
- (when-let ((code (cdr (assq 'code specs))))
+ (when-let* ((code (cdr (assq 'code specs))))
(setq gen-specs
(map-insert gen-specs 'code (car (read-from-string code)))))
;; Get the "after" strings.
@@ -2917,12 +2917,12 @@ write erts files."
(insert-buffer-substring file-buffer start-after end-after)
(ert--erts-unquote)
;; Remove the newline at the end of the buffer.
- (when-let ((no-newline (cdr (assq 'no-after-newline specs))))
+ (when-let* ((no-newline (cdr (assq 'no-after-newline specs))))
(goto-char (point-min))
(when (re-search-forward "\n\\'" nil t)
(delete-region (match-beginning 0) (match-end 0))))
;; Get the expected "after" point.
- (when-let ((point-char (cdr (assq 'point-char gen-specs))))
+ (when-let* ((point-char (cdr (assq 'point-char gen-specs))))
(goto-char (point-min))
(when (search-forward point-char nil t)
(delete-region (match-beginning 0) (match-end 0))
@@ -2933,13 +2933,13 @@ write erts files."
(insert-buffer-substring file-buffer start-before end-before)
(ert--erts-unquote)
;; Remove the newline at the end of the buffer.
- (when-let ((no-newline (cdr (assq 'no-before-newline specs))))
+ (when-let* ((no-newline (cdr (assq 'no-before-newline specs))))
(goto-char (point-min))
(when (re-search-forward "\n\\'" nil t)
(delete-region (match-beginning 0) (match-end 0))))
(goto-char (point-min))
;; Place point in the specified place.
- (when-let ((point-char (cdr (assq 'point-char gen-specs))))
+ (when-let* ((point-char (cdr (assq 'point-char gen-specs))))
(when (search-forward point-char nil t)
(delete-region (match-beginning 0) (match-end 0))))
(let ((code (cdr (assq 'code gen-specs))))
diff --git a/lisp/emacs-lisp/icons.el b/lisp/emacs-lisp/icons.el
index 847ef53a1cb..144b60a2c1d 100644
--- a/lisp/emacs-lisp/icons.el
+++ b/lisp/emacs-lisp/icons.el
@@ -119,7 +119,7 @@ If OBJECT is an icon, return the icon properties."
(setq spec (icons--copy-spec spec))
;; Let the Customize theme override.
(unless inhibit-theme
- (when-let ((theme-spec (cadr (car (get icon 'theme-icon)))))
+ (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
@@ -149,15 +149,15 @@ If OBJECT is an icon, return the icon properties."
;; 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)))
+ (when-let* ((result
+ (icons--create type icon type-keywords)))
(throw 'found
- (if-let ((face (plist-get type-keywords :face)))
+ (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)))
+ (when-let* ((help (plist-get keywords :help-echo)))
(setq icon-string (propertize icon-string 'help-echo help)))
(propertize icon-string 'rear-nonsticky t)))))
@@ -200,18 +200,18 @@ present if the icon is represented by an image."
" " 'display
(let ((props
(append
- (if-let ((height (plist-get keywords :height)))
+ (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)))
+ (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)))
+ (if-let* ((rotation (plist-get keywords :rotation)))
(list :rotation rotation))
- (if-let ((margin (plist-get keywords :margin)))
+ (if-let* ((margin (plist-get keywords :margin)))
(list :margin margin))
(list :ascent (if (plist-member keywords :ascent)
(plist-get keywords :ascent)
@@ -219,10 +219,10 @@ present if the icon is represented by an image."
(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 ?🟠)))))
+ (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)))
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 601cc7bf712..220bb5175ea 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1153,7 +1153,7 @@ is the buffer position of the start of the containing
expression."
(defun lisp--local-defform-body-p (state)
"Return non-nil when at local definition body according to STATE.
STATE is the `parse-partial-sexp' state for current position."
- (when-let ((start-of-innermost-containing-list (nth 1 state)))
+ (when-let* ((start-of-innermost-containing-list (nth 1 state)))
(let* ((parents (nth 9 state))
(first-cons-after (cdr parents))
(second-cons-after (cdr first-cons-after))
@@ -1171,11 +1171,11 @@ STATE is the `parse-partial-sexp' state for current
position."
(let (local-definitions-starting-point)
(and (save-excursion
(goto-char (1+ second-order-parent))
- (when-let ((head (ignore-errors
- ;; FIXME: This does not distinguish
- ;; between reading nil and a read error.
- ;; We don't care but still, better fix
this.
- (read (current-buffer)))))
+ (when-let* ((head (ignore-errors
+ ;; FIXME: This does not distinguish
+ ;; between reading nil and a read error.
+ ;; We don't care but still, better fix
this.
+ (read (current-buffer)))))
(when (memq head '( cl-flet cl-labels cl-macrolet cl-flet*
cl-symbol-macrolet))
;; In what follows, we rely on (point) returning non-nil.
diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 50e90cdf94c..1ac7aecdb66 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -295,7 +295,7 @@ expression, in which case we want to handle forms
differently."
(null (plist-get props :set))
(error nil)))
;; Propagate the :safe property to the loaddefs file.
- ,@(when-let ((safe (plist-get props :safe)))
+ ,@(when-let* ((safe (plist-get props :safe)))
`((put ',varname 'safe-local-variable ,safe))))))
;; Extract theme properties.
@@ -413,8 +413,8 @@ don't include."
(save-excursion
;; Since we're "open-coding", we have to repeat more
;; complicated logic in `hack-local-variables'.
- (when-let ((beg
- (re-search-forward "read-symbol-shorthands: *" nil t)))
+ (when-let* ((beg
+ (re-search-forward "read-symbol-shorthands: *" nil t)))
;; `read-symbol-shorthands' alist ends with two parens.
(let* ((end (re-search-forward ")[;\n\s]*)"))
(commentless (replace-regexp-in-string
@@ -499,7 +499,7 @@ don't include."
(when (and autoload-compute-prefixes
compute-prefixes)
(with-demoted-errors "%S"
- (when-let
+ (when-let*
((form (loaddefs-generate--compute-prefixes load-name)))
;; This output needs to always go in the main loaddefs.el,
;; regardless of `generated-autoload-file'.
diff --git a/lisp/emacs-lisp/multisession.el b/lisp/emacs-lisp/multisession.el
index c923c29bbf7..71be928e30f 100644
--- a/lisp/emacs-lisp/multisession.el
+++ b/lisp/emacs-lisp/multisession.el
@@ -428,8 +428,8 @@ storage method to list."
(tabulated-list-print t)
(goto-char (point-min))
(when id
- (when-let ((match
- (text-property-search-forward 'tabulated-list-id id t)))
+ (when-let* ((match
+ (text-property-search-forward 'tabulated-list-id id t)))
(goto-char (prop-match-beginning match))))))
(defun multisession-delete-value (id)
@@ -456,7 +456,7 @@ storage method to list."
(let* ((object (or
;; If the multisession variable already exists, use
;; it (so that we update it).
- (if-let (sym (intern-soft (cdr id)))
+ (if-let* ((sym (intern-soft (cdr id))))
(and (boundp sym) (symbol-value sym))
nil)
;; Create a new object.
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index e168096e153..894bc9c8c37 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -247,8 +247,8 @@ This function is meant to be used as a hook for
`package-read-archive-hook'."
(car spec)))
(setf (alist-get (intern archive) package-vc--archive-data-alist)
(cdr spec))
- (when-let ((default-vc (plist-get (cdr spec) :default-vc))
- ((not (memq default-vc vc-handled-backends))))
+ (when-let* ((default-vc (plist-get (cdr spec) :default-vc))
+ ((not (memq default-vc vc-handled-backends))))
(warn "Archive `%S' expects missing VC backend %S"
archive (plist-get (cdr spec) :default-vc)))))))))
@@ -279,7 +279,7 @@ asynchronously."
(defun package-vc--version (pkg)
"Return the version number for the VC package PKG."
(cl-assert (package-vc-p pkg))
- (if-let ((main-file (package-vc--main-file pkg)))
+ (if-let* ((main-file (package-vc--main-file pkg)))
(with-temp-buffer
(insert-file-contents main-file)
(package-strip-rcs-id
@@ -663,7 +663,7 @@ attribute in PKG-SPEC."
;; Check out the latest release if requested
(when (eq rev :last-release)
- (if-let ((release-rev (package-vc--release-rev pkg-desc)))
+ (if-let* ((release-rev (package-vc--release-rev pkg-desc)))
(vc-retrieve-tag dir release-rev)
(message "No release revision was found, continuing...")))))
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 90d6150ed0b..af07ba44e28 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -858,22 +858,22 @@ byte-compilation of the new package to fail."
(cl-remove-if-not #'stringp
(mapcar #'car load-history)))))
(dolist (file files)
- (when-let ((library (package--library-stem
- (file-relative-name file dir)))
- (canonical (locate-library library nil effective-path))
- (truename (file-truename canonical))
- ;; Normally, all files in a package are compiled by
- ;; now, but don't assume that. E.g. different
- ;; versions can add or remove `no-byte-compile'.
- (altname (if (string-suffix-p ".el" truename)
- (replace-regexp-in-string
- "\\.el\\'" ".elc" truename t)
- (replace-regexp-in-string
- "\\.elc\\'" ".el" truename t)))
- (found (or (member truename history)
- (and (not (string= altname truename))
- (member altname history))))
- (recent-index (length found)))
+ (when-let* ((library (package--library-stem
+ (file-relative-name file dir)))
+ (canonical (locate-library library nil effective-path))
+ (truename (file-truename canonical))
+ ;; Normally, all files in a package are compiled by
+ ;; now, but don't assume that. E.g. different
+ ;; versions can add or remove `no-byte-compile'.
+ (altname (if (string-suffix-p ".el" truename)
+ (replace-regexp-in-string
+ "\\.el\\'" ".elc" truename t)
+ (replace-regexp-in-string
+ "\\.elc\\'" ".el" truename t)))
+ (found (or (member truename history)
+ (and (not (string= altname truename))
+ (member altname history))))
+ (recent-index (length found)))
(unless (equal (file-name-base library)
(format "%s-autoloads" (package-desc-name pkg-desc)))
(push (cons (expand-file-name library dir) recent-index) result))))
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 12346b3d285..e246e4211bb 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -491,8 +491,8 @@ the bounds of a region containing Lisp code to
pretty-print."
(cons (cond
((consp (cdr sexp))
(let ((head (car sexp)))
- (if-let (((null (cddr sexp)))
- (syntax-entry (assq head pp--quoting-syntaxes)))
+ (if-let* (((null (cddr sexp)))
+ (syntax-entry (assq head pp--quoting-syntaxes)))
(progn
(insert (cdr syntax-entry))
(pp--insert-lisp (cadr sexp)))
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 3b4907b8f43..2427d76734e 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -475,7 +475,7 @@ this defaults to the current buffer."
(t
disp)))
;; Remove any old instances.
- (when-let ((old (assoc prop disp)))
+ (when-let* ((old (assoc prop disp)))
(setq disp (delete old disp)))
(setq disp (cons (list prop value) disp))
(when vector
diff --git a/lisp/emacs-lisp/tabulated-list.el
b/lisp/emacs-lisp/tabulated-list.el
index 30397137efb..eaf3c5cb561 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -492,8 +492,8 @@ changing `tabulated-list-sort-key'."
(if groups
(dolist (group groups)
(insert (car group) ?\n)
- (when-let ((saved-pt-new (tabulated-list-print-entries
- (cdr group) sorter update entry-id)))
+ (when-let* ((saved-pt-new (tabulated-list-print-entries
+ (cdr group) sorter update entry-id)))
(setq saved-pt saved-pt-new)))
(setq saved-pt (tabulated-list-print-entries
entries sorter update entry-id)))
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index f6f2a8d87c0..166755e4dcc 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -407,7 +407,7 @@ This function returns a timer object which you can use in
;; Handle relative times like "2 hours 35 minutes".
(when (stringp time)
- (when-let ((secs (timer-duration time)))
+ (when-let* ((secs (timer-duration time)))
(setq time (timer-relative-time nil secs))))
;; Handle "11:23pm" and the like. Interpret it as meaning today
diff --git a/lisp/emacs-lisp/vtable.el b/lisp/emacs-lisp/vtable.el
index d58c6894c16..925961f012c 100644
--- a/lisp/emacs-lisp/vtable.el
+++ b/lisp/emacs-lisp/vtable.el
@@ -271,7 +271,7 @@ If TABLE is found, return the position of the start of the
table.
If it can't be found, return nil and don't move point."
(let ((start (point)))
(goto-char (point-min))
- (if-let ((match (text-property-search-forward 'vtable table t)))
+ (if-let* ((match (text-property-search-forward 'vtable table t)))
(goto-char (prop-match-beginning match))
(goto-char start)
nil)))
@@ -279,7 +279,7 @@ If it can't be found, return nil and don't move point."
(defun vtable-goto-column (column)
"Go to COLUMN on the current line."
(beginning-of-line)
- (if-let ((match (text-property-search-forward 'vtable-column column t)))
+ (if-let* ((match (text-property-search-forward 'vtable-column column t)))
(goto-char (prop-match-beginning match))
(end-of-line)))
@@ -311,10 +311,10 @@ is signaled."
;; FIXME: If the table's buffer has no visible window, or if its
;; width has changed since the table was updated, the cache key will
;; not match and the object can't be updated. (Bug #69837).
- (if-let ((line-number (seq-position (car (vtable--cache table)) old-object
- (lambda (a b)
- (equal (car a) b))))
- (line (elt (car (vtable--cache table)) line-number)))
+ (if-let* ((line-number (seq-position (car (vtable--cache table)) old-object
+ (lambda (a b)
+ (equal (car a) b))))
+ (line (elt (car (vtable--cache table)) line-number)))
(progn
(setcar line object)
(setcdr line (vtable--compute-cached-line table object))
@@ -638,7 +638,7 @@ This also updates the displayed table."
(insert "\n")
(put-text-property start (point) 'vtable-object (car line))
(unless column-colors
- (when-let ((row-colors (slot-value table '-cached-colors)))
+ (when-let* ((row-colors (slot-value table '-cached-colors)))
(add-face-text-property
start (point)
(elt row-colors (mod line-number (length row-colors))))))))
@@ -865,13 +865,13 @@ If NEXT, do the next column."
(nth 1 (elt (cdr elem) index)))
cache)))))
;; Let min-width/max-width specs have their say.
- (when-let ((min-width (and (vtable-column-min-width column)
- (vtable--compute-width
- table (vtable-column-min-width column)))))
+ (when-let* ((min-width (and (vtable-column-min-width column)
+ (vtable--compute-width
+ table (vtable-column-min-width column)))))
(setq width (max width min-width)))
- (when-let ((max-width (and (vtable-column-max-width column)
- (vtable--compute-width
- table (vtable-column-max-width column)))))
+ (when-let* ((max-width (and (vtable-column-max-width column)
+ (vtable--compute-width
+ table (vtable-column-max-width column)))))
(setq width (min width max-width)))
width))
(vtable-columns table))
@@ -904,7 +904,7 @@ If NEXT, do the next column."
(vtable-keymap table))
(copy-keymap vtable-map)
vtable-map)))
- (when-let ((actions (vtable-actions table)))
+ (when-let* ((actions (vtable-actions table)))
(while actions
(funcall (lambda (key binding)
(keymap-set map key
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 68db33bfa68..b11e1ebeb70 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -285,7 +285,7 @@ entirely by setting `warning-suppress-types' or
(unless buffer-name
(setq buffer-name "*Warnings*"))
(with-suppressed-warnings ((obsolete warning-level-aliases))
- (when-let ((new (cdr (assq level warning-level-aliases))))
+ (when-let* ((new (cdr (assq level warning-level-aliases))))
(warn "Warning level `%s' is obsolete; use `%s' instead" level new)
(setq level new)))
(or (< (warning-numeric-level level)
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 90cc91e99a0..ee0a665aa62 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -177,7 +177,7 @@ encryption is used."
(nth 3 error)))
(let ((exists (file-exists-p local-file)))
(when exists
- (if-let ((wrong-password (epa--wrong-password-p context)))
+ (if-let* ((wrong-password (epa--wrong-password-p context)))
;; Don't display the *error* buffer if we just
;; have a wrong password; let the later error
;; handler notify the user.
diff --git a/lisp/epa.el b/lisp/epa.el
index c29df18bb58..e7856f8463b 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -498,7 +498,7 @@ If SECRET is non-nil, list secret keys instead of public
keys."
(defun epa-show-key ()
"Show a key on the current line."
(interactive)
- (if-let ((key (get-text-property (point) 'epa-key)))
+ (if-let* ((key (get-text-property (point) 'epa-key)))
(save-selected-window
(epa--show-key key))
(error "No key on this line")))
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 16e8cae4733..e72fa036f17 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -605,7 +605,7 @@ escape hatch for inhibiting their transmission.")
(concat "Unbreakable line encountered "
"(Recover input with \\[erc-previous-command])"))))
(goto-char upper))
- (when-let ((cmp (find-composition (point) (1+ (point)))))
+ (when-let* ((cmp (find-composition (point) (1+ (point)))))
(if (= (car cmp) (point-min))
(goto-char (nth 1 cmp))
(goto-char (car cmp)))))
@@ -1057,9 +1057,9 @@ Conditionally try to reconnect and take appropriate
action."
(setq erc--hidden-prompt-overlay nil)))
(cl-defmethod erc--conceal-prompt ()
- (when-let (((null erc--hidden-prompt-overlay))
- (ov (make-overlay erc-insert-marker (1- erc-input-marker)
- nil 'front-advance)))
+ (when-let* (((null erc--hidden-prompt-overlay))
+ (ov (make-overlay erc-insert-marker (1- erc-input-marker)
+ nil 'front-advance)))
(defvar erc-prompt-hidden)
(overlay-put ov 'display erc-prompt-hidden)
(setq erc--hidden-prompt-overlay ov)))
@@ -2078,12 +2078,12 @@ like `erc-insert-modify-hook'.")
(defvar erc-receive-query-display)
(defvar erc-receive-query-display-defer)
(if privp
- (when-let ((erc-join-buffer
- (or (and (not erc-receive-query-display-defer)
- erc-receive-query-display)
- (and erc-ensure-target-buffer-on-privmsg
- (or erc-receive-query-display
- erc-join-buffer)))))
+ (when-let* ((erc-join-buffer
+ (or (and (not erc-receive-query-display-defer)
+ erc-receive-query-display)
+ (and erc-ensure-target-buffer-on-privmsg
+ (or erc-receive-query-display
+ erc-join-buffer)))))
(push `(erc-receive-query-display . ,(intern cmd))
erc--display-context)
(setq buffer (erc--open-target nick)))
@@ -2262,12 +2262,12 @@ primitive value."
(if-let* ((table (or erc--isupport-params
(erc-with-server-buffer erc--isupport-params)))
(value (with-memoization (gethash key table)
- (when-let ((v (assoc (symbol-name key)
- (or erc-server-parameters
- (erc-with-server-buffer
+ (when-let* ((v (assoc (symbol-name key)
+ (or erc-server-parameters
+ (erc-with-server-buffer
erc-server-parameters)))))
- (if-let ((val (cdr v))
- ((not (string-empty-p val))))
+ (if-let* ((val (cdr v))
+ ((not (string-empty-p val))))
(erc--parse-isupport-value val)
'--empty--)))))
(pcase value
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index c158b443b89..b4a94321947 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -462,18 +462,18 @@ retrieve it during buttonizing via
(defun erc-button-add-nickname-buttons (entry)
"Search through the buffer for nicknames, and add buttons."
- (when-let ((form (nth 2 entry))
- ;; Spoof `form' slot of default legacy `nicknames' entry
- ;; so `erc-button--extract-form' sees a function value.
- (form (let ((erc-button-buttonize-nicks
- (and erc-button-buttonize-nicks
- erc-button--modify-nick-function)))
- (erc-button--extract-form form)))
- (oncep (if-let ((erc-button-highlight-nick-once)
- (c (erc--check-msg-prop 'erc--cmd))
- ((memq c erc-button-highlight-nick-once)))
- 1 0))
- (seen 0))
+ (when-let* ((form (nth 2 entry))
+ ;; Spoof `form' slot of default legacy `nicknames' entry
+ ;; so `erc-button--extract-form' sees a function value.
+ (form (let ((erc-button-buttonize-nicks
+ (and erc-button-buttonize-nicks
+ erc-button--modify-nick-function)))
+ (erc-button--extract-form form)))
+ (oncep (if-let* ((erc-button-highlight-nick-once)
+ (c (erc--check-msg-prop 'erc--cmd))
+ ((memq c erc-button-highlight-nick-once)))
+ 1 0))
+ (seen 0))
(goto-char (point-min))
(while-let
(((or (zerop seen) (zerop oncep)))
@@ -665,14 +665,14 @@ greater than `point-min' with a text property of
`erc-callback'.")
(p start))
(while (progn
;; Break out of current search context.
- (when-let ((low (max (point-min) (1- (pos-bol))))
- (high (min (point-max) (1+ (pos-eol))))
- (prop (get-text-property p 'erc-callback))
- (q (if nextp
- (text-property-not-all p high
- 'erc-callback prop)
- (funcall search-fn p 'erc-callback nil low)))
- ((< low q high)))
+ (when-let* ((low (max (point-min) (1- (pos-bol))))
+ (high (min (point-max) (1+ (pos-eol))))
+ (prop (get-text-property p 'erc-callback))
+ (q (if nextp
+ (text-property-not-all p high
+ 'erc-callback prop)
+ (funcall search-fn p 'erc-callback nil low)))
+ ((< low q high)))
(setq p q))
;; Assume that buttons occur frequently enough that
;; omitting LIMIT is acceptable.
diff --git a/lisp/erc/erc-common.el b/lisp/erc/erc-common.el
index 057e7981515..9bb3f650b9b 100644
--- a/lisp/erc/erc-common.el
+++ b/lisp/erc/erc-common.el
@@ -267,9 +267,9 @@ instead of a `set' state, which precludes any actual
saving."
(rassq known custom-current-group-alist)))
(throw 'found known))
(when (setq known (intern-soft (concat "erc-" downed "-mode")))
- (when-let ((found (custom-group-of-mode known)))
+ (when-let* ((found (custom-group-of-mode known)))
(throw 'found found))))
- (when-let ((found (get (erc--normalize-module-symbol s) 'erc-group)))
+ (when-let* ((found (get (erc--normalize-module-symbol s) 'erc-group)))
(throw 'found found)))
'erc))
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 1e81adbf6ba..13f1dbf266c 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -172,8 +172,8 @@ You can put this on `erc-insert-modify-hook' and/or
`erc-send-modify-hook'."
(save-restriction
(narrow-to-region (point) (point-max))
(funcall (or erc-fill--function erc-fill-function))
- (when-let ((erc-fill-line-spacing)
- (p (point-min)))
+ (when-let* ((erc-fill-line-spacing)
+ (p (point-min)))
(widen)
(when (or (erc--check-msg-prop 'erc--spkr)
(save-excursion
@@ -186,9 +186,9 @@ You can put this on `erc-insert-modify-hook' and/or
`erc-send-modify-hook'."
"Fills a text such that messages start at column `erc-fill-static-center'."
(save-restriction
(goto-char (point-min))
- (when-let (((looking-at "^\\(\\S-+\\)"))
- ((not (erc--check-msg-prop 'erc--msg 'datestamp)))
- (nick (match-string 1)))
+ (when-let* (((looking-at "^\\(\\S-+\\)"))
+ ((not (erc--check-msg-prop 'erc--msg 'datestamp)))
+ (nick (match-string 1)))
(progn
(let ((fill-column (- erc-fill-column (erc-timestamp-offset)))
(fill-prefix (make-string erc-fill-static-center 32)))
@@ -322,13 +322,13 @@ command."
"Move to start of message text when left of speaker.
Basically mimic what `move-beginning-of-line' does with invisible text.
Stay put if OLD-POINT lies within hidden region."
- (when-let ((erc-fill-wrap-merge)
- (prop (get-text-property (point) 'erc-fill--wrap-merge))
- ((or (member prop '("" t))
- (eq 'margin (car-safe (car-safe prop)))))
- (end (text-property-not-all (point) (pos-eol)
- 'erc-fill--wrap-merge prop))
- ((or (null old-point) (>= old-point end))))
+ (when-let* ((erc-fill-wrap-merge)
+ (prop (get-text-property (point) 'erc-fill--wrap-merge))
+ ((or (member prop '("" t))
+ (eq 'margin (car-safe (car-safe prop)))))
+ (end (text-property-not-all (point) (pos-eol)
+ 'erc-fill--wrap-merge prop))
+ ((or (null old-point) (>= old-point end))))
(goto-char end)))
(defun erc-fill--wrap-beginning-of-line (arg)
@@ -672,10 +672,10 @@ Also cover region with text prop `erc-fill--wrap-merge'
set to t."
(let ((next-beg (point-max)))
(save-restriction
(widen)
- (when-let (((get-text-property next-beg 'erc-fill--wrap-merge))
- (end (erc--get-inserted-msg-bounds next-beg))
- (beg (pop end))
- (erc-fill--wrap-continued-predicate #'ignore))
+ (when-let* (((get-text-property next-beg 'erc-fill--wrap-merge))
+ (end (erc--get-inserted-msg-bounds next-beg))
+ (beg (pop end))
+ (erc-fill--wrap-continued-predicate #'ignore))
(erc-fill--wrap-rejigger-region (1- beg) (1+ end) nil 'repairp))))))
(defun erc-fill--wrap-massage-initial-message-post-clear (beg end)
@@ -684,14 +684,14 @@ Also cover region with text prop `erc-fill--wrap-merge'
set to t."
(erc-stamp--redo-right-stamp-post-clear beg end)
;; With other non-date stamp-insertion functions, remove hidden
;; speaker continuation on first spoken message in buffer.
- (when-let (((< end (1- erc-insert-marker)))
- (next (text-property-not-all end (min erc-insert-marker
- (+ 4096 end))
- 'erc--msg nil))
- (bounds (erc--get-inserted-msg-bounds next))
- (found (text-property-not-all (car bounds) (cdr bounds)
- 'erc-fill--wrap-merge nil))
- (erc-fill--wrap-continued-predicate #'ignore))
+ (when-let* (((< end (1- erc-insert-marker)))
+ (next (text-property-not-all end (min erc-insert-marker
+ (+ 4096 end))
+ 'erc--msg nil))
+ (bounds (erc--get-inserted-msg-bounds next))
+ (found (text-property-not-all (car bounds) (cdr bounds)
+ 'erc-fill--wrap-merge nil))
+ (erc-fill--wrap-continued-predicate #'ignore))
(erc-fill--wrap-rejigger-region (max (1- (car bounds)) (point-min))
(min (1+ (cdr bounds)) erc-insert-marker)
nil 'repairp))))
@@ -707,11 +707,11 @@ See `erc-fill-wrap-mode' for details."
(funcall erc-fill--wrap-length-function))
(and-let* ((msg-prop (erc--check-msg-prop 'erc--msg))
((not (eq msg-prop 'unknown))))
- (when-let ((e (erc--get-speaker-bounds))
- (b (pop e))
- ((or erc-fill--wrap-action-dedent-p
- (not (erc--check-msg-prop 'erc--ctcp
- 'ACTION)))))
+ (when-let* ((e (erc--get-speaker-bounds))
+ (b (pop e))
+ ((or erc-fill--wrap-action-dedent-p
+ (not (erc--check-msg-prop 'erc--ctcp
+ 'ACTION)))))
(goto-char e))
(skip-syntax-forward "^-")
(forward-char)
@@ -776,18 +776,18 @@ With REPAIRP, destructively fill gaps and re-merge
speakers."
(end (text-property-not-all beg finish 'line-prefix val)))
;; If this is a left-side stamp on its own line.
(remove-text-properties beg (1+ end) '(line-prefix nil wrap-prefix nil))
- (when-let ((repairp)
- (dbeg (text-property-not-all beg end
- 'erc-fill--wrap-merge nil))
- ((get-text-property (1+ dbeg) 'erc--speaker))
- (dval (get-text-property dbeg 'erc-fill--wrap-merge)))
+ (when-let* ((repairp)
+ (dbeg (text-property-not-all beg end
+ 'erc-fill--wrap-merge nil))
+ ((get-text-property (1+ dbeg) 'erc--speaker))
+ (dval (get-text-property dbeg 'erc-fill--wrap-merge)))
(remove-list-of-text-properties
dbeg (text-property-not-all dbeg end 'erc-fill--wrap-merge dval)
'(display erc-fill--wrap-merge)))
;; This "should" work w/o `front-sticky' and `rear-nonsticky'.
- (let* ((pos (if-let (((eq 'erc-timestamp (field-at-pos beg)))
- (b (field-beginning beg))
- ((eq 'datestamp (get-text-property b 'erc--msg))))
+ (let* ((pos (if-let* (((eq 'erc-timestamp (field-at-pos beg)))
+ (b (field-beginning beg))
+ ((eq 'datestamp (get-text-property b 'erc--msg))))
b
beg))
(erc--msg-props (map-into (text-properties-at pos) 'hash-table))
@@ -802,8 +802,8 @@ With REPAIRP, destructively fill gaps and re-merge
speakers."
(funcall on-next))
;; Skip to end of message upon encountering accidental gaps
;; introduced by third parties (or bugs).
- (if-let (((/= ?\n (char-after end)))
- (next (erc--get-inserted-msg-end beg)))
+ (if-let* (((/= ?\n (char-after end)))
+ (next (erc--get-inserted-msg-end beg)))
(progn
(cl-assert (= ?\n (char-after next)))
(when repairp ; eol <= next
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 93d0dc6fd0e..5d1aab4910d 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -141,7 +141,7 @@ or send-related hooks. When recentering has not been
performed,
attempt to restore last `window-start', if known."
(dolist (window (get-buffer-window-list nil nil 'visible))
(with-selected-window window
- (when-let
+ (when-let*
((erc--scrolltobottom-window-info)
(found (assq window erc--scrolltobottom-window-info))
((not (erc--scrolltobottom-confirm (nth 2 found)))))
@@ -350,19 +350,19 @@ Do so only when switching to a new buffer in the same
window if
the replaced buffer is no longer visible in another window and
its `window-start' at the time of switching is strictly greater
than the indicator's position."
- (when-let ((erc-keep-place-indicator-follow)
- (window (selected-window))
- ((not (eq window (active-minibuffer-window))))
- (old-buffer (window-old-buffer window))
- ((buffer-live-p old-buffer))
- ((not (eq old-buffer (current-buffer))))
- (ov (buffer-local-value 'erc--keep-place-indicator-overlay
- old-buffer))
- ((not (get-buffer-window old-buffer 'visible)))
- (prev (assq old-buffer (window-prev-buffers window)))
- (old-start (nth 1 prev))
- (old-inmkr (buffer-local-value 'erc-insert-marker old-buffer))
- ((< (overlay-end ov) old-start old-inmkr)))
+ (when-let* ((erc-keep-place-indicator-follow)
+ (window (selected-window))
+ ((not (eq window (active-minibuffer-window))))
+ (old-buffer (window-old-buffer window))
+ ((buffer-live-p old-buffer))
+ ((not (eq old-buffer (current-buffer))))
+ (ov (buffer-local-value 'erc--keep-place-indicator-overlay
+ old-buffer))
+ ((not (get-buffer-window old-buffer 'visible)))
+ (prev (assq old-buffer (window-prev-buffers window)))
+ (old-start (nth 1 prev))
+ (old-inmkr (buffer-local-value 'erc-insert-marker old-buffer))
+ ((< (overlay-end ov) old-start old-inmkr)))
(with-current-buffer old-buffer
(erc-keep-place-move old-start))))
@@ -392,15 +392,15 @@ and `keep-place-indicator' in different buffers."
(progn
(erc--restore-initialize-priors erc-keep-place-indicator-mode
erc--keep-place-indicator-overlay (make-overlay 0 0))
- (when-let (((memq erc-keep-place-indicator-style '(t arrow)))
- (ov-property (if (zerop (fringe-columns 'left))
- 'after-string
- 'before-string))
- (display (if (zerop (fringe-columns 'left))
- `((margin left-margin) ,overlay-arrow-string)
- '(left-fringe right-triangle
- erc-keep-place-indicator-arrow)))
- (bef (propertize " " 'display display)))
+ (when-let* (((memq erc-keep-place-indicator-style '(t arrow)))
+ (ov-property (if (zerop (fringe-columns 'left))
+ 'after-string
+ 'before-string))
+ (display (if (zerop (fringe-columns 'left))
+ `((margin left-margin) ,overlay-arrow-string)
+ '(left-fringe right-triangle
+ erc-keep-place-indicator-arrow)))
+ (bef (propertize " " 'display display)))
(overlay-put erc--keep-place-indicator-overlay ov-property bef))
(when (memq erc-keep-place-indicator-style '(t face))
(overlay-put erc--keep-place-indicator-overlay 'face
@@ -440,11 +440,11 @@ Do this by simulating `keep-place' in all buffers where
(defun erc--keep-place-indicator-adjust-on-clear (beg end)
"Either shrink region bounded by BEG to END to preserve overlay, or reset."
- (when-let ((pos (overlay-start erc--keep-place-indicator-overlay))
- ((<= beg pos end)))
+ (when-let* ((pos (overlay-start erc--keep-place-indicator-overlay))
+ ((<= beg pos end)))
(if (and erc-keep-place-indicator-truncation
(not erc--called-as-input-p))
- (when-let ((pos (erc--get-inserted-msg-beg pos)))
+ (when-let* ((pos (erc--get-inserted-msg-beg pos)))
(set-marker end pos))
(let (erc--keep-place-move-hook)
;; Move earlier than `beg', which may delimit date stamps, etc.
@@ -473,7 +473,7 @@ window's first line. Interpret an integer as an offset in
lines."
(let ((inhibit-field-text-motion t))
(when pos
(goto-char pos))
- (when-let ((pos (erc--get-inserted-msg-beg)))
+ (when-let* ((pos (erc--get-inserted-msg-beg)))
(goto-char pos))
(run-hooks 'erc--keep-place-move-hook)
(move-overlay erc--keep-place-indicator-overlay
@@ -638,8 +638,8 @@ Do nothing if the variable `erc-command-indicator' is nil."
(map-into `((erc--msg . slash-cmd)
,@(reverse ovs))
'hash-table)))))
- (when-let ((string (erc-command-indicator))
- (erc-input-marker (copy-marker erc-input-marker)))
+ (when-let* ((string (erc-command-indicator))
+ (erc-input-marker (copy-marker erc-input-marker)))
(erc-display-prompt nil nil string 'erc-command-indicator-face)
(remove-text-properties insert-position (point)
'(field nil erc-prompt nil))
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 6e8a196255b..2874e2a4a00 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -121,10 +121,10 @@
(define-ibuffer-column
erc-members (:name "Users")
- (if-let ((table (or erc-channel-users erc-server-users))
- ((hash-table-p table))
- (count (hash-table-count table))
- ((> count 0)))
+ (if-let* ((table (or erc-channel-users erc-server-users))
+ ((hash-table-p table))
+ (count (hash-table-count table))
+ ((> count 0)))
(number-to-string count)
""))
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index cb57d8a00a1..9d08121fee6 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -157,8 +157,8 @@ network or a network ID). Return nil on failure."
;; encountering errors, like a 475 ERR_BADCHANNELKEY.
(defun erc-join--remove-requested-channel (_ parsed)
"Remove channel from `erc-join--requested-channels'."
- (when-let ((channel (cadr (erc-response.command-args parsed)))
- ((member channel erc-join--requested-channels)))
+ (when-let* ((channel (cadr (erc-response.command-args parsed)))
+ ((member channel erc-join--requested-channels)))
(setq erc-join--requested-channels
(delete channel erc-join--requested-channels)))
nil)
@@ -175,7 +175,7 @@ network or a network ID). Return nil on failure."
(defun erc-autojoin--join ()
;; This is called in the server buffer
(pcase-dolist (`(,name . ,channels) erc-autojoin-channels-alist)
- (when-let ((match (erc-autojoin-server-match name)))
+ (when-let* ((match (erc-autojoin-server-match name)))
(dolist (chan channels)
(let ((buf (erc-get-buffer chan erc-server-process)))
(unless (and buf (with-current-buffer buf
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index a5ca05b137a..75de68a284c 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -904,8 +904,8 @@ aside) that aren't also `eq'.")
(defun erc-networks--id-qualifying-init-parts ()
"Return opaque list of atoms to serve as canonical identifier."
- (when-let ((network (erc-network))
- (nick (erc-current-nick)))
+ (when-let* ((network (erc-network))
+ (nick (erc-current-nick)))
(vector network (erc-downcase nick))))
(defvar erc-networks--id-sep "/"
@@ -986,7 +986,7 @@ object."
(erc-networks--rename-server-buffer (or proc erc-server-process) parsed)
(erc-networks--shrink-ids-and-buffer-names-any)
(erc-with-all-buffers-of-server erc-server-process #'erc-target
- (when-let
+ (when-let*
((new-name (erc-networks--reconcile-buffer-names erc--target nid))
((not (equal (buffer-name) new-name))))
(rename-buffer new-name 'unique))))
@@ -1002,7 +1002,7 @@ object."
((nid erc-networks--id-qualifying) (other erc-networks--id-qualifying))
"Grow NID along with that of the current buffer.
Rename the current buffer if its NID has grown."
- (when-let ((n (erc-networks--id-qualifying-prefix-length other nid)))
+ (when-let* ((n (erc-networks--id-qualifying-prefix-length other nid)))
(while (and (<= (erc-networks--id-qualifying-len nid) n)
(erc-networks--id-qualifying-grow-id nid)))
;; Grow and rename a visited buffer and all its targets
@@ -1387,9 +1387,9 @@ Expect ANNOUNCED to be the server's reported host name."
(string= erc-server-announced-name announced)))
;; If a target buffer exists for the current process, kill this
;; stale one after transplanting its content; else reinstate.
- (if-let ((actual (erc-get-buffer (erc--target-string erc--target)
- new-proc))
- (erc-networks--target-transplant-in-progress-p t))
+ (if-let* ((actual (erc-get-buffer (erc--target-string erc--target)
+ new-proc))
+ (erc-networks--target-transplant-in-progress-p t))
(progn
(funcall erc-networks--transplant-target-buffer-function
(current-buffer) actual)
@@ -1593,7 +1593,7 @@ return the host alone sans URL formatting (for
compatibility)."
erc-server-alist)))))
(s-choose (lambda (entry)
(and (equal (nth 1 entry) net)
- (if-let ((b (string-search ": " (car entry))))
+ (if-let* ((b (string-search ": " (car entry))))
(cons (format "%s (%s)" (nth 2 entry)
(substring (car entry) (+ b 2)))
(cdr entry))
diff --git a/lisp/erc/erc-nicks.el b/lisp/erc/erc-nicks.el
index 6282242f4ac..e2cbe613d99 100644
--- a/lisp/erc/erc-nicks.el
+++ b/lisp/erc/erc-nicks.el
@@ -309,10 +309,10 @@ lower it to the upper bound of
`erc-nicks-contrast-range'."
"Invert COLOR based on the CAR of `erc-nicks-contrast-range'.
Don't bother if the inverted color has less contrast than the
input."
- (if-let ((con-input (erc-nicks--get-contrast color))
- ((< con-input (car erc-nicks-contrast-range)))
- (flipped (mapcar (lambda (c) (- 1.0 c)) color))
- ((> (erc-nicks--get-contrast flipped) con-input)))
+ (if-let* ((con-input (erc-nicks--get-contrast color))
+ ((< con-input (car erc-nicks-contrast-range)))
+ (flipped (mapcar (lambda (c) (- 1.0 c)) color))
+ ((> (erc-nicks--get-contrast flipped) con-input)))
flipped
color))
@@ -365,8 +365,8 @@ input."
(defun erc-nicks--redirect-face-widget-link (args)
(pcase args
(`(,widget face-link . ,plist)
- (when-let ((face (widget-value widget))
- ((get face 'erc-nicks--custom-face)))
+ (when-let* ((face (widget-value widget))
+ ((get face 'erc-nicks--custom-face)))
(unless (symbol-file face)
(setf (plist-get plist :action)
(lambda (&rest _) (erc-nicks--create-defface-template face))))
@@ -518,17 +518,17 @@ Abandon search after examining LIMIT faces."
(defun erc-nicks--highlight (nickname &optional base-face)
"Return face for NICKNAME unless it or BASE-FACE is blacklisted."
- (when-let ((trimmed (erc-nicks--trim nickname))
- ((not (member trimmed erc-nicks--downcased-skip-nicks)))
- ((not (and base-face
- (erc-nicks--skip-p base-face erc-nicks-skip-faces
- erc-nicks--max-skip-search))))
- (key (erc-nicks--gen-key-from-format-spec trimmed)))
+ (when-let* ((trimmed (erc-nicks--trim nickname))
+ ((not (member trimmed erc-nicks--downcased-skip-nicks)))
+ ((not (and base-face
+ (erc-nicks--skip-p base-face erc-nicks-skip-faces
+ erc-nicks--max-skip-search))))
+ (key (erc-nicks--gen-key-from-format-spec trimmed)))
(erc-nicks--get-face trimmed key)))
(defun erc-nicks--highlight-button (nick-object)
"Possibly add face to `erc-button--nick-user' NICK-OBJECT."
- (when-let
+ (when-let*
((nick-object)
(face (get-text-property (car (erc-button--nick-bounds nick-object))
'font-lock-face))
@@ -628,13 +628,13 @@ Abandon search after examining LIMIT faces."
(customize-face new-face)))
(defun erc-nicks--list-faces-help-button-action (face)
- (when-let (((or (get face 'erc-nicks--custom-face)
- (y-or-n-p (format "Create new persistent face for %s?"
- (get face 'erc-nicks--key)))))
- (nid (get face 'erc-nicks--netid))
- (foundp (lambda ()
- (erc-networks--id-equal-p nid erc-networks--id)))
- (server-buffer (car (erc-buffer-filter foundp))))
+ (when-let* (((or (get face 'erc-nicks--custom-face)
+ (y-or-n-p (format "Create new persistent face for %s?"
+ (get face 'erc-nicks--key)))))
+ (nid (get face 'erc-nicks--netid))
+ (foundp (lambda ()
+ (erc-networks--id-equal-p nid erc-networks--id)))
+ (server-buffer (car (erc-buffer-filter foundp))))
(with-current-buffer server-buffer
(erc-nicks-customize-face (get face 'erc-nicks--nick)))))
@@ -653,13 +653,13 @@ Abandon search after examining LIMIT faces."
(facep (car (button-get (point) 'help-args))))
(button-put (point) 'help-function
#'erc-nicks--list-faces-help-button-action)
- (if-let ((face (car (button-get (point) 'help-args)))
- ((not (get face 'erc-nicks--custom-face)))
- ((not (get face 'erc-nicks--key))))
+ (if-let* ((face (car (button-get (point) 'help-args)))
+ ((not (get face 'erc-nicks--custom-face)))
+ ((not (get face 'erc-nicks--key))))
(progn (delete-region (pos-bol) (1+ (pos-eol)))
(forward-line -1))
- (when-let ((nid (get face 'erc-nicks--netid))
- (net (symbol-name (erc-networks--id-symbol nid))))
+ (when-let* ((nid (get face 'erc-nicks--netid))
+ (net (symbol-name (erc-networks--id-symbol nid))))
(goto-char (button-end (point)))
(skip-syntax-forward "-")
(put-text-property (point) (1+ (point)) 'rear-nonsticky nil)
@@ -690,8 +690,8 @@ ones."
(user-error "Pool empty: all colors rejected"))
(dolist (nick (hash-table-keys erc-nicks--face-table))
;; User-tuned faces do not have an `erc-nicks--key' property.
- (when-let ((face (gethash nick erc-nicks--face-table))
- (key (get face 'erc-nicks--key)))
+ (when-let* ((face (gethash nick erc-nicks--face-table))
+ (key (get face 'erc-nicks--key)))
(setq key (erc-nicks--gen-key-from-format-spec nick))
(put face 'erc-nicks--key key)
(set-face-foreground face (erc-nicks--determine-color key))))
@@ -719,8 +719,8 @@ ones."
Expect PREFIX to be something like \"ansi-color-\" or \"font-lock-\"."
(let (out)
(dolist (face (face-list) (nreverse out))
- (when-let (((string-prefix-p prefix (symbol-name face)))
- (color (face-foreground face)))
+ (when-let* (((string-prefix-p prefix (symbol-name face)))
+ (color (face-foreground face)))
(push color out)))))
(defun erc-nicks--reject-uninterned-faces (candidate)
@@ -762,13 +762,13 @@ NORMALS. Expect a non-nil CONTENDER to always be ranked."
(defun erc-nicks--track-prioritize (current contender contenders ranks normals)
"Return a viable non-CURRENT `nicks' face among CONTENDERS.
See `erc-track--select-mode-line-face' for parameter types."
- (when-let
+ (when-let*
((spkr (erc-nicks--assess-track-faces current contender ranks normals)))
(catch 'contender
(dolist (candidate (cdr contenders))
- (when-let (((not (equal candidate current)))
- (s (erc-nicks--ours-p candidate))
- ((not (eq s spkr))))
+ (when-let* (((not (equal candidate current)))
+ (s (erc-nicks--ours-p candidate))
+ ((not (eq s spkr))))
(throw 'contender candidate))))))
(defun erc-nicks--track-always (current contender contenders ranks normals)
@@ -798,9 +798,9 @@ See `erc-track--select-mode-line-face' for parameter types."
(defun erc-nicks--remember-face-for-track (face)
"Add FACE to local hash table maintained by `track' module."
(or (gethash face erc-track--normal-faces)
- (if-let ((sym (or (car-safe face) face))
- ((symbolp sym))
- ((get sym 'erc-nicks--key)))
+ (if-let* ((sym (or (car-safe face) face))
+ ((symbolp sym))
+ ((get sym 'erc-nicks--key)))
(puthash face face erc-track--normal-faces)
face)))
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index a32c8b46118..7e78120f799 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -324,10 +324,10 @@ target buffer."
((when erc--querypoll-timer
(cancel-timer erc--querypoll-timer))
(if erc--target
- (when-let (((erc-query-buffer-p))
- (ring (erc-with-server-buffer erc--querypoll-ring))
- (index (ring-member ring (current-buffer)))
- ((not (erc--querypoll-target-in-chan-p (current-buffer)))))
+ (when-let* (((erc-query-buffer-p))
+ (ring (erc-with-server-buffer erc--querypoll-ring))
+ (index (ring-member ring (current-buffer)))
+ ((not (erc--querypoll-target-in-chan-p (current-buffer)))))
(ring-remove ring index)
(unless (erc-current-nick-p (erc-target))
(erc-remove-current-channel-member (erc-target))))
@@ -376,8 +376,8 @@ between updates regardless of queue length.")
(let ((n (ring-length ring)))
(catch 'found
(while (natnump (cl-decf n))
- (when-let ((buffer (ring-remove ring))
- ((buffer-live-p buffer)))
+ (when-let* ((buffer (ring-remove ring))
+ ((buffer-live-p buffer)))
;; Push back buffers for users joined to some chan.
(if (erc--querypoll-target-in-chan-p buffer)
(ring-insert ring buffer)
@@ -408,7 +408,7 @@ Then add user to participant rolls in any existing query
buffers."
(pcase-let
((`(,_ ,channel ,login ,host ,_server ,nick ,_flags, hop-real) args))
(when (and (string= channel "*") (erc-nick-equal-p nick target-nick))
- (if-let ((user (erc-get-server-user nick)))
+ (if-let* ((user (erc-get-server-user nick)))
(erc-update-user user nick host login
(erc--extract-352-full-name hop-real))
;; Don't add unless target is already known.
@@ -428,7 +428,7 @@ Then add user to participant rolls in any existing query
buffers."
(buffer-local-value 'erc-server-connected server-buffer))
(with-current-buffer server-buffer
(setq erc--querypoll-timer nil)
- (if-let ((buffer (erc--querypoll-get-next erc--querypoll-ring)))
+ (if-let* ((buffer (erc--querypoll-get-next erc--querypoll-ring)))
(letrec
((target (erc--target-string
(buffer-local-value 'erc--target buffer)))
diff --git a/lisp/erc/erc-sasl.el b/lisp/erc/erc-sasl.el
index 1998e4f129b..65dba95d5c3 100644
--- a/lisp/erc/erc-sasl.el
+++ b/lisp/erc/erc-sasl.el
@@ -148,17 +148,17 @@ PLIST to contain keyword params known to
`auth-source-search'."
(defun erc-sasl--read-password (prompt)
"Return configured option or server password.
If necessary, pass PROMPT to `read-passwd'."
- (if-let ((found (pcase (alist-get 'password erc-sasl--options)
- ((guard (alist-get 'authfn erc-sasl--options))
- (let-alist erc-sasl--options
- (let ((erc-sasl-user .user)
- (erc-sasl-password .password)
- (erc-sasl-mechanism .mechanism)
- (erc-sasl-authzid .authzid)
- (erc-sasl-auth-source-function .authfn))
- (funcall .authfn :user (erc-sasl--get-user)))))
- (:password erc-session-password)
- ((and (pred stringp) v) (unless (string-empty-p v) v)))))
+ (if-let* ((found (pcase (alist-get 'password erc-sasl--options)
+ ((guard (alist-get 'authfn erc-sasl--options))
+ (let-alist erc-sasl--options
+ (let ((erc-sasl-user .user)
+ (erc-sasl-password .password)
+ (erc-sasl-mechanism .mechanism)
+ (erc-sasl-authzid .authzid)
+ (erc-sasl-auth-source-function .authfn))
+ (funcall .authfn :user (erc-sasl--get-user)))))
+ (:password erc-session-password)
+ ((and (pred stringp) v) (unless (string-empty-p v) v)))))
(copy-sequence (erc--unfun found))
(read-passwd prompt)))
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 0881006ed77..6ea5e03881c 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -578,13 +578,13 @@ as needed."
(letrec ((attempts 3)
(on-notice
(lambda (_proc parsed)
- (when-let ((nick (erc-extract-nick
- (erc-response.sender parsed)))
- ((erc-nick-equal-p nick "nickserv"))
- (contents (erc-response.contents parsed))
- (case-fold-search t)
- ((string-match (rx (or "ghost" "is not online"))
- contents)))
+ (when-let* ((nick (erc-extract-nick
+ (erc-response.sender parsed)))
+ ((erc-nick-equal-p nick "nickserv"))
+ (contents (erc-response.contents parsed))
+ (case-fold-search t)
+ ((string-match (rx (or "ghost" "is not online"))
+ contents)))
(setq attempts 1)
(erc-server-send (concat "NICK " want) 'force))
(when (zerop (cl-decf attempts))
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index e8c41a1f239..ed27881abdc 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -512,13 +512,13 @@ associated with an ERC session."
". Setting to t for the current Emacs session."
" Customize it permanently to avoid this message.")
(setq speedbar-update-flag t))
- (when-let (((null speedbar-buffer))
- (speedbar-frame-parameters (backquote-list*
- '(visibility . nil)
- '(no-other-frame . t)
- speedbar-frame-parameters))
- (speedbar-after-create-hook #'erc-speedbar--emulate-sidebar)
- (original-frame (selected-frame)))
+ (when-let* (((null speedbar-buffer))
+ (speedbar-frame-parameters (backquote-list*
+ '(visibility . nil)
+ '(no-other-frame . t)
+ speedbar-frame-parameters))
+ (speedbar-after-create-hook #'erc-speedbar--emulate-sidebar)
+ (original-frame (selected-frame)))
(erc-install-speedbar-variables)
;; Run before toggling mode to prevent timer from being
;; created twice.
@@ -591,8 +591,8 @@ For controlling whether the speedbar window is selectable
with
(and speedbar-buffer
(eq speedbar-frame
(window-frame (get-buffer-window speedbar-buffer t)))))
- (when-let ((buf (or (and (derived-mode-p 'erc-mode) (current-buffer))
- (car (erc-buffer-filter #'erc--server-buffer-p)))))
+ (when-let* ((buf (or (and (derived-mode-p 'erc-mode) (current-buffer))
+ (car (erc-buffer-filter #'erc--server-buffer-p)))))
(with-current-buffer buf
(erc-speedbar--ensure 'forcep)))))
((remove-hook 'erc--setup-buffer-hook #'erc-speedbar--ensure)
@@ -649,7 +649,7 @@ unlock the window."
(interactive "P")
(unless erc-nickbar-mode
(user-error "`erc-nickbar-mode' inactive"))
- (when-let ((window (get-buffer-window speedbar-buffer)))
+ (when-let* ((window (get-buffer-window speedbar-buffer)))
(let ((val (cond ((natnump arg) t)
((integerp arg) nil)
(t (not (erc-compat--window-no-other-p window))))))
@@ -669,10 +669,10 @@ unlock the window."
(defun erc-speedbar--compose-nicks-face (orig buffer user cuser)
(require 'erc-nicks)
(let ((rv (funcall orig buffer user cuser)))
- (if-let ((nick (erc-server-user-nickname user))
- (face (with-current-buffer buffer
- (erc-nicks--highlight nick rv)))
- ((not (eq face erc-button-nickname-face))))
+ (if-let* ((nick (erc-server-user-nickname user))
+ (face (with-current-buffer buffer
+ (erc-nicks--highlight nick rv)))
+ ((not (eq face erc-button-nickname-face))))
(cons face (ensure-list rv))
rv)))
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index b0ecd67eef7..24bb510fd70 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -197,13 +197,13 @@ from entering them and instead jump over them."
(defun erc-stamp--recover-on-reconnect ()
"Attempt to restore \"last-inserted\" snapshots from prior session."
- (when-let ((priors (or erc--server-reconnecting erc--target-priors)))
+ (when-let* ((priors (or erc--server-reconnecting erc--target-priors)))
(dolist (var '(erc-timestamp-last-inserted
erc-timestamp-last-inserted-left
erc-timestamp-last-inserted-right
erc-stamp--deferred-date-stamp
erc-stamp--date-stamps))
- (when-let (existing (alist-get var priors))
+ (when-let* ((existing (alist-get var priors)))
(set var existing)))))
(defvar erc-stamp--current-time nil
@@ -396,14 +396,14 @@ non-nil."
(goto-char (point-min))
(while
(progn
- (when-let (((< (point) (pos-eol)))
- (end (1- (pos-eol)))
- ((eq 'erc-timestamp (field-at-pos end)))
- (beg (field-beginning end))
- ;; Skip a line that's just a timestamp.
- ((> beg (point))))
+ (when-let* (((< (point) (pos-eol)))
+ (end (1- (pos-eol)))
+ ((eq 'erc-timestamp (field-at-pos end)))
+ (beg (field-beginning end))
+ ;; Skip a line that's just a timestamp.
+ ((> beg (point))))
(delete-region beg (1+ end)))
- (when-let (time (erc--get-inserted-msg-prop 'erc--ts))
+ (when-let* ((time (erc--get-inserted-msg-prop 'erc--ts)))
(insert (format-time-string "[%H:%M:%S] " time)))
(zerop (forward-line))))
"")
@@ -505,10 +505,10 @@ and `erc-stamp--margin-left-p', before activating the
mode."
(&context (erc-stamp--display-margin-mode (eql t))
(erc-stamp--margin-left-p (eql t))
(erc-stamp--skip-left-margin-prompt-p null))
- (when-let (((null erc--hidden-prompt-overlay))
- (prompt (string-pad erc-prompt-hidden left-margin-width nil
'start))
- (ov (make-overlay erc-insert-marker (1- erc-input-marker)
- nil 'front-advance)))
+ (when-let* (((null erc--hidden-prompt-overlay))
+ (prompt (string-pad erc-prompt-hidden left-margin-width nil
'start))
+ (ov (make-overlay erc-insert-marker (1- erc-input-marker)
+ nil 'front-advance)))
(overlay-put ov 'display `((margin left-margin) ,prompt))
(setq erc--hidden-prompt-overlay ov)))
@@ -534,7 +534,7 @@ and `erc-stamp--margin-left-p', before activating the mode."
(goto-char (point-min))
(insert-and-inherit (setq erc-timestamp-last-inserted string))
(dolist (p erc-stamp--inherited-props)
- (when-let ((v (get-text-property (point) p)))
+ (when-let* ((v (get-text-property (point) p)))
(put-text-property (point-min) (point) p v)))
(erc-put-text-property (point-min) (point) 'invisible
erc-stamp--invisible-property)
@@ -641,7 +641,7 @@ printed just after each line's text (no alignment)."
(_ (indent-to pos)))
(insert string)
(dolist (p erc-stamp--inherited-props)
- (when-let ((v (get-text-property (1- from) p)))
+ (when-let* ((v (get-text-property (1- from) p)))
(put-text-property from (point) p v)))
(erc-put-text-property from (point) 'field 'erc-timestamp)
(erc-put-text-property from (point) 'rear-nonsticky t)
@@ -724,13 +724,13 @@ inserted is a date stamp."
"Schedule a date stamp to be inserted via HOOK-VAR.
Do so when `erc-stamp--deferred-date-stamp' and its `fn' slot are
non-nil."
- (when-let ((data erc-stamp--deferred-date-stamp)
- ((eq (erc-stamp--date-fn data) #'ignore))
- (ct (erc-stamp--date-ts data))
- (rendered (erc-stamp--date-str data))
- (buffer (current-buffer))
- (symbol (make-symbol "erc-stamp--insert-date"))
- (marker (setf (erc-stamp--date-marker data) (point-min-marker))))
+ (when-let* ((data erc-stamp--deferred-date-stamp)
+ ((eq (erc-stamp--date-fn data) #'ignore))
+ (ct (erc-stamp--date-ts data))
+ (rendered (erc-stamp--date-str data))
+ (buffer (current-buffer))
+ (symbol (make-symbol "erc-stamp--insert-date"))
+ (marker (setf (erc-stamp--date-marker data) (point-min-marker))))
(setf (erc-stamp--date-fn data) symbol)
(fset symbol
(lambda (&rest _)
@@ -856,15 +856,15 @@ and date stamps inserted by this function."
;; "prepended" date stamps as well. However, since this is a
;; compatibility oriented code path, and pre-5.6 did no such
;; thing, better to punt.
- (if-let ((erc-stamp-prepend-date-stamps-p)
- (ts-left (erc-format-timestamp ct erc-timestamp-format-left))
- ((not (string= ts-left erc-timestamp-last-inserted-left))))
+ (if-let* ((erc-stamp-prepend-date-stamps-p)
+ (ts-left (erc-format-timestamp ct erc-timestamp-format-left))
+ ((not (string= ts-left erc-timestamp-last-inserted-left))))
(progn
(goto-char (point-min))
(erc-put-text-property 0 (length ts-left) 'field 'erc-timestamp
ts-left)
(insert (setq erc-timestamp-last-inserted-left ts-left)))
- (when-let
+ (when-let*
(((null erc-stamp--deferred-date-stamp))
(rendered (erc-stamp--format-date-stamp ct))
((not (string-equal rendered erc-timestamp-last-inserted-left)))
@@ -1064,17 +1064,17 @@ with the option `erc-echo-timestamps', see the
companion option
;; regardless of `erc-timestamp-only-if-changed-flag'. As of ERC 5.6,
;; recreating inserted messages from scratch isn't doable. (Although,
;; attempting surgery like this is likely unwise.)
- (when-let ((erc-stamp--date-mode)
- ((< end (1- erc-insert-marker))) ; not a /CLEAR
- (bounds (erc--get-inserted-msg-bounds (1+ end)))
- (ts (get-text-property (car bounds) 'erc--ts))
- (format (with-suppressed-warnings
- ((obsolete erc-timestamp-format-right))
- (or erc-timestamp-format-right erc-timestamp-format)))
- (rendered (erc-format-timestamp ts format))
- ((not (equal rendered erc-timestamp-last-inserted-right)))
- ((not (eq 'erc-timestamp (field-at-pos (1- (cdr bounds))))))
- (erc--msg-props (map-into `((erc--ts . ,ts)) 'hash-table)))
+ (when-let* ((erc-stamp--date-mode)
+ ((< end (1- erc-insert-marker))) ; not a /CLEAR
+ (bounds (erc--get-inserted-msg-bounds (1+ end)))
+ (ts (get-text-property (car bounds) 'erc--ts))
+ (format (with-suppressed-warnings
+ ((obsolete erc-timestamp-format-right))
+ (or erc-timestamp-format-right erc-timestamp-format)))
+ (rendered (erc-format-timestamp ts format))
+ ((not (equal rendered erc-timestamp-last-inserted-right)))
+ ((not (eq 'erc-timestamp (field-at-pos (1- (cdr bounds))))))
+ (erc--msg-props (map-into `((erc--ts . ,ts)) 'hash-table)))
(save-excursion
(save-restriction
(let ((erc-timestamp-last-inserted erc-timestamp-last-inserted)
@@ -1106,12 +1106,12 @@ Call ORIG, an `erc--clear-function', with BEG and END
markers."
(when (and fullp culled (not skipp) (< 1 beg 3 end))
(set-marker beg 3))
(funcall orig beg end)
- (when-let ((culled)
- ((not skipp))
- (ct (erc-stamp--date-ts (car culled)))
- (hook (make-symbol "temporary-hook"))
- (rendered (erc-stamp--format-date-stamp ct))
- (data (make-erc-stamp--date :ts ct :str rendered)))
+ (when-let* ((culled)
+ ((not skipp))
+ (ct (erc-stamp--date-ts (car culled)))
+ (hook (make-symbol "temporary-hook"))
+ (rendered (erc-stamp--format-date-stamp ct))
+ (data (make-erc-stamp--date :ts ct :str rendered)))
(cl-assert erc-stamp--date-mode)
;; Object successfully removed from model but snapshot remains.
(cl-assert (null (cl-find rendered erc-stamp--date-stamps
@@ -1144,9 +1144,9 @@ copy non-duplicate `erc-stamp--date' objects from
OLD-STAMPS to the
current buffer's, maintaining order."
(let (need)
(dolist (old old-stamps)
- (if-let ((new (cl-find (erc-stamp--date-str old) erc-stamp--date-stamps
- :test #'string= :key #'erc-stamp--date-str))
- (new-marker (erc-stamp--date-marker new)))
+ (if-let* ((new (cl-find (erc-stamp--date-str old) erc-stamp--date-stamps
+ :test #'string= :key #'erc-stamp--date-str))
+ (new-marker (erc-stamp--date-marker new)))
;; The new buffer now has a duplicate stamp, so remove the
;; "newer" one from the buffer.
(progn
diff --git a/lisp/erc/erc-status-sidebar.el b/lisp/erc/erc-status-sidebar.el
index dcdef7cfafc..bf049242443 100644
--- a/lisp/erc/erc-status-sidebar.el
+++ b/lisp/erc/erc-status-sidebar.el
@@ -258,17 +258,17 @@ current frame only."
(erc-track-mode +1))
(add-hook 'erc--setup-buffer-hook #'erc-status-sidebar--open)
;; Preserve side-window dimensions after `custom-buffer-done'.
- (when-let (((not erc--updating-modules-p))
- (buf (or (and (derived-mode-p 'erc-mode) (current-buffer))
- (car (erc-buffer-filter
- (lambda () erc-server-connected))))))
+ (when-let* (((not erc--updating-modules-p))
+ (buf (or (and (derived-mode-p 'erc-mode) (current-buffer))
+ (car (erc-buffer-filter
+ (lambda () erc-server-connected))))))
(with-current-buffer buf
(erc-status-sidebar--open))))
((remove-hook 'erc--setup-buffer-hook #'erc-status-sidebar--open)
(erc-status-sidebar-close 'all-frames)
- (when-let ((arg erc--module-toggle-prefix-arg)
- ((numberp arg))
- ((< arg 0)))
+ (when-let* ((arg erc--module-toggle-prefix-arg)
+ ((numberp arg))
+ ((< arg 0)))
(erc-status-sidebar-kill))))
;;;###autoload
@@ -308,7 +308,7 @@ even if one already exists in another frame."
(defun erc-status-sidebar-prefer-target-as-name (buffer)
"Return some name to represent buffer in the sidebar."
- (if-let ((target (buffer-local-value 'erc--target buffer)))
+ (if-let* ((target (buffer-local-value 'erc--target buffer)))
(cond ((and erc-status-sidebar--trimpat (erc--target-channel-p target))
(string-trim-left (erc--target-string target)
erc-status-sidebar--trimpat))
@@ -340,8 +340,8 @@ even if one already exists in another frame."
(let ((erc-status-sidebar--trimpat
(and (eq erc-status-sidebar-style 'all-mixed)
(with-current-buffer (process-buffer proc)
- (when-let ((ch-pfxs (erc--get-isupport-entry
- 'CHANTYPES 'single)))
+ (when-let* ((ch-pfxs (erc--get-isupport-entry
+ 'CHANTYPES 'single)))
(regexp-quote ch-pfxs)))))
(erc-status-sidebar--prechan
(and (eq erc-status-sidebar-style
@@ -484,7 +484,7 @@ name stand out."
(cl-assert (eq major-mode 'erc-status-sidebar-mode))
(cl-assert (eq (selected-window) window))
(cl-assert (eq (window-buffer window) (current-buffer)))
- (when-let ((buf (get-text-property pos 'erc-buf)))
+ (when-let* ((buf (get-text-property pos 'erc-buf)))
;; Option operates relative to last selected window
(select-window (get-mru-window nil nil 'not-selected))
(pop-to-buffer buf erc-status-sidebar-click-display-action)))))
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 82e5f402910..97fb7e726bd 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -409,12 +409,12 @@ For now, omit relevant options like
`erc-track-shorten-start' and
friends, even though they do affect the outcome, because they
likely change too infrequently to matter over sub-second
intervals and are unlikely to be let-bound or set locally."
- (when-let ((hash (setq erc-track--shortened-names-current-hash
- (sxhash-equal (list channel-names
- (buffer-list)
- erc-track-shorten-function))))
- (erc-track--shortened-names)
- ((= hash (car erc-track--shortened-names))))
+ (when-let* ((hash (setq erc-track--shortened-names-current-hash
+ (sxhash-equal (list channel-names
+ (buffer-list)
+ erc-track-shorten-function))))
+ (erc-track--shortened-names)
+ ((= hash (car erc-track--shortened-names))))
(cdr erc-track--shortened-names)))
(gv-define-simple-setter erc-track--shortened-names-get
@@ -674,8 +674,8 @@ binding, set the cache variable's local value to that of
server's."
(when (local-variable-p opt)
(erc-track--massage-nick-button-faces opt (symbol-value opt)
#'set))
- (when-let ((migrations (get opt 'erc-track--obsolete-faces))
- ((consp migrations)))
+ (when-let* ((migrations (get opt 'erc-track--obsolete-faces))
+ ((consp migrations)))
(push (cons opt
(mapcar (pcase-lambda (`(,old . ,new))
(format (if new "changed %s to %s"
@@ -980,11 +980,11 @@ Failing that, choose the first face in both NEW-FACES and
NORMALS."
;; Choose the highest ranked face in `erc-track-faces-priority-list'
;; that's either `cur-face' itself or one appearing in the region
;; being processed.
- (when-let ((choice (catch 'face
- (dolist (candidate (cdr ranks))
- (when (or (equal candidate cur-face)
- (gethash candidate (car new-faces)))
- (throw 'face candidate))))))
+ (when-let* ((choice (catch 'face
+ (dolist (candidate (cdr ranks))
+ (when (or (equal candidate cur-face)
+ (gethash candidate (car new-faces)))
+ (throw 'face candidate))))))
(or (and erc-track--alt-normals-function
(funcall erc-track--alt-normals-function
cur-face choice new-faces ranks normals))
@@ -1040,7 +1040,7 @@ the current buffer is in `erc-mode'."
;; (in the car), change its face attribute (in the cddr) if
;; necessary. See `erc-modified-channels-alist' for the
;; exact data structure used.
- (when-let
+ (when-let*
((faces (if erc-track-ignore-normal-contenders-p
(erc-faces-in (buffer-string))
(erc-track--collect-faces-in)))
@@ -1128,7 +1128,7 @@ seen to least."
(faces (make-hash-table :test #'equal))
(rfaces ()))
(while p
- (when-let ((cur (get-text-property p prop)))
+ (when-let* ((cur (get-text-property p prop)))
(unless (gethash cur seen)
(puthash cur t seen)
(when erc-track--face-reject-function
@@ -1214,8 +1214,8 @@ unless any passes.")
(current-buffer))
(setq erc-track-last-non-erc-buffer (current-buffer)))
;; and jump to the next active channel
- (if-let ((buf (erc-track-get-active-buffer arg))
- ((buffer-live-p buf)))
+ (if-let* ((buf (erc-track-get-active-buffer arg))
+ ((buffer-live-p buf)))
(funcall fun buf)
(erc-modified-channels-update)
(erc-track--switch-buffer fun arg)))
@@ -1244,7 +1244,7 @@ reverse it."
(erc-track--switch-buffer 'switch-to-buffer-other-window arg))
(defun erc-track--replace-killed-buffer (existing)
- (when-let ((found (assq existing erc-modified-channels-alist)))
+ (when-let* ((found (assq existing erc-modified-channels-alist)))
(setcar found (current-buffer))))
(provide 'erc-track)
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index fd152707708..b6666c76f33 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -82,8 +82,8 @@ for other purposes should customize either
`erc-enable-logging' or
"Enable or disable buffer-local `erc-truncate-mode' modifications."
(if erc-truncate-mode
(progn
- (when-let ((priors (or erc--server-reconnecting erc--target-priors))
- (val (alist-get 'erc-truncate--buffer-size priors)))
+ (when-let* ((priors (or erc--server-reconnecting erc--target-priors))
+ (val (alist-get 'erc-truncate--buffer-size priors)))
(setq erc-truncate--buffer-size val))
(add-function :before (local 'erc--clear-function)
#'erc-truncate--inhibit-when-local-and-interactive
@@ -150,7 +150,7 @@ present in `erc-modules'."
;; `erc-truncate-buffer-to-size' normally runs in a different buffer.
(save-excursion
(if (and erc--parsed-response erc--msg-props)
- (when-let
+ (when-let*
(((not erc--inhibit-clear-p))
((not (erc--memq-msg-prop 'erc--skip 'truncate)))
;; Determine here because this may be a target buffer and
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 426b29f8e80..18cc4071b48 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -567,9 +567,9 @@ restore the described historical behavior.")
(defun erc--ensure-query-member (nick)
"Populate membership table in query buffer for online NICK."
(erc-with-buffer (nick)
- (when-let (((not erc--decouple-query-and-channel-membership-p))
- ((zerop (hash-table-count erc-channel-users)))
- (user (erc-get-server-user nick)))
+ (when-let* (((not erc--decouple-query-and-channel-membership-p))
+ ((zerop (hash-table-count erc-channel-users)))
+ (user (erc-get-server-user nick)))
(erc-update-current-channel-member nick nil t)
(erc--unhide-prompt)
t)))
@@ -579,10 +579,10 @@ restore the described historical behavior.")
Ensure targets with an entry in `erc-server-users' are present in
`erc-channel-members'."
(erc-with-all-buffers-of-server erc-server-process #'erc-query-buffer-p
- (when-let (((not erc--decouple-query-and-channel-membership-p))
- ((zerop (hash-table-count erc-channel-users)))
- (target (erc-target))
- ((erc-get-server-user target)))
+ (when-let* (((not erc--decouple-query-and-channel-membership-p))
+ ((zerop (hash-table-count erc-channel-users)))
+ (target (erc-target))
+ ((erc-get-server-user target)))
(erc-update-current-channel-member target nil t)
(erc--unhide-prompt))
erc-server-process))
@@ -666,15 +666,15 @@ Also remove members from the server table if this was
their only buffer."
(defun erc--remove-channel-users-but (nick)
"Drain channel users and remove from server, sparing NICK."
- (when-let ((users (erc-with-server-buffer erc-server-users))
- (my-user (gethash (erc-downcase nick) users))
- (original-function erc--forget-server-user-function)
- (erc--forget-server-user-function
- (if erc--decouple-query-and-channel-membership-p
- erc--forget-server-user-function
- (lambda (nick user)
- (unless (eq user my-user)
- (funcall original-function nick user))))))
+ (when-let* ((users (erc-with-server-buffer erc-server-users))
+ (my-user (gethash (erc-downcase nick) users))
+ (original-function erc--forget-server-user-function)
+ (erc--forget-server-user-function
+ (if erc--decouple-query-and-channel-membership-p
+ erc--forget-server-user-function
+ (lambda (nick user)
+ (unless (eq user my-user)
+ (funcall original-function nick user))))))
(erc-remove-channel-users)))
(defmacro erc--define-channel-user-status-compat-getter (name c d)
@@ -716,9 +716,9 @@ inlining calls to these adapters."
"Add or remove membership status associated with LETTER for NICK-OR-CUSR.
With RESETP, clear the user's status info completely. If ENABLEP
is non-nil, add the status value associated with LETTER."
- (when-let ((cusr (or (and (erc-channel-user-p nick-or-cusr) nick-or-cusr)
- (cdr (erc-get-channel-member nick-or-cusr))))
- (n (erc--get-prefix-flag letter)))
+ (when-let* ((cusr (or (and (erc-channel-user-p nick-or-cusr) nick-or-cusr)
+ (cdr (erc-get-channel-member nick-or-cusr))))
+ (n (erc--get-prefix-flag letter)))
(cl-callf (lambda (v)
(if resetp
(if enablep n 0)
@@ -2395,12 +2395,12 @@ invocations by third-party packages.")
(defun erc--find-mode (sym)
(setq sym (erc--normalize-module-symbol sym))
- (if-let ((mode (intern-soft (concat "erc-" (symbol-name sym) "-mode")))
- ((and (fboundp mode)
- (autoload-do-load (symbol-function mode) mode)))
- ((or (get sym 'erc--module)
- (symbol-file mode)
- (ignore (cl-pushnew sym erc--aberrant-modules)))))
+ (if-let* ((mode (intern-soft (concat "erc-" (symbol-name sym) "-mode")))
+ ((and (fboundp mode)
+ (autoload-do-load (symbol-function mode) mode)))
+ ((or (get sym 'erc--module)
+ (symbol-file mode)
+ (ignore (cl-pushnew sym erc--aberrant-modules)))))
mode
(and (or (and erc--requiring-module-mode-p
;; Also likely non-nil: (eq sym (car features))
@@ -2418,7 +2418,7 @@ invocations by third-party packages.")
(defun erc--update-modules (modules)
(let (local-modes)
(dolist (module modules local-modes)
- (if-let ((mode (erc--find-mode module)))
+ (if-let* ((mode (erc--find-mode module)))
(if (custom-variable-p mode)
(funcall mode 1)
(push mode local-modes))
@@ -3063,8 +3063,8 @@ such inconsistent labeling may pose a problem until the
MOTD is
received. Setting a fixed `erc-networks--id' can serve as a
workaround."
(when erc-debug-irc-protocol
- (let ((esid (if-let ((erc-networks--id)
- (esid (erc-networks--id-symbol erc-networks--id)))
+ (let ((esid (if-let* ((erc-networks--id)
+ (esid (erc-networks--id-symbol erc-networks--id)))
(symbol-name esid)
(or erc-server-announced-name
(format "%s:%s" erc-session-server erc-session-port))))
@@ -3297,10 +3297,10 @@ a full refresh."
(insert s)
(delete-region erc-insert-marker p))))
(run-hooks 'erc--refresh-prompt-hook)
- (when-let (((> erc--refresh-prompt-continue-request 0))
- (n erc--refresh-prompt-continue-request)
- (erc--refresh-prompt-continue-request -1)
- (b (current-buffer)))
+ (when-let* (((> erc--refresh-prompt-continue-request 0))
+ (n erc--refresh-prompt-continue-request)
+ (erc--refresh-prompt-continue-request -1)
+ (b (current-buffer)))
(erc-with-all-buffers-of-server erc-server-process
(lambda () (not (eq b (current-buffer))))
(if (= n 1)
@@ -3677,10 +3677,10 @@ Callers should be aware that this function fails if the
property
`erc--important-props' has an empty value almost anywhere along the
affected region. Use the function `erc--remove-from-prop-value-list' to
ensure that props with empty values are excised completely."
- (when-let ((registered (erc--check-msg-prop 'erc--important-prop-names))
- (present (seq-intersection props registered))
- (b (or beg (point-min)))
- (e (or end (point-max))))
+ (when-let* ((registered (erc--check-msg-prop 'erc--important-prop-names))
+ (present (seq-intersection props registered))
+ (b (or beg (point-min)))
+ (e (or end (point-max))))
(while-let
(((setq b (text-property-not-all b e 'erc--important-props nil)))
(val (get-text-property b 'erc--important-props))
@@ -3790,7 +3790,7 @@ reverse order so they end up sorted in buffer interval
plists for
retrieval by `text-properties-at' and friends."
(let (out)
(dolist (k erc--ranked-properties)
- (when-let ((v (gethash k table)))
+ (when-let* ((v (gethash k table)))
(remhash k table)
(setq out (nconc (list k v) out))))
(maphash (lambda (k v) (setq out (nconc (list k v) out))) table)
@@ -4132,8 +4132,8 @@ for other purposes.")
(defun erc-send-input-line (target line &optional force)
"Send LINE to TARGET."
- (when-let ((target)
- (cmem (erc-get-channel-member (erc-current-nick))))
+ (when-let* ((target)
+ (cmem (erc-get-channel-member (erc-current-nick))))
(setf (erc-channel-user-last-message-time (cdr cmem))
(erc-compat--current-lisp-time)))
(when (and (not erc--allow-empty-outgoing-lines-p) (string= line "\n"))
@@ -4430,7 +4430,7 @@ of `erc-ignore-list'."
(format "Now ignoring %s" user)))
(erc-with-server-buffer
(when timeout
- (if-let ((existing (erc--find-ignore-timer user (current-buffer))))
+ (if-let* ((existing (erc--find-ignore-timer user
(current-buffer))))
(timer-set-time existing (timer-relative-time nil timeout))
(run-at-time timeout nil #'erc--unignore-user user
(current-buffer))))
@@ -4442,11 +4442,11 @@ of `erc-ignore-list'."
(erc-with-server-buffer
(let ((seen (copy-sequence erc-ignore-list)))
(dolist (timer timer-list)
- (when-let ((args (erc--get-ignore-timer-args timer))
- ((eq (current-buffer) (nth 1 args)))
- (user (car args))
- (delta (- (timer-until timer (current-time))))
- (duration (erc--format-time-period delta)))
+ (when-let* ((args (erc--get-ignore-timer-args timer))
+ ((eq (current-buffer) (nth 1 args)))
+ (user (car args))
+ (delta (- (timer-until timer (current-time))))
+ (duration (erc--format-time-period delta)))
(setq seen (delete user seen))
(erc-display-message nil 'notice 'active 'ignore-list
?p user ?s duration)))
@@ -4477,7 +4477,7 @@ of `erc-ignore-list'."
(erc-display-message nil 'notice 'active
(format "No longer ignoring %s" user))
(setq erc-ignore-list (delete user erc-ignore-list))
- (when-let ((existing (erc--find-ignore-timer user buffer)))
+ (when-let* ((existing (erc--find-ignore-timer user buffer)))
(cancel-timer existing)))))
(defvar erc--clear-function #'delete-region
@@ -5249,7 +5249,7 @@ Display the query buffer in accordance with
`erc-interactive-display'."
(erc--display-context `((erc-interactive-display . /QUERY)
,@erc--display-context)))
(erc-with-server-buffer
- (if-let ((buffer (erc-get-buffer user erc-server-process)))
+ (if-let* ((buffer (erc-get-buffer user erc-server-process)))
(prog1 buffer
(erc-setup-buffer buffer))
(prog1 (erc--open-target user) ; becomes current buffer
@@ -5654,9 +5654,9 @@ When uninitialized or with option -f, resync
`erc-channel-banlist'."
(when (< maxw (+ rw lw)) ; scale down when capped
(cl-psetq rw (/ (* rw maxw) (* 1.0 (+ rw lw)))
lw (/ (* lw maxw) (* 1.0 (+ rw lw)))))
- (when-let ((larger (max rw lw)) ; cap ratio at 3:1
- (wavg (* maxw 0.75))
- ((> larger wavg)))
+ (when-let* ((larger (max rw lw)) ; cap ratio at 3:1
+ (wavg (* maxw 0.75))
+ ((> larger wavg)))
(setq rw (if (eql larger rw) wavg (- maxw wavg))
lw (- maxw rw)))
(cl-psetq rw (+ rw (* erc-banlist-fill-padding
@@ -6386,8 +6386,8 @@ with `erc--spkr' in the \"msg prop\" environment for any
imminent
`erc-display-message' invocations, and include any overrides defined in
`erc--message-speaker-catalog'. Expect NICK (but not necessarily DISP)
to be absent of any existing text properties."
- (when-let ((erc-server-process)
- (cusr (erc-get-server-user nick)))
+ (when-let* ((erc-server-process)
+ (cusr (erc-get-server-user nick)))
(setq nick (erc-server-user-nickname cusr)))
(erc--ensure-spkr-prop nick (get erc--message-speaker-catalog
'erc--msg-prop-overrides))
@@ -6554,14 +6554,14 @@ similar to that performed by `erc-format-my-nick', but
use either
`erc--message-speaker-input-query-privmsg' as a formatting
template, with MESSAGE being the actual message body. Return a
copy with possibly shared text-property values."
- (if-let ((erc-show-my-nick)
- (nick (erc-current-nick))
- (pfx (erc-get-channel-membership-prefix nick))
- (erc-current-message-catalog erc--message-speaker-catalog)
- (key (if (or erc-format-query-as-channel-p
- (erc--target-channel-p erc--target))
- 'input-chan-privmsg
- 'input-query-privmsg)))
+ (if-let* ((erc-show-my-nick)
+ (nick (erc-current-nick))
+ (pfx (erc-get-channel-membership-prefix nick))
+ (erc-current-message-catalog erc--message-speaker-catalog)
+ (key (if (or erc-format-query-as-channel-p
+ (erc--target-channel-p erc--target))
+ 'input-chan-privmsg
+ 'input-query-privmsg)))
(progn
(cond (erc--msg-props (puthash 'erc--msg key erc--msg-props))
(erc--msg-prop-overrides (push (cons 'erc--msg key)
@@ -7194,7 +7194,7 @@ extensions."
(let ((names (delete "" (split-string names-string)))
(erc-channel-members-changed-hook nil))
(dolist (name names)
- (when-let ((args (erc--partition-prefixed-names name)))
+ (when-let* ((args (erc--partition-prefixed-names name)))
(pcase-let* ((`(,status ,nick ,login ,host) args)
(cmem (erc-get-channel-user nick)))
(progn
@@ -8190,10 +8190,10 @@ ERC prints them as a single message joined by
newlines.")
(let* ((str (erc-user-input))
(state (erc--make-input-split str)))
(run-hook-with-args 'erc--input-review-functions state)
- (when-let (((not (erc--input-split-abortp state)))
- (inhibit-read-only t)
- (erc--current-line-input-split state)
- (old-buf (current-buffer)))
+ (when-let* (((not (erc--input-split-abortp state)))
+ (inhibit-read-only t)
+ (erc--current-line-input-split state)
+ (old-buf (current-buffer)))
(progn ; unprogn this during next major surgery
(erc-set-active-buffer (current-buffer))
;; Kill the input and the prompt
@@ -9187,12 +9187,12 @@ This should be a string with substitution variables
recognized by
"Return the network or the current target and network combined.
If the name of the network is not available, then use the
shortened server name instead."
- (if-let ((erc--target)
- (name (if-let ((erc-networks--id)
- (esid (erc-networks--id-symbol erc-networks--id)))
- (symbol-name esid)
- (erc-shorten-server-name (or erc-server-announced-name
- erc-session-server)))))
+ (if-let* ((erc--target)
+ (name (if-let* ((erc-networks--id)
+ (esid (erc-networks--id-symbol erc-networks--id)))
+ (symbol-name esid)
+ (erc-shorten-server-name (or erc-server-announced-name
+ erc-session-server)))))
(concat (erc--target-string erc--target) "@" name)
(buffer-name)))
@@ -9773,8 +9773,8 @@ one of the following hooks:
`erc-kill-channel-hook' if a channel buffer was killed,
or `erc-kill-buffer-hook' if any other buffer."
(when (eq major-mode 'erc-mode)
- (when-let ((erc--target)
- (nick (erc-current-nick)))
+ (when-let* ((erc--target)
+ (nick (erc-current-nick)))
(erc--remove-channel-users-but nick))
(cond
((eq (erc-server-buffer) (current-buffer))
@@ -9829,10 +9829,10 @@ This function should be on `erc-kill-server-hook'."
(defun erc-restore-text-properties ()
"Ensure the `erc-parsed' and `tags' props cover the entire message."
- (when-let ((parsed-posn (erc-find-parsed-property))
+ (when-let* ((parsed-posn (erc-find-parsed-property))
(found (erc-get-parsed-vector parsed-posn)))
(put-text-property (point-min) (point-max) 'erc-parsed found)
- (when-let ((tags (get-text-property parsed-posn 'tags)))
+ (when-let* ((tags (get-text-property parsed-posn 'tags)))
(put-text-property (point-min) (point-max) 'tags tags))))
(defun erc-get-parsed-vector (point)
@@ -9858,7 +9858,7 @@ This function should be on `erc-kill-server-hook'."
See also `erc-message-type'."
;; IRC numerics are three-digit numbers, possibly with leading 0s.
;; To invert: (if (numberp o) (format "%03d" o) (symbol-name o))
- (if-let ((n (string-to-number command)) ((zerop n))) (intern command) n))
+ (if-let* ((n (string-to-number command)) ((zerop n))) (intern command) n))
;; Teach url.el how to open irc:// URLs with ERC.
;; To activate, customize `url-irc-function' to `url-irc-erc'.
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index e5bf8d5fe82..4f8f0c1c7e4 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -221,14 +221,14 @@ This is useful after manually editing the contents of the
file."
(defun eshell-maybe-replace-by-alias--which (command)
(unless (and eshell-prevent-alias-expansion
(member command eshell-prevent-alias-expansion))
- (when-let ((alias (eshell-lookup-alias command)))
+ (when-let* ((alias (eshell-lookup-alias command)))
(concat command " is an alias, defined as \"" (cadr alias) "\""))))
(defun eshell-maybe-replace-by-alias (command _args)
"Call COMMAND's alias definition, if it exists."
(unless (and eshell-prevent-alias-expansion
(member command eshell-prevent-alias-expansion))
- (when-let ((alias (eshell-lookup-alias command)))
+ (when-let* ((alias (eshell-lookup-alias command)))
(throw 'eshell-replace-command
`(let ((eshell-command-name ',eshell-last-command-name)
(eshell-command-arguments ',eshell-last-arguments)
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 42373b8b8c0..f4337872a8e 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -306,8 +306,8 @@ The result is a list of three elements:
(setq start-dir (pop globs))
(setq start-dir (file-name-as-directory ".")))
(while globs
- (if-let ((recurse (cdr (assoc (car globs)
- eshell-glob-recursive-alist))))
+ (if-let* ((recurse (cdr (assoc (car globs)
+ eshell-glob-recursive-alist))))
(if last-saw-recursion
(setcar result recurse)
(push recurse result)
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index a9274e7c60d..053ebf91dab 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -442,7 +442,7 @@ before the closing delimiter. This allows modifiers like
(error "Unknown %s name specified for modifier `%c'"
mod-type mod-char))
(lambda (file)
- (when-let ((attrs (file-attributes file)))
+ (when-let* ((attrs (file-attributes file)))
(= (nth attr-index attrs) ugid)))))
(defun eshell-pred-file-time (mod-char mod-type attr-index)
@@ -467,7 +467,7 @@ before the closing delimiter. This allows modifiers like
(list #'time-less-p
(lambda (a b) (time-less-p b a))
#'time-equal-p)))
- (if-let ((number (eshell-get-numeric-modifier-argument)))
+ (if-let* ((number (eshell-get-numeric-modifier-argument)))
(setq when (time-since (* number quantum)))
(let* ((file (or (eshell-get-delimited-modifier-argument)
(error "Malformed %s time modifier `%c'"
@@ -476,7 +476,7 @@ before the closing delimiter. This allows modifiers like
(error "Cannot stat file `%s'" file))))
(setq when (nth attr-index attrs))))
(lambda (file)
- (when-let ((attrs (file-attributes file)))
+ (when-let* ((attrs (file-attributes file)))
(funcall qual when (nth attr-index attrs))))))
(defun eshell-pred-file-type (type)
@@ -492,13 +492,13 @@ that `ls -l' will show in the first column of its
display."
'(?b ?c)
(list type))))
(lambda (file)
- (when-let ((attrs (eshell-file-attributes (directory-file-name file))))
+ (when-let* ((attrs (eshell-file-attributes (directory-file-name file))))
(memq (aref (file-attribute-modes attrs) 0) set)))))
(defsubst eshell-pred-file-mode (mode)
"Return a test which tests that MODE pertains to the file."
(lambda (file)
- (when-let ((modes (file-modes file 'nofollow)))
+ (when-let* ((modes (file-modes file 'nofollow)))
(not (zerop (logand mode modes))))))
(defun eshell-pred-file-links ()
@@ -507,7 +507,7 @@ that `ls -l' will show in the first column of its display."
(amount (or (eshell-get-numeric-modifier-argument)
(error "Invalid file link count modifier `l'"))))
(lambda (file)
- (when-let ((attrs (eshell-file-attributes file)))
+ (when-let* ((attrs (eshell-file-attributes file)))
(funcall qual (file-attribute-link-number attrs) amount)))))
(defun eshell-pred-file-size ()
@@ -528,7 +528,7 @@ that `ls -l' will show in the first column of its display."
(error "Invalid file size modifier `L'"))
quantum))
(lambda (file)
- (when-let ((attrs (eshell-file-attributes file)))
+ (when-let* ((attrs (eshell-file-attributes file)))
(funcall qual (file-attribute-size attrs) amount)))))
(defun eshell-pred-substitute (&optional repeat)
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 7de2bd4dc21..de62b5c7d97 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -178,8 +178,8 @@ Like `forward-paragraph', but also stops at the beginning
of each prompt."
(while (and (> n 0) (< (point) (point-max)))
(let ((next-paragraph (save-excursion (forward-paragraph) (point)))
(next-prompt (save-excursion
- (if-let ((match (text-property-search-forward
- 'field 'prompt t t)))
+ (if-let* ((match (text-property-search-forward
+ 'field 'prompt t t)))
(prop-match-beginning match)
(point-max)))))
(goto-char (min next-paragraph next-prompt)))
@@ -212,7 +212,7 @@ Like `backward-paragraph', but navigates using fields."
(pcase (get-text-property (point) 'field)
('command-output)
('prompt (goto-char (field-end)))
- (_ (when-let ((match (text-property-search-backward 'field 'prompt t)))
+ (_ (when-let* ((match (text-property-search-backward 'field 'prompt t)))
(goto-char (prop-match-end match)))))
;; Now, move forward/backward to our destination prompt.
(if (natnump n)
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 4ea25f7f202..ebecb279753 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -292,8 +292,8 @@ then the result will be:
"If there are pending modifications to be made, make them now."
(when eshell-current-argument
(when eshell-arg-listified
- (if-let ((grouped-terms (eshell-prepare-splice
- eshell-current-argument)))
+ (if-let* ((grouped-terms (eshell-prepare-splice
+ eshell-current-argument)))
(setq eshell-current-argument
`(eshell-splice-args
(eshell-concat-groups ,eshell-current-quoted
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 137abe6eb75..a8a19d2bcc9 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1317,8 +1317,8 @@ have been replaced by constants."
(setcar form (car new-form))
(setcdr form (cdr new-form)))
(eshell-do-eval form synchronous-p))
- (if-let (((memq (car form) eshell-deferrable-commands))
- (procs (eshell-make-process-list result)))
+ (if-let* (((memq (car form) eshell-deferrable-commands))
+ (procs (eshell-make-process-list result)))
(if synchronous-p
(funcall #'eshell-wait-for-processes procs)
(eshell-manipulate form "inserting ignore form"
@@ -1341,9 +1341,9 @@ have been replaced by constants."
(run-hook-wrapped
'eshell-named-command-hook
(lambda (hook)
- (when-let (((symbolp hook))
- (which-func (get hook 'eshell-which-function))
- (result (funcall which-func command)))
+ (when-let* (((symbolp hook))
+ (which-func (get hook 'eshell-which-function))
+ (result (funcall which-func command)))
(throw 'found result))))
(eshell-plain-command--which name)))
(error (eshell-error (format "which: %s\n" (cadr error)))))))
@@ -1407,7 +1407,7 @@ COMMAND may result in an alias being executed, or a plain
command."
sym)))
(defun eshell-plain-command--which (command)
- (if-let ((sym (eshell--find-plain-lisp-command command)))
+ (if-let* ((sym (eshell--find-plain-lisp-command command)))
(or (with-output-to-string
(require 'help-fns)
(princ (format "%s is " sym))
@@ -1419,7 +1419,7 @@ COMMAND may result in an alias being executed, or a plain
command."
"Insert output from a plain COMMAND, using ARGS.
COMMAND may result in either a Lisp function being executed by name,
or an external command."
- (if-let ((sym (eshell--find-plain-lisp-command command)))
+ (if-let* ((sym (eshell--find-plain-lisp-command command)))
(eshell-lisp-command sym args)
(eshell-external-command command args)))
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 443c39ff0d1..5c2b6b8d2ee 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -364,7 +364,7 @@ is not shared with the original handles."
(declare (advertised-calling-convention (handles) "31.1"))
(let ((dup-handles (make-vector eshell-number-of-handles nil)))
(dotimes (idx eshell-number-of-handles)
- (when-let ((handle (aref handles idx)))
+ (when-let* ((handle (aref handles idx)))
(unless steal-p
(cl-incf (cdar handle)))
(aset dup-handles idx (list (car handle) t))))
@@ -373,7 +373,7 @@ is not shared with the original handles."
(defun eshell-protect-handles (handles)
"Protect the handles in HANDLES from a being closed."
(dotimes (idx eshell-number-of-handles)
- (when-let ((handle (aref handles idx)))
+ (when-let* ((handle (aref handles idx)))
(cl-incf (cdar handle))))
handles)
@@ -608,7 +608,7 @@ If TARGET is a virtual target (see
`eshell-virtual-targets'),
return an `eshell-generic-target' instance; otherwise, return a
marker for a file named TARGET."
(setq mode (or mode 'insert))
- (if-let ((redir (assoc raw-target eshell-virtual-targets)))
+ (if-let* ((redir (assoc raw-target eshell-virtual-targets)))
(let (target)
(catch 'eshell-null-device
(setq target (if (nth 2 redir)
@@ -699,7 +699,7 @@ If status is nil, prompt before killing."
(cl-defmethod eshell-close-target ((target eshell-function-target) status)
"Close an Eshell function TARGET."
- (when-let ((close-function (eshell-function-target-close-function target)))
+ (when-let* ((close-function (eshell-function-target-close-function target)))
(funcall close-function status)))
(cl-defgeneric eshell-output-object-to-target (object target)
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 87c95d39603..4755996c40c 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -595,7 +595,7 @@ PROC is the process that's exiting. STRING is the exit
message."
"buffer for external process `%s' already killed"
proc)))))
(funcall finish-io)))
- (when-let ((entry (assq proc eshell-process-list)))
+ (when-let* ((entry (assq proc eshell-process-list)))
(eshell-remove-process-entry entry))))))
(defun eshell-process-interact (func &optional all query)
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index e3ff76abc26..dc0bc4532de 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -567,7 +567,7 @@ Possible variable references are:
(list (function
(lambda ()
(delete-file ,temp)
- (when-let ((buffer (get-file-buffer ,temp)))
+ (when-let* ((buffer (get-file-buffer ,temp)))
(kill-buffer buffer)))))))
(eshell-apply-indices ,temp indices ,eshell-current-quoted))
(goto-char (1+ end))))))
@@ -587,11 +587,11 @@ Possible variable references are:
(or (eshell-unescape-inner-double-quote (point-max))
(cons (point) (point-max)))
(let (name)
- (when-let ((delim
- (catch 'eshell-incomplete
- (ignore (setq name (if (eq (char-after) ?\')
- (eshell-parse-literal-quote)
- (eshell-parse-double-quote)))))))
+ (when-let* ((delim
+ (catch 'eshell-incomplete
+ (ignore (setq name (if (eq (char-after) ?\')
+ (eshell-parse-literal-quote)
+ (eshell-parse-double-quote)))))))
(throw 'eshell-incomplete (concat "$" delim)))
(when name
`(eshell-get-variable ,(eval name) indices
,eshell-current-quoted)))))
@@ -676,7 +676,7 @@ INDICES is a list of index-lists generated by
`eshell-parse-indices'."
"Get the value for the variable NAME.
INDICES is a list of index-lists (see `eshell-parse-indices').
If QUOTED is non-nil, this was invoked inside double-quotes."
- (if-let ((alias (assoc name eshell-variable-aliases-list)))
+ (if-let* ((alias (assoc name eshell-variable-aliases-list)))
(let ((target (nth 1 alias)))
(when (and (not (functionp target))
(consp target))
@@ -715,7 +715,7 @@ If QUOTED is non-nil, this was invoked inside
double-quotes."
NAME can be a string (in which case it refers to an environment
variable or variable alias) or a symbol (in which case it refers
to a Lisp variable)."
- (if-let ((alias (assoc name eshell-variable-aliases-list)))
+ (if-let* ((alias (assoc name eshell-variable-aliases-list)))
(let ((target (nth 1 alias)))
(cond
((functionp target)
diff --git a/lisp/faces.el b/lisp/faces.el
index 21c3e663c6e..de4f3a9f92b 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2097,7 +2097,7 @@ do that, use `get-text-property' and `get-char-property'."
(let (faces)
(when text
;; Try to get a face name from the buffer.
- (when-let ((face (thing-at-point 'face)))
+ (when-let* ((face (thing-at-point 'face)))
(push face faces)))
;; Add the named faces that the `read-face-name' or `face' property uses.
(let ((faceprop (or (get-char-property (point) 'read-face-name)
diff --git a/lisp/ffap.el b/lisp/ffap.el
index e431aeed8b1..6a4915fb5a3 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -805,7 +805,7 @@ to extract substrings.")
(declare-function project-root "project" (project))
(defun ffap-in-project (name)
- (when-let (project (project-current))
+ (when-let* ((project (project-current)))
(file-name-concat (project-root project) name)))
(defun ffap-home (name) (ffap-locate-file name t '("~")))
diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 4e289d564c9..89711e6ca8a 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -76,7 +76,7 @@ struct.")
"Remove DESCRIPTOR from `file-notify-descriptors'.
DESCRIPTOR should be an object returned by `file-notify-add-watch'.
If it is registered in `file-notify-descriptors', a `stopped' event is sent."
- (when-let ((watch (gethash descriptor file-notify-descriptors)))
+ (when-let* ((watch (gethash descriptor file-notify-descriptors)))
(unwind-protect
;; Send `stopped' event.
(file-notify-handle-event
diff --git a/lisp/files-x.el b/lisp/files-x.el
index f70be5f7ff3..c55164235df 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -552,7 +552,7 @@ Returns the filename, expanded."
(read-file-name
"File: "
(cond (dir)
- ((when-let ((proj (and (featurep 'project) (project-current))))
+ ((when-let* ((proj (and (featurep 'project) (project-current))))
(project-root proj))))
nil
(lambda (fname)
@@ -784,8 +784,8 @@ whose elements are of the form (VAR . VALUE).
Unlike `connection-local-set-profile-variables' (which see), this
function preserves the values of any existing variable
definitions that aren't listed in VARIABLES."
- (when-let ((existing-variables
- (nreverse (connection-local-get-profile-variables profile))))
+ (when-let* ((existing-variables
+ (nreverse (connection-local-get-profile-variables profile))))
(dolist (var variables)
(setf (alist-get (car var) existing-variables) (cdr var)))
(setq variables (nreverse existing-variables)))
@@ -959,7 +959,7 @@ value is the default binding of the variable."
(if (not criteria)
,variable
(hack-connection-local-variables criteria)
- (if-let ((result (assq ',variable connection-local-variables-alist)))
+ (if-let* ((result (assq ',variable connection-local-variables-alist)))
(cdr result)
,variable))))
diff --git a/lisp/files.el b/lisp/files.el
index 6fc9ae2f1a2..114ddc9c259 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1340,7 +1340,7 @@ Tip: You can use this expansion of remote identifier
components
returns a remote file name for file \"/bin/sh\" that has the
same remote identifier as FILE but expanded; a name such as
\"/sudo:root@myhost:/bin/sh\"."
- (when-let ((handler (find-file-name-handler file 'file-remote-p)))
+ (when-let* ((handler (find-file-name-handler file 'file-remote-p)))
(funcall handler 'file-remote-p file identification connected)))
;; Probably this entire variable should be obsolete now, in favor of
@@ -2196,7 +2196,7 @@ if you want to permanently change your home directory
after having
started Emacs, set `abbreviated-home-dir' to nil so it will be recalculated)."
;; Get rid of the prefixes added by the automounter.
(save-match-data ;FIXME: Why?
- (if-let ((handler (find-file-name-handler filename 'abbreviate-file-name)))
+ (if-let* ((handler (find-file-name-handler filename
'abbreviate-file-name)))
(funcall handler 'abbreviate-file-name filename)
;; Avoid treating /home/foo as /home/Foo during `~' substitution.
(let ((case-fold-search (file-name-case-insensitive-p filename)))
@@ -3531,7 +3531,7 @@ we don't actually set it to the same mode the buffer
already has."
;; If we didn't, look for an interpreter specified in the first line.
;; As a special case, allow for things like "#!/bin/env perl", which
;; finds the interpreter anywhere in $PATH.
- (when-let
+ (when-let*
((interp (save-excursion
(goto-char (point-min))
(if (looking-at auto-mode-interpreter-regexp)
@@ -4160,7 +4160,7 @@ all the specified local variables, but ignores any
settings of \"mode:\"."
;; Handle `lexical-binding' and other special local
;; variables.
(dolist (variable permanently-enabled-local-variables)
- (when-let ((elem (assq variable result)))
+ (when-let* ((elem (assq variable result)))
(push elem file-local-variables-alist)))
(hack-local-variables-apply))))))
@@ -6938,8 +6938,8 @@ buffer read-only, or keeping minor modes, etc.")
(defun revert-buffer-restore-read-only ()
"Preserve read-only state for `revert-buffer'."
- (when-let ((state (and (boundp 'read-only-mode--state)
- (list read-only-mode--state))))
+ (when-let* ((state (and (boundp 'read-only-mode--state)
+ (list read-only-mode--state))))
(lambda ()
(setq buffer-read-only (car state))
(setq-local read-only-mode--state (car state)))))
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 5b4ee0d70aa..13c8bf722c3 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -431,9 +431,9 @@ specifies what to use in place of \"-ls\" as the final
argument."
"Sort entries in *Find* buffer by file name lexicographically."
(sort-subr nil 'forward-line 'end-of-line
(lambda ()
- (when-let ((start
- (next-single-property-change
- (point) 'dired-filename)))
+ (when-let* ((start
+ (next-single-property-change
+ (point) 'dired-filename)))
(buffer-substring-no-properties start (line-end-position))))))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 7b077a826bf..d2232f72c55 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1846,11 +1846,11 @@ See `font-lock-ignore' for the possible rules."
(defun font-lock--filter-keywords (keywords)
"Filter a list of KEYWORDS using `font-lock-ignore'."
- (if-let ((rules (mapcan (pcase-lambda (`(,mode . ,rules))
- (when (or (and (boundp mode) mode)
- (derived-mode-p mode))
- (copy-sequence rules)))
- font-lock-ignore)))
+ (if-let* ((rules (mapcan (pcase-lambda (`(,mode . ,rules))
+ (when (or (and (boundp mode) mode)
+ (derived-mode-p mode))
+ (copy-sequence rules)))
+ font-lock-ignore)))
(seq-filter (lambda (keyword) (not (font-lock--match-keyword
`(or ,@rules) keyword)))
keywords)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5151ad1c1b8..8243e4e632b 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2419,8 +2419,8 @@ fill width."
(defun article-emojize-symbols ()
"Display symbols (that have an emoji version) as emojis."
(interactive nil gnus-article-mode)
- (when-let ((font (and (display-multi-font-p)
- (car (internal-char-font nil ?😀)))))
+ (when-let* ((font (and (display-multi-font-p)
+ (car (internal-char-font nil ?😀)))))
(save-excursion
(let ((inhibit-read-only t))
(goto-char (point-min))
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 558ad8648ca..b73fa268da2 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -357,7 +357,7 @@ If it is down, start it up (again)."
(funcall (gnus-get-function gnus-command-method 'close-server)
(nth 1 gnus-command-method)
(nthcdr 2 gnus-command-method))
- (when-let ((elem (assoc gnus-command-method gnus-opened-servers)))
+ (when-let* ((elem (assoc gnus-command-method gnus-opened-servers)))
(setf (nth 1 elem) 'closed)))))
(defun gnus-request-list (command-method)
diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el
index c25163ac770..ca82546ef82 100644
--- a/lisp/gnus/gnus-search.el
+++ b/lisp/gnus/gnus-search.el
@@ -1012,7 +1012,7 @@ Responsible for handling and, or, and parenthetical
expressions.")
(let (clauses)
(mapc
(lambda (item)
- (when-let ((expr (gnus-search-transform-expression engine item)))
+ (when-let* ((expr (gnus-search-transform-expression engine item)))
(push expr clauses)))
query)
(mapconcat #'identity (reverse clauses) " ")))
@@ -1486,7 +1486,7 @@ Returns a list of [group article score] vectors."
(push (list f-name article group score)
artlist)))))
;; Are we running an additional grep query?
- (when-let ((grep-reg (alist-get 'grep query)))
+ (when-let* ((grep-reg (alist-get 'grep query)))
(setq artlist (gnus-search-grep-search engine artlist grep-reg)))
(when (>= gnus-verbose 7)
@@ -1717,9 +1717,9 @@ cross our fingers for the rest of it."
(let (clauses)
(mapc
(lambda (item)
- (when-let ((expr (if (consp (car-safe item))
- (gnus-search-transform engine item)
- (gnus-search-transform-expression engine item))))
+ (when-let* ((expr (if (consp (car-safe item))
+ (gnus-search-transform engine item)
+ (gnus-search-transform-expression engine item))))
(push expr clauses)))
query)
(mapconcat #'identity (reverse clauses) " ")))
@@ -2141,8 +2141,8 @@ remaining string, then adds all that to the top-level
spec."
(assoc-string srv gnus-search-engine-instance-alist t))
(nth 1 engine-config)
(cdr-safe (assoc (car method) gnus-search-default-engines))
- (when-let ((old (assoc 'nnir-search-engine
- (cddr method))))
+ (when-let* ((old (assoc 'nnir-search-engine
+ (cddr method))))
(nnheader-message
8 "\"nnir-search-engine\" is no longer a valid
parameter")
(nth 1 old))))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 33582ce5dbf..cebeb6d4c37 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9374,9 +9374,9 @@ The 1st element is the button named by
`gnus-collect-urls-primary-text'."
(let ((pt (point)) urls primary)
(while (forward-button 1 nil nil t)
(setq pt (point))
- (when-let ((w (button-at pt))
- (u (or (button-get w 'shr-url)
- (get-text-property pt 'gnus-string))))
+ (when-let* ((w (button-at pt))
+ (u (or (button-get w 'shr-url)
+ (get-text-property pt 'gnus-string))))
(when (string-match-p "\\`[[:alpha:]]+://" u)
(if (and gnus-collect-urls-primary-text (null primary)
(string= gnus-collect-urls-primary-text (button-label w)))
@@ -9404,7 +9404,7 @@ See `gnus-collect-urls'."
(let* ((parsed (url-generic-parse-url url))
(host (url-host parsed))
(rest (concat (url-filename parsed)
- (when-let ((target (url-target parsed)))
+ (when-let* ((target (url-target parsed)))
(concat "#" target)))))
(concat host (string-truncate-left rest (- max (length host)))))))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index f1fc129a505..62a090bd9df 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3119,9 +3119,9 @@ g -- Group name."
"Check whether GROUP supports function FUNC.
GROUP can either be a string (a group name) or a select method."
(ignore-errors
- (when-let ((method (if (stringp group)
- (car (gnus-find-method-for-group group))
- group)))
+ (when-let* ((method (if (stringp group)
+ (car (gnus-find-method-for-group group))
+ group)))
(unless (featurep method)
(require method))
(fboundp (intern (format "%s-%s" method func))))))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d52ed9662a7..b49e3f9d9ca 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4934,8 +4934,8 @@ If you always want Gnus to send messages in one piece, set
(let ((addr (message-fetch-field hdr)))
(when (stringp addr)
(dolist (address (mail-header-parse-addresses addr t))
- (when-let ((warning (textsec-suspicious-p
- address 'email-address-header)))
+ (when-let* ((warning (textsec-suspicious-p
+ address 'email-address-header)))
(unless (y-or-n-p
(format "Suspicious address: %s; send anyway?"
warning))
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 8ecf7a33305..70cefe5bb49 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -507,7 +507,7 @@ type detected."
(when (and (consp (car cont))
(= (length cont) 1)
content-type)
- (when-let ((spec (assq 'type (cdr (car cont)))))
+ (when-let* ((spec (assq 'type (cdr (car cont)))))
(setcdr spec content-type)))
(when (fboundp 'libxml-parse-html-region)
(setq cont (mapcar #'mml-expand-all-html-into-multipart-related cont)))
@@ -943,7 +943,7 @@ type detected."
(when parameters
(let ((cont (copy-sequence cont)))
;; Set the file name to what's specified by the user.
- (when-let ((recipient-filename (cdr (assq 'recipient-filename cont))))
+ (when-let* ((recipient-filename (cdr (assq 'recipient-filename
cont))))
(setcdr cont
(cons (cons 'filename recipient-filename)
(cdr cont))))
diff --git a/lisp/gnus/nnatom.el b/lisp/gnus/nnatom.el
index f6885abb634..a9f6b9179de 100644
--- a/lisp/gnus/nnatom.el
+++ b/lisp/gnus/nnatom.el
@@ -56,12 +56,12 @@
(insert-file-contents feed)
(mm-url-insert-file-contents (concat "https://"; feed)))
(file-error (nnheader-report nnatom-backend (cdr e)))
- (:success (when-let ((data (if (libxml-available-p)
- (libxml-parse-xml-region
- (point-min) (point-max))
- (car (xml-parse-region
- (point-min) (point-max)))))
- (authors (list 'authors)))
+ (:success (when-let* ((data (if (libxml-available-p)
+ (libxml-parse-xml-region
+ (point-min) (point-max))
+ (car (xml-parse-region
+ (point-min) (point-max)))))
+ (authors (list 'authors)))
(when (eq (car data) 'top)
(setq data (assq 'feed data)))
(dom-add-child-before data authors)
@@ -93,8 +93,8 @@
(when (eq (car data) 'feed) (setq data (dom-children data)))
;; Discard any children between/after entries.
(while (and data (not (eq (car-safe (car data)) 'entry))) (pop data))
- (when-let ((article (car data))
- (auths (list 'authors)) (links (list 'links)))
+ (when-let* ((article (car data))
+ (auths (list 'authors)) (links (list 'links)))
(dom-add-child-before article links)
(dom-add-child-before article auths)
(dolist (child (cddddr article) `(,article . ,(cdr data)))
@@ -126,7 +126,7 @@
(defun nnatom--read-article-or-group-authors (article-or-group)
"Return the authors of ARTICLE-OR-GROUP, or nil."
- (when-let
+ (when-let*
((a (mapconcat
(lambda (author)
(let* ((name (nnatom--dom-line (dom-child-by-tag author 'name)))
@@ -161,14 +161,14 @@ return the subject. Otherwise, return nil."
(defun nnatom--read-publish (article)
"Return the date and time ARTICLE was published, or nil."
- (when-let (d (dom-child-by-tag article 'published))
+ (when-let* ((d (dom-child-by-tag article 'published)))
(date-to-time (nnatom--dom-line d))))
(defvoo nnatom-read-publish-date-function #'nnatom--read-publish
nil nnfeed-read-publish-date-function)
(defun nnatom--read-update (article)
"Return the date and time of the last update to ARTICLE, or nil."
- (when-let (d (dom-child-by-tag article 'updated))
+ (when-let* ((d (dom-child-by-tag article 'updated)))
(date-to-time (nnatom--dom-line d))))
(defvoo nnatom-read-update-date-function #'nnatom--read-update
nil nnfeed-read-update-date-function)
@@ -178,56 +178,56 @@ return the subject. Otherwise, return nil."
(let ((alt 0) (rel 0) (sel 0) (enc 0) (via 0) (aut 0))
(mapcan
(lambda (link)
- (when-let ((l (car-safe link)))
+ (when-let* ((l (car-safe link)))
(or
- (when-let (((eq l 'content))
- (src (dom-attr link 'src))
- (label (concat "Link"
- (and (< 1 (cl-incf alt))
- (format " %s" alt)))))
+ (when-let* (((eq l 'content))
+ (src (dom-attr link 'src))
+ (label (concat "Link"
+ (and (< 1 (cl-incf alt))
+ (format " %s" alt)))))
`(((("text/plain") . ,(format "%s: %s\n" label src))
(("text/html") . ,(format "<a href=\"%s\">[%s]</a> "
src label)))))
- (when-let (((or (eq l 'author) (eq l 'contributor)))
- (name (nnatom--dom-line (dom-child-by-tag link 'name)))
- (name (if (string-blank-p name)
- (concat "Author"
- (and (< 1 (cl-incf aut))
- (format " %s" aut)))
- name))
- (uri (nnatom--dom-line (dom-child-by-tag link 'uri)))
- ((not (string-blank-p uri))))
+ (when-let* (((or (eq l 'author) (eq l 'contributor)))
+ (name (nnatom--dom-line (dom-child-by-tag link 'name)))
+ (name (if (string-blank-p name)
+ (concat "Author"
+ (and (< 1 (cl-incf aut))
+ (format " %s" aut)))
+ name))
+ (uri (nnatom--dom-line (dom-child-by-tag link 'uri)))
+ ((not (string-blank-p uri))))
`(((("text/plain") . ,(format "%s: %s\n" name uri))
(("text/html") . ,(format "<a href=\"%s\">[%s]</a> "
uri name)))))
- (when-let (((eq l 'link))
- (attrs (dom-attributes link))
- (label (or (cdr (assq 'title attrs))
- (pcase (cdr (assq 'rel attrs))
- ("related"
- (concat "Related"
- (and (< 1 (cl-incf rel))
- (format " %s" rel))))
- ("self"
- (concat "More"
- (and (< 1 (cl-incf sel))
- (format " %s" sel))))
- ("enclosure"
- (concat "Enclosure"
- (and (< 1 (cl-incf enc))
- (format " %s" enc))))
- ("via"
- (concat "Source"
- (and (< 1 (cl-incf via))
- (format " %s" via))))
- (_ (if-let
- ((lang (cdr (assq 'hreflang link))))
- (format "Link (%s)" lang)
- (concat
- "Link"
- (and (< 1 (cl-incf alt))
- (format " %s" alt))))))))
- (link (cdr (assq 'href attrs))))
+ (when-let* (((eq l 'link))
+ (attrs (dom-attributes link))
+ (label (or (cdr (assq 'title attrs))
+ (pcase (cdr (assq 'rel attrs))
+ ("related"
+ (concat "Related"
+ (and (< 1 (cl-incf rel))
+ (format " %s" rel))))
+ ("self"
+ (concat "More"
+ (and (< 1 (cl-incf sel))
+ (format " %s" sel))))
+ ("enclosure"
+ (concat "Enclosure"
+ (and (< 1 (cl-incf enc))
+ (format " %s" enc))))
+ ("via"
+ (concat "Source"
+ (and (< 1 (cl-incf via))
+ (format " %s" via))))
+ (_ (if-let*
+ ((lang (cdr (assq 'hreflang link))))
+ (format "Link (%s)" lang)
+ (concat
+ "Link"
+ (and (< 1 (cl-incf alt))
+ (format " %s" alt))))))))
+ (link (cdr (assq 'href attrs))))
`(((("text/plain") . ,(format "%s: %s\n" label link))
(("text/html") . ,(format "<a href=\"%s\">[%s]</a> "
link label))))))))
diff --git a/lisp/gnus/nnfeed.el b/lisp/gnus/nnfeed.el
index 2d33d4c813b..e8c1fdb8e2b 100644
--- a/lisp/gnus/nnfeed.el
+++ b/lisp/gnus/nnfeed.el
@@ -277,8 +277,8 @@ group names to their data, which should be a vector of the
form
(defun nnfeed--read-server (server)
"Read SERVER's information from storage."
- (if-let ((f (nnfeed--server-file server))
- ((file-readable-p f)))
+ (if-let* ((f (nnfeed--server-file server))
+ ((file-readable-p f)))
(with-temp-buffer
(insert-file-contents f)
(goto-char (point-min))
@@ -287,10 +287,10 @@ group names to their data, which should be a vector of
the form
(defun nnfeed--write-server (server)
"Write SERVER's information to storage."
- (if-let ((f (nnfeed--server-file server))
- ((file-writable-p f)))
- (if-let ((s (gethash server nnfeed-servers))
- ((hash-table-p s)))
+ (if-let* ((f (nnfeed--server-file server))
+ ((file-writable-p f)))
+ (if-let* ((s (gethash server nnfeed-servers))
+ ((hash-table-p s)))
(with-temp-file f
(insert ";;;; -*- mode: lisp-data -*- DO NOT EDIT\n")
(prin1 s (current-buffer))
@@ -346,8 +346,8 @@ If GROUP is omitted or nil, parse the entire FEED."
(and desc (aset g 5 desc))
(while-let ((article (funcall nnfeed-read-article-function cg stale))
(article (prog1 (car article) (setq cg (cdr article)))))
- (when-let ((id (funcall nnfeed-read-id-function article))
- (id (format "<%s@%s.%s>" id name nnfeed-backend)))
+ (when-let* ((id (funcall nnfeed-read-id-function article))
+ (id (format "<%s@%s.%s>" id name nnfeed-backend)))
(let* ((num (gethash id ids))
(update (funcall nnfeed-read-update-date-function
article))
(prev-update (aref (gethash num articles
@@ -423,14 +423,14 @@ Each value in this table should be a vector of the form
(defun nnfeed--group-data (group server)
"Get parsed data for GROUP from SERVER."
- (when-let ((server (nnfeed--server-address server))
- (s (gethash server nnfeed-servers))
- ((hash-table-p s)))
+ (when-let* ((server (nnfeed--server-address server))
+ (s (gethash server nnfeed-servers))
+ ((hash-table-p s)))
(gethash group s)))
(defun nnfeed-retrieve-article (article group)
"Retrieve headers for ARTICLE from GROUP."
- (if-let ((a (gethash article (aref group 2))))
+ (if-let* ((a (gethash article (aref group 2))))
(insert (format "221 %s Article retrieved.
From: %s\nSubject: %s\nDate: %s\nMessage-ID: %s\n.\n"
article
@@ -441,10 +441,10 @@ From: %s\nSubject: %s\nDate: %s\nMessage-ID: %s\n.\n"
(insert "404 Article not found.\n.\n")))
(deffoo nnfeed-retrieve-headers (articles &optional group server _fetch-old)
- (if-let ((server (or server (nnfeed--current-server-no-prefix)))
- (g (or (nnfeed--group-data group server)
- `[ nil ,nnfeed-group-article-ids ,nnfeed-group-articles
- nil nil nil])))
+ (if-let* ((server (or server (nnfeed--current-server-no-prefix)))
+ (g (or (nnfeed--group-data group server)
+ `[ nil ,nnfeed-group-article-ids ,nnfeed-group-articles
+ nil nil nil])))
(with-current-buffer nntp-server-buffer
(erase-buffer)
(or (and (stringp (car articles))
@@ -513,27 +513,27 @@ by `nnfeed-read-parts-function'), and links (as returned
by
Only HEADERS of a type included in MIME are considered."
(concat
(mapconcat (lambda (header)
- (when-let ((m (car-safe header))
- ((member m mime)))
+ (when-let* ((m (car-safe header))
+ ((member m mime)))
(format "%s: %s\n" m (cdr header))))
headers)
"\n"
(funcall nnfeed-print-content-function content headers links)))
(deffoo nnfeed-request-article (article &optional group server to-buffer)
- (if-let ((server (or server (nnfeed--current-server-no-prefix)))
- (g (or (nnfeed--group-data group server)
- (and (setq group nnfeed-group)
- `[ nil ,nnfeed-group-article-ids
- ,nnfeed-group-articles
- ,nnfeed-group-article-max-num
- ,nnfeed-group-article-min-num nil])))
- (num (or (and (stringp article)
- (gethash article (aref g 1)))
- (and (numberp article) article)))
- ((and (<= num (aref g 3))
- (>= num (aref g 4))))
- (a (gethash num (aref g 2))))
+ (if-let* ((server (or server (nnfeed--current-server-no-prefix)))
+ (g (or (nnfeed--group-data group server)
+ (and (setq group nnfeed-group)
+ `[ nil ,nnfeed-group-article-ids
+ ,nnfeed-group-articles
+ ,nnfeed-group-article-max-num
+ ,nnfeed-group-article-min-num nil])))
+ (num (or (and (stringp article)
+ (gethash article (aref g 1)))
+ (and (numberp article) article)))
+ ((and (<= num (aref g 3))
+ (>= num (aref g 4))))
+ (a (gethash num (aref g 2))))
(with-current-buffer (or to-buffer nntp-server-buffer)
(erase-buffer)
(let* ((links (aref a 5))
@@ -575,12 +575,12 @@ Only HEADERS of a type included in MIME are considered."
(deffoo nnfeed-request-group (group &optional server fast _info)
(with-current-buffer nntp-server-buffer
(erase-buffer)
- (if-let ((server (or server (nnfeed--current-server-no-prefix)))
- (g (or (if fast (nnfeed--group-data group server)
- (setq server (nnfeed--parse-feed server group))
- (and (hash-table-p server) (gethash group server)))
- `[ ,group ,(make-hash-table :test 'equal)
- ,(make-hash-table :test 'eql) 0 1 ""])))
+ (if-let* ((server (or server (nnfeed--current-server-no-prefix)))
+ (g (or (if fast (nnfeed--group-data group server)
+ (setq server (nnfeed--parse-feed server group))
+ (and (hash-table-p server) (gethash group server)))
+ `[ ,group ,(make-hash-table :test 'equal)
+ ,(make-hash-table :test 'eql) 0 1 ""])))
(progn
(setq nnfeed-group group
nnfeed-group-article-ids (aref g 1)
@@ -608,10 +608,10 @@ Only HEADERS of a type included in MIME are considered."
(deffoo nnfeed-request-list (&optional server)
(with-current-buffer nntp-server-buffer
(erase-buffer)
- (when-let ((p (point))
- (s (nnfeed--parse-feed
- (or server (nnfeed--current-server-no-prefix))))
- ((hash-table-p s)))
+ (when-let* ((p (point))
+ (s (nnfeed--parse-feed
+ (or server (nnfeed--current-server-no-prefix))))
+ ((hash-table-p s)))
(maphash (lambda (group g)
(insert (format "\"%s\" %s %s y\n"
group (aref g 3) (aref g 4))))
@@ -634,12 +634,12 @@ Only HEADERS of a type included in MIME are considered."
;; separates the group name from the description with either a tab or a space.
(defun nnfeed--group-description (name group)
"Return a description line for a GROUP called NAME."
- (when-let ((desc (aref group 5))
- ((not (string-blank-p desc))))
+ (when-let* ((desc (aref group 5))
+ ((not (string-blank-p desc))))
(insert name "\t" desc "\n")))
(deffoo nnfeed-request-group-description (group &optional server)
- (when-let ((server (or server (nnfeed--current-server-no-prefix)))
+ (when-let* ((server (or server (nnfeed--current-server-no-prefix)))
(g (nnfeed--group-data group server)))
(with-current-buffer nntp-server-buffer
(erase-buffer)
@@ -647,38 +647,38 @@ Only HEADERS of a type included in MIME are considered."
t)))
(deffoo nnfeed-request-list-newsgroups (&optional server)
- (when-let ((server (or server (nnfeed--current-server-no-prefix)))
- (s (gethash (nnfeed--server-address server) nnfeed-servers))
- ((hash-table-p s)))
+ (when-let* ((server (or server (nnfeed--current-server-no-prefix)))
+ (s (gethash (nnfeed--server-address server) nnfeed-servers))
+ ((hash-table-p s)))
(with-current-buffer nntp-server-buffer
(erase-buffer)
(maphash #'nnfeed--group-description s)
t)))
(deffoo nnfeed-request-rename-group (group new-name &optional server)
- (when-let ((server (or server (nnfeed--current-server-no-prefix)))
- (a (nnfeed--server-address server))
- (s (or (gethash a nnfeed-servers)
- (and ; Open the server to add it to `nnfeed-servers'
- (save-match-data
- (nnfeed-open-server
- server
- (cdr ; Get defs and backend.
- (assoc a (cdr (assq nnfeed-backend nnoo-state-alist))
- (lambda (car key)
- (and (stringp car)
- (string-match
- (concat
- "\\`\\(\\(nn[[:alpha:]]+\\)\\+\\)?"
- (regexp-quote key) "\\'")
- car)
- (setq server car)))))
- (if (match-string 1 server)
- (intern (match-string 2 server)) 'nnfeed)))
- (gethash a nnfeed-servers))))
- (g (or (nnfeed--group-data group a)
- `[ ,group ,(make-hash-table :test 'equal)
- ,(make-hash-table :test 'eql) nil 1 ""])))
+ (when-let* ((server (or server (nnfeed--current-server-no-prefix)))
+ (a (nnfeed--server-address server))
+ (s (or (gethash a nnfeed-servers)
+ (and ; Open the server to add it to `nnfeed-servers'
+ (save-match-data
+ (nnfeed-open-server
+ server
+ (cdr ; Get defs and backend.
+ (assoc a (cdr (assq nnfeed-backend nnoo-state-alist))
+ (lambda (car key)
+ (and (stringp car)
+ (string-match
+ (concat
+ "\\`\\(\\(nn[[:alpha:]]+\\)\\+\\)?"
+ (regexp-quote key) "\\'")
+ car)
+ (setq server car)))))
+ (if (match-string 1 server)
+ (intern (match-string 2 server)) 'nnfeed)))
+ (gethash a nnfeed-servers))))
+ (g (or (nnfeed--group-data group a)
+ `[ ,group ,(make-hash-table :test 'equal)
+ ,(make-hash-table :test 'eql) nil 1 ""])))
(puthash new-name g s)
(puthash group new-name nnfeed-group-names)
(remhash group s)
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index e11d063f6ee..dbe0aba176f 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -554,10 +554,10 @@ as unread by Gnus.")
(mapcar
(lambda (art)
(cons art
- (when-let ((modtime
- (file-attribute-modification-time
- (file-attributes
- (concat dir (int-to-string art))))))
+ (when-let* ((modtime
+ (file-attribute-modification-time
+ (file-attributes
+ (concat dir (int-to-string art))))))
(time-convert modtime 'list))))
new)))
;; Make Gnus mark all new articles as unread.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index eb2c822aa30..c87c86bae84 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -325,7 +325,7 @@ handling of autoloaded functions."
(defun help-find-source ()
"Switch to a buffer visiting the source of what is being described in
*Help*."
(interactive)
- (if-let ((help-buffer (get-buffer "*Help*")))
+ (if-let* ((help-buffer (get-buffer "*Help*")))
(with-current-buffer help-buffer
(help-view-source))
(error "No *Help* buffer found")))
@@ -649,7 +649,7 @@ the C sources, too."
(lambda (entry level)
(when (symbolp map)
(setq map (symbol-function map)))
- (when-let ((elem (assq entry (cdr map))))
+ (when-let* ((elem (assq entry (cdr map))))
(when (> level 0)
(push sep string))
(if (eq (nth 1 elem) 'menu-item)
@@ -1003,8 +1003,8 @@ TYPE indicates the namespace and is `fun' or `var'."
(defun help-fns--mention-first-release (object type)
(when (symbolp object)
- (when-let ((first (or (help-fns--first-release-override object type)
- (help-fns--first-release object))))
+ (when-let* ((first (or (help-fns--first-release-override object type)
+ (help-fns--first-release object))))
(with-current-buffer standard-output
(insert (format " Probably introduced at or before Emacs version
%s.\n"
first))))))
@@ -1016,8 +1016,8 @@ TYPE indicates the namespace and is `fun' or `var'."
#'help-fns--mention-shortdoc-groups)
(defun help-fns--mention-shortdoc-groups (object)
(require 'shortdoc)
- (when-let ((groups (and (symbolp object)
- (shortdoc-function-groups object))))
+ (when-let* ((groups (and (symbolp object)
+ (shortdoc-function-groups object))))
(let ((start (point))
(times 0))
(with-current-buffer standard-output
@@ -1618,7 +1618,7 @@ it is displayed along with the global value."
(defun help-fns--customize-variable-version (variable)
(when (custom-variable-p variable)
;; Note variable's version or package version.
- (when-let ((output (describe-variable-custom-version-info variable)))
+ (when-let* ((output (describe-variable-custom-version-info variable)))
(princ output))))
(add-hook 'help-fns-describe-variable-functions #'help-fns--var-safe-local)
@@ -1864,7 +1864,7 @@ If FRAME is omitted or nil, use the selected frame."
(add-hook 'help-fns-describe-face-functions
#'help-fns--face-custom-version-info)
(defun help-fns--face-custom-version-info (face _frame)
- (when-let ((version-info (describe-variable-custom-version-info face 'face)))
+ (when-let* ((version-info (describe-variable-custom-version-info face
'face)))
(insert version-info)
(terpri)))
@@ -2223,7 +2223,7 @@ is enabled in the Help buffer."
(lambda (_)
(describe-function major))))
(insert " mode")
- (when-let ((file-name (find-lisp-object-file-name major nil)))
+ (when-let* ((file-name (find-lisp-object-file-name major nil)))
(insert (format " defined in %s:\n\n"
(buttonize
(help-fns-short-filename file-name)
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 6a808088cec..33b8eccab2c 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -646,7 +646,7 @@ that."
;; Quoted symbols
(save-excursion
(while (re-search-forward help-xref-symbol-regexp nil t)
- (when-let ((sym (intern-soft (match-string 9))))
+ (when-let* ((sym (intern-soft (match-string 9))))
(if (match-string 8)
(delete-region (match-beginning 8)
(match-end 8))
diff --git a/lisp/help.el b/lisp/help.el
index 5efe207c624..1617afdcd6e 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -883,8 +883,8 @@ If INSERT (the prefix arg) is non-nil, insert the message
in the buffer."
(let ((otherstring (help--key-description-fontified untranslated)))
(if (equal string otherstring)
string
- (if-let ((char-name (and (length= string 1)
- (char-to-name (aref string 0)))))
+ (if-let* ((char-name (and (length= string 1)
+ (char-to-name (aref string 0)))))
(format "%s '%s' (translated from %s)" string char-name
otherstring)
(format "%s (translated from %s)" string otherstring)))))))
@@ -1668,7 +1668,7 @@ Return nil if the key sequence is too long."
(cond ((or (stringp definition) (vectorp definition))
(if translation
(insert (concat (key-description definition nil)
- (when-let ((char-name (char-to-name (aref
definition 0))))
+ (when-let* ((char-name (char-to-name (aref
definition 0))))
(format "\t%s" char-name))
"\n"))
;; These should be rare nowadays, replaced by `kmacro's.
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index e9956222e9c..b500c664ff1 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -835,7 +835,7 @@ Loads the variable `hfy-rgb-txt-color-map', which is used by
(when (and rgb-txt
(file-readable-p rgb-txt))
(setq rgb-buffer (find-file-noselect rgb-txt 'nowarn))
- (when-let ((result (hfy-cmap--parse-buffer rgb-buffer)))
+ (when-let* ((result (hfy-cmap--parse-buffer rgb-buffer)))
(setq hfy-rgb-txt-color-map result))
(kill-buffer rgb-buffer))))
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 33b68b96ff2..4cbe3c4ba15 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -857,7 +857,7 @@ specification, with the same structure as an element of the
list
"Move point to the filter group whose name is NAME."
(interactive
(list (ibuffer-read-filter-group-name "Jump to filter group: ")))
- (if-let ((it (assoc name (ibuffer-current-filter-groups-with-position))))
+ (if-let* ((it (assoc name (ibuffer-current-filter-groups-with-position))))
(goto-char (cdr it))
(error "No filter group with name %s" name)))
@@ -868,7 +868,7 @@ The group will be added to
`ibuffer-filter-group-kill-ring'."
(interactive (list (ibuffer-read-filter-group-name "Kill filter group: " t)))
(when (equal name "Default")
(error "Can't kill default filter group"))
- (if-let ((it (assoc name ibuffer-filter-groups)))
+ (if-let* ((it (assoc name ibuffer-filter-groups)))
(progn
(push (copy-tree it) ibuffer-filter-group-kill-ring)
(setq ibuffer-filter-groups (ibuffer-remove-alist
@@ -883,9 +883,9 @@ The group will be added to
`ibuffer-filter-group-kill-ring'."
"Kill the filter group at point.
See also `ibuffer-kill-filter-group'."
(interactive "P\np")
- (if-let ((it (save-excursion
- (ibuffer-forward-line 0)
- (get-text-property (point) 'ibuffer-filter-group-name))))
+ (if-let* ((it (save-excursion
+ (ibuffer-forward-line 0)
+ (get-text-property (point) 'ibuffer-filter-group-name))))
(ibuffer-kill-filter-group it)
(funcall (if interactive-p #'call-interactively #'funcall)
#'kill-line arg)))
@@ -944,7 +944,7 @@ prompt for NAME, and use the current filters."
(list
(read-from-minibuffer "Save current filter groups as: ")
ibuffer-filter-groups)))
- (if-let ((it (assoc name ibuffer-saved-filter-groups)))
+ (if-let* ((it (assoc name ibuffer-saved-filter-groups)))
(setcdr it groups)
(push (cons name groups) ibuffer-saved-filter-groups))
(ibuffer-maybe-save-stuff))
@@ -1116,7 +1116,7 @@ Interactively, prompt for NAME, and use the current
filters."
(list
(read-from-minibuffer "Save current filters as: ")
ibuffer-filtering-qualifiers)))
- (if-let ((it (assoc name ibuffer-saved-filters)))
+ (if-let* ((it (assoc name ibuffer-saved-filters)))
(setcdr it filters)
(push (cons name filters) ibuffer-saved-filters))
(ibuffer-maybe-save-stuff))
@@ -1296,7 +1296,7 @@ For example, for a buffer associated with file
'/a/b/c.d', this
matches against '/a/b/c.d'."
(:description "full file name"
:reader (read-from-minibuffer "Filter by full file name (regexp): "))
- (when-let ((it (with-current-buffer buf (ibuffer-buffer-file-name))))
+ (when-let* ((it (with-current-buffer buf (ibuffer-buffer-file-name))))
(string-match qualifier it)))
;;;###autoload (autoload 'ibuffer-filter-by-basename "ibuf-ext")
@@ -1308,7 +1308,7 @@ matches against `c.d'."
(:description "file basename"
:reader (read-from-minibuffer
"Filter by file name, without directory part (regex): "))
- (when-let ((it (with-current-buffer buf (ibuffer-buffer-file-name))))
+ (when-let* ((it (with-current-buffer buf (ibuffer-buffer-file-name))))
(string-match qualifier (file-name-nondirectory it))))
;;;###autoload (autoload 'ibuffer-filter-by-file-extension "ibuf-ext")
@@ -1321,7 +1321,7 @@ pattern. For example, for a buffer associated with file
(:description "filename extension"
:reader (read-from-minibuffer
"Filter by filename extension without separator (regex): "))
- (when-let ((it (with-current-buffer buf (ibuffer-buffer-file-name))))
+ (when-let* ((it (with-current-buffer buf (ibuffer-buffer-file-name))))
(string-match qualifier (or (file-name-extension it) ""))))
;;;###autoload (autoload 'ibuffer-filter-by-directory "ibuf-ext")
@@ -1656,7 +1656,7 @@ a prefix argument reverses the meaning of that variable."
"Compare BUFFER with its associated file, if any.
Unlike `diff-no-select', insert output into current buffer
without erasing it."
- (when-let ((old (buffer-file-name buffer)))
+ (when-let* ((old (buffer-file-name buffer)))
(defvar diff-use-labels)
(let* ((new buffer)
(oldtmp (diff-file-local-copy old))
@@ -1822,7 +1822,7 @@ When BUF nil, default to the buffer at current line."
(interactive (list (read-regexp "Mark by file name (regexp)")))
(ibuffer-mark-on-buffer
(lambda (buf)
- (when-let ((name (with-current-buffer buf (ibuffer-buffer-file-name))))
+ (when-let* ((name (with-current-buffer buf (ibuffer-buffer-file-name))))
;; Match on the displayed file name (which is abbreviated).
(string-match-p regexp (ibuffer--abbreviate-file-name name))))))
@@ -1843,7 +1843,7 @@ Otherwise buffers whose name matches an element of
(or
(memq mode ibuffer-never-search-content-mode)
(cl-dolist (x ibuffer-never-search-content-name nil)
- (when-let ((found (string-match x (buffer-name buf))))
+ (when-let* ((found (string-match x (buffer-name buf))))
(cl-return found)))))
(setq res nil))
(t
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index 1fd94967836..f04c436f6e2 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -35,7 +35,7 @@
If TEST returns non-nil, bind `it' to the value, and evaluate
TRUE-BODY. Otherwise, evaluate forms in FALSE-BODY as if in `progn'.
Compare with `if'."
- (declare (obsolete if-let "29.1") (indent 2))
+ (declare (obsolete if-let* "29.1") (indent 2))
(let ((sym (make-symbol "ibuffer-aif-sym")))
`(let ((,sym ,test))
(if ,sym
@@ -47,8 +47,8 @@ Compare with `if'."
(defmacro ibuffer-awhen (test &rest body)
"Evaluate BODY if TEST returns non-nil.
During evaluation of body, bind `it' to the value returned by TEST."
- (declare (indent 1) (obsolete when-let "29.1"))
- `(when-let ((it ,test))
+ (declare (indent 1) (obsolete when-let* "29.1"))
+ `(when-let* ((it ,test))
,@body))
(defmacro ibuffer-save-marks (&rest body)
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index c1e7788d2e8..405fb98d4d4 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -832,7 +832,7 @@ width and the longest string in LIST."
(let ((pt (save-excursion
(mouse-set-point event)
(point))))
- (if-let ((it (get-text-property (point) 'ibuffer-filter-group-name)))
+ (if-let* ((it (get-text-property (point) 'ibuffer-filter-group-name)))
(ibuffer-toggle-marks it)
(goto-char pt)
(let ((mark (ibuffer-current-mark)))
@@ -1263,7 +1263,7 @@ become unmarked.
If point is on a group name, then this function operates on that
group."
(interactive)
- (when-let ((it (get-text-property (point) 'ibuffer-filter-group-name)))
+ (when-let* ((it (get-text-property (point) 'ibuffer-filter-group-name)))
(setq group it))
(let ((count
(ibuffer-map-lines
@@ -1336,7 +1336,7 @@ If point is on a group name, this function operates on
that group."
(when (and movement (< movement 0))
(setq arg (- arg)))
(ibuffer-forward-line 0)
- (if-let ((it (get-text-property (point) 'ibuffer-filter-group-name)))
+ (if-let* ((it (get-text-property (point) 'ibuffer-filter-group-name)))
(progn
(require 'ibuf-ext)
(ibuffer-mark-on-buffer #'identity mark it))
@@ -1540,7 +1540,7 @@ If point is on a group name, this function operates on
that group."
;; `ibuffer-inline-columns' alist and insert it
;; into our generated code. Otherwise, we just
;; generate a call to the column function.
- (if-let ((it (assq sym ibuffer-inline-columns)))
+ (if-let* ((it (assq sym ibuffer-inline-columns)))
(nth 1 it)
`(or (,sym buffer mark) "")))
;; You're not expected to understand this. Hell, I
@@ -1737,7 +1737,7 @@ If point is on a group name, this function operates on
that group."
(cond ((zerop total) "No processes")
((= 1 total) "1 process")
(t (format "%d processes" total))))))
- (if-let ((it (get-buffer-process buffer)))
+ (if-let* ((it (get-buffer-process buffer)))
(format "(%s %s)" it (process-status it))
""))
@@ -1872,8 +1872,8 @@ the buffer object itself and the current mark symbol."
(let ((result
(if (buffer-live-p (ibuffer-current-buffer))
(when (or (null group)
- (when-let ((it (get-text-property
- (point)
'ibuffer-filter-group)))
+ (when-let* ((it (get-text-property
+ (point)
'ibuffer-filter-group)))
(equal group it)))
(save-excursion
(funcall function
diff --git a/lisp/image.el b/lisp/image.el
index 3d60b485c6b..ce97eeb3ca1 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -1434,7 +1434,7 @@ Also return nil if rotation is not a multiples of 90
degrees (0, 90,
Return a copy of :original-map transformed based on IMAGE's :scale,
:rotation, and :flip. When IMAGE's :original-map is nil, return nil.
When :rotation is not a multiple of 90, return copy of :original-map."
- (when-let ((map (image-property image :original-map)))
+ (when-let* ((map (image-property image :original-map)))
(setq map (copy-tree map t))
(let* ((size (image-size image t))
;; The image can be scaled for many reasons (:scale,
@@ -1469,7 +1469,7 @@ When :rotation is not a multiple of 90, return copy of
:original-map."
"Return original map for IMAGE.
If IMAGE lacks :map property, return nil.
When there is no transformation, return copy of :map."
- (when-let ((original-map (image-property image :map)))
+ (when-let* ((original-map (image-property image :map)))
(setq original-map (copy-tree original-map t))
(let* ((size (image-size image t))
;; The image can be scaled for many reasons (:scale,
diff --git a/lisp/image/exif.el b/lisp/image/exif.el
index 2c1c4850bef..86e47da8bcc 100644
--- a/lisp/image/exif.el
+++ b/lisp/image/exif.el
@@ -127,10 +127,10 @@ from the return value of this function."
(encode-coding-region (point-min) (point-max)
buffer-file-coding-system
dest))
- (when-let ((app1 (cdr (assq #xffe1 (exif--parse-jpeg)))))
+ (when-let* ((app1 (cdr (assq #xffe1 (exif--parse-jpeg)))))
(exif--parse-exif-chunk app1))))
(save-excursion
- (when-let ((app1 (cdr (assq #xffe1 (exif--parse-jpeg)))))
+ (when-let* ((app1 (cdr (assq #xffe1 (exif--parse-jpeg)))))
(exif--parse-exif-chunk app1))))))
(defun exif-field (field data)
diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el
index 2e2010e06f0..10f1598912a 100644
--- a/lisp/image/image-converter.el
+++ b/lisp/image/image-converter.el
@@ -85,7 +85,7 @@ like \"image/gif\"."
(image-converter-initialize)
;; When image-converter was customized
(when (and image-converter (not image-converter-regexp))
- (when-let ((formats (image-converter--probe image-converter)))
+ (when-let* ((formats (image-converter--probe image-converter)))
(setq image-converter-regexp
(concat "\\." (regexp-opt formats) "\\'"))
(setq image-converter-file-name-extensions formats)))
@@ -136,8 +136,8 @@ converted image data as a string."
(extra-converter (gethash type image-converter--extra-converters)))
(if extra-converter
(funcall extra-converter source format)
- (when-let ((err (image-converter--convert
- image-converter source format)))
+ (when-let* ((err (image-converter--convert
+ image-converter source format)))
(error "%s" err))))
(if (listp image)
;; Return an image object that's the same as we were passed,
@@ -217,8 +217,8 @@ converted image data as a string."
"Find an installed image converter Emacs can use."
(catch 'done
(dolist (elem image-converter--converters)
- (when-let ((formats (image-converter--filter-formats
- (image-converter--probe (car elem)))))
+ (when-let* ((formats (image-converter--filter-formats
+ (image-converter--probe (car elem)))))
(setq image-converter (car elem)
image-converter-regexp (concat "\\." (regexp-opt formats) "\\'")
image-converter-file-name-extensions formats)
diff --git a/lisp/image/image-dired-util.el b/lisp/image/image-dired-util.el
index e9048e157cd..e620c688b1b 100644
--- a/lisp/image/image-dired-util.el
+++ b/lisp/image/image-dired-util.el
@@ -125,7 +125,7 @@ See also `image-dired-thumbnail-storage' and
(defun image-dired-file-name-at-point ()
"Get abbreviated file name for thumbnail or display image at point."
- (when-let ((f (image-dired-original-file-name)))
+ (when-let* ((f (image-dired-original-file-name)))
(abbreviate-file-name f)))
(defun image-dired-associated-dired-buffer ()
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 1928b0a2955..83745e88f09 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -663,7 +663,7 @@ only useful if `image-dired-track-movement' is nil."
(image-dired--with-dired-buffer
(if (not (dired-goto-file file-name))
(message "Could not find image in Dired buffer for tracking")
- (when-let (window (image-dired-get-buffer-window (current-buffer)))
+ (when-let* ((window (image-dired-get-buffer-window (current-buffer))))
(set-window-point window (point)))))))
(defun image-dired-toggle-movement-tracking ()
@@ -863,7 +863,7 @@ for. The default is to look for `dired-marker-char'."
"Run BODY in associated Dired buffer with point on current file's line.
Should be called from commands in `image-dired-thumbnail-mode'."
(declare (indent defun) (debug t))
- `(if-let ((file-name (image-dired-original-file-name)))
+ `(if-let* ((file-name (image-dired-original-file-name)))
(image-dired--with-dired-buffer
(when (dired-goto-file file-name)
,@body))
@@ -871,9 +871,9 @@ Should be called from commands in
`image-dired-thumbnail-mode'."
(defmacro image-dired--with-thumbnail-buffer (&rest body)
(declare (indent defun) (debug t))
- `(if-let ((buf (get-buffer image-dired-thumbnail-buffer)))
+ `(if-let* ((buf (get-buffer image-dired-thumbnail-buffer)))
(with-current-buffer buf
- (if-let ((win (get-buffer-window buf)))
+ (if-let* ((win (get-buffer-window buf)))
(with-selected-window win
,@body)
,@body))
@@ -932,7 +932,7 @@ You probably want to use this together with
`image-dired-track-original-file'."
(interactive nil image-dired-thumbnail-mode)
(image-dired--with-dired-buffer
- (if-let ((window (image-dired-get-buffer-window (current-buffer))))
+ (if-let* ((window (image-dired-get-buffer-window (current-buffer))))
(progn
(if (not (equal (selected-frame) (window-frame window)))
(select-frame-set-input-focus (window-frame window)))
@@ -1090,7 +1090,7 @@ This is used by `image-dired-slideshow-start'."
(defun image-dired--slideshow-step ()
"Step to the next image in a slideshow."
- (if-let ((buf (get-buffer image-dired-thumbnail-buffer)))
+ (if-let* ((buf (get-buffer image-dired-thumbnail-buffer)))
(with-current-buffer buf
(image-dired-display-next))
(image-dired--slideshow-stop)))
@@ -1272,7 +1272,7 @@ which is based on `image-mode'."
(cur-win (selected-window)))
(when buf
(kill-buffer buf))
- (when-let ((buf (find-file-noselect file nil t)))
+ (when-let* ((buf (find-file-noselect file nil t)))
(pop-to-buffer buf)
(rename-buffer image-dired-display-image-buffer)
(if (string-match (image-file-name-regexp) file)
diff --git a/lisp/image/wallpaper.el b/lisp/image/wallpaper.el
index 79682e921b0..399971b5ac0 100644
--- a/lisp/image/wallpaper.el
+++ b/lisp/image/wallpaper.el
@@ -131,14 +131,14 @@ continue running even after exiting Emacs."
The returned function kills any process named PROCESS-NAME owned
by the current effective user id."
(lambda ()
- (when-let ((procs
- (seq-filter (lambda (p) (let-alist p
- (and (= .euid (user-uid))
- (equal .comm process-name))))
- (mapcar (lambda (pid)
- (cons (cons 'pid pid)
- (process-attributes pid)))
- (list-system-processes)))))
+ (when-let* ((procs
+ (seq-filter (lambda (p) (let-alist p
+ (and (= .euid (user-uid))
+ (equal .comm process-name))))
+ (mapcar (lambda (pid)
+ (cons (cons 'pid pid)
+ (process-attributes pid)))
+ (list-system-processes)))))
(dolist (proc procs)
(let-alist proc
(when (y-or-n-p (format "Kill \"%s\" process with PID %d?" .comm
.pid))
@@ -297,7 +297,7 @@ order in which they appear.")
(dolist (setter wallpaper--default-setters)
(wallpaper-debug "Testing setter %s" (wallpaper-setter-name
setter))
(when (and (executable-find (wallpaper-setter-command
setter))
- (if-let ((pred (wallpaper-setter-predicate
setter)))
+ (if-let* ((pred (wallpaper-setter-predicate
setter)))
(funcall pred)
t))
(wallpaper-debug "Found setter %s" (wallpaper-setter-name
setter))
@@ -305,12 +305,12 @@ order in which they appear.")
(defun wallpaper--find-command ()
"Return the appropriate command to set the wallpaper."
- (when-let ((setter (wallpaper--find-setter)))
+ (when-let* ((setter (wallpaper--find-setter)))
(wallpaper-setter-command setter)))
(defun wallpaper--find-command-args ()
"Return command line arguments matching `wallpaper-command'."
- (when-let ((setter (wallpaper--find-setter)))
+ (when-let* ((setter (wallpaper--find-setter)))
(wallpaper-setter-args setter)))
@@ -449,23 +449,23 @@ This function is meaningful only on X and is used only
there."
(if (and .name (member .source '("XRandr" "XRandR 1.5" "Gdk")))
.name
"0"))
- (if-let ((name
- (and (getenv "DISPLAY")
- (or
- (cdr (assq 'name
- (progn
- (x-open-connection (getenv "DISPLAY"))
- (car (display-monitor-attributes-list
- (car (last (terminal-list))))))))
- (and (executable-find "xrandr")
- (with-temp-buffer
- (call-process "xrandr" nil t nil)
- (goto-char (point-min))
- (re-search-forward (rx bol
- (group (+ (not (in " \n"))))
- " connected")
- nil t)
- (match-string 1)))))))
+ (if-let* ((name
+ (and (getenv "DISPLAY")
+ (or
+ (cdr (assq 'name
+ (progn
+ (x-open-connection (getenv "DISPLAY"))
+ (car (display-monitor-attributes-list
+ (car (last (terminal-list))))))))
+ (and (executable-find "xrandr")
+ (with-temp-buffer
+ (call-process "xrandr" nil t nil)
+ (goto-char (point-min))
+ (re-search-forward (rx bol
+ (group (+ (not (in " \n"))))
+ " connected")
+ nil t)
+ (match-string 1)))))))
;; Prefer "0" to "default" as that works in XFCE.
(if (equal name "default") "0" name)
(read-string (format-prompt "Monitor name" nil)))))
diff --git a/lisp/info-look.el b/lisp/info-look.el
index a84026ac8b9..b3db9bfdecc 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -327,7 +327,7 @@ string of `info-lookup-alist'.
If optional argument QUERY is non-nil, query for the help mode."
(let* ((mode (cond (query
(info-lookup-change-mode topic))
- ((when-let
+ ((when-let*
((info (info-lookup->mode-value
topic (info-lookup-select-mode))))
(info-lookup--expand-info info))
@@ -791,7 +791,7 @@ Return nil if there is nothing appropriate in the buffer
near point."
(defun info-complete (topic mode)
"Try to complete a help item."
(barf-if-buffer-read-only)
- (when-let ((info (info-lookup->mode-value topic mode)))
+ (when-let* ((info (info-lookup->mode-value topic mode)))
(info-lookup--expand-info info))
(let ((data (info-lookup-completions-at-point topic mode)))
(if (null data)
@@ -1226,7 +1226,7 @@ Return nil if there is nothing appropriate in the buffer
near point."
:ignore-case t
:regexp "[^][()`'‘’,:\" \t\n]+"
:parse-rule (lambda ()
- (when-let ((symbol (get-text-property (point) 'custom-data)))
+ (when-let* ((symbol (get-text-property (point) 'custom-data)))
(symbol-name symbol)))
:other-modes '(emacs-lisp-mode))
diff --git a/lisp/info.el b/lisp/info.el
index 6e386207afe..1ad1677c6ce 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -823,10 +823,10 @@ Select the window used, if it has been made."
;; If we just created the Info buffer, go to the directory.
(Info-directory))))
- (when-let ((window (display-buffer buffer
- (if other-window
- '(nil (inhibit-same-window . t))
- '(display-buffer-same-window)))))
+ (when-let* ((window (display-buffer buffer
+ (if other-window
+ '(nil (inhibit-same-window . t))
+ '(display-buffer-same-window)))))
(select-window window))))
@@ -2020,7 +2020,7 @@ See `completing-read' for a description of arguments and
usage."
(lambda (string pred action)
(complete-with-action
action
- (when-let ((file2 (Info-find-file file1 'noerror t)))
+ (when-let* ((file2 (Info-find-file file1 'noerror t)))
(Info-build-node-completions file2))
string pred))
nodename predicate code))))
diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index e8cd869a571..7ede6ac8058 100644
--- a/lisp/international/emoji.el
+++ b/lisp/international/emoji.el
@@ -328,14 +328,14 @@ the name is not known."
(let ((glyph (cadr alist)))
;; Store all the emojis for later retrieval by
;; the search feature.
- (when-let ((name (emoji--name glyph)))
+ (when-let* ((name (emoji--name glyph)))
(setf (gethash (downcase name) emoji--all-bases) glyph))
(if (display-graphic-p)
;; Remove glyphs we don't have in graphical displays.
(if (let ((char (elt glyph 0)))
(if emoji--font
(font-has-char-p emoji--font char)
- (when-let ((font (car (internal-char-font nil char))))
+ (when-let* ((font (car (internal-char-font nil char))))
(setq emoji--font font))))
(setq alist (cdr alist))
;; Remove the element.
@@ -575,7 +575,7 @@ the name is not known."
(setq recent (delete glyph recent))
(push glyph recent)
;; Shorten the list.
- (when-let ((tail (nthcdr 30 recent)))
+ (when-let* ((tail (nthcdr 30 recent)))
(setcdr tail nil))
(setf (multisession-value emoji--recent) recent)))
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 77efcf0b590..19d1c92196f 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -658,7 +658,7 @@ and delete the network process."
(defun jsonrpc--call-deferred (connection)
"Call CONNECTION's deferred actions, who may again defer themselves."
- (when-let ((actions (hash-table-values (jsonrpc--deferred-actions
connection))))
+ (when-let* ((actions (hash-table-values (jsonrpc--deferred-actions
connection))))
(jsonrpc--event
connection 'internal
:log-text (format "re-attempting deferred requests %s"
@@ -689,7 +689,7 @@ and delete the network process."
(jsonrpc--continuations connection))
(jsonrpc--message "Server exited with status %s" (process-exit-status
proc))
(delete-process proc)
- (when-let (p (slot-value connection '-autoport-inferior))
(delete-process p))
+ (when-let* ((p (slot-value connection '-autoport-inferior)))
(delete-process p))
(funcall (jsonrpc--on-shutdown connection) connection)))))
(defvar jsonrpc--in-process-filter nil
@@ -807,7 +807,7 @@ Also cancel \"deferred actions\" if DEFERRED-SPEC.
Return the full continuation (ID SUCCESS-FN ERROR-FN TIMER)"
(with-slots ((conts -continuations) (defs -deferred-actions)) conn
(if deferred-spec (remhash deferred-spec defs))
- (when-let ((ass (assq id conts)))
+ (when-let* ((ass (assq id conts)))
(cl-destructuring-bind (_ _ _ _ timer) ass
(when timer (cancel-timer timer)))
(setf conts (delete ass conts))
diff --git a/lisp/keymap.el b/lisp/keymap.el
index 7a19621441c..9b133e1ca82 100644
--- a/lisp/keymap.el
+++ b/lisp/keymap.el
@@ -528,7 +528,7 @@ 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)))
+ (when-let* ((map (current-local-map)))
(keymap-lookup map keys accept-default)))
(defun keymap-global-lookup (keys &optional accept-default message)
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index a58be4dccf0..285095f9264 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -493,7 +493,7 @@ and send the mail again%s."
(re-search-forward "^From: " nil t)
(error "Please edit the From address and try again"))))
;; Bury the help buffer (if it's shown).
- (when-let ((help (get-buffer "*Bug Help*")))
+ (when-let* ((help (get-buffer "*Bug Help*")))
(when (get-buffer-window help)
(quit-window nil (get-buffer-window help)))))
@@ -549,7 +549,7 @@ Message buffer where you can explain more about the patch."
(message-add-action
(lambda ()
;; Bury the help buffer (if it's shown).
- (when-let ((help (get-buffer "*Patch Help*")))
+ (when-let* ((help (get-buffer "*Patch Help*")))
(when (get-buffer-window help)
(quit-window nil (get-buffer-window help)))))
'send))
diff --git a/lisp/mail/ietf-drums.el b/lisp/mail/ietf-drums.el
index eaccbff0b13..e314b3d13ae 100644
--- a/lisp/mail/ietf-drums.el
+++ b/lisp/mail/ietf-drums.el
@@ -275,11 +275,11 @@ a list of address strings."
((eq c ?:)
(setq beg (1+ (point)))
(skip-chars-forward "^;")
- (when-let ((address
- (condition-case nil
- (ietf-drums-parse-addresses
- (buffer-substring beg (point)) rawp)
- (error nil))))
+ (when-let* ((address
+ (condition-case nil
+ (ietf-drums-parse-addresses
+ (buffer-substring beg (point)) rawp)
+ (error nil))))
(if (listp address)
(setq pairs (append address pairs))
(push address pairs)))
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 1233d9ace95..fe4e49d0e1b 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -143,7 +143,7 @@ The mail client is taken to be the handler of mailto URLs."
(narrow-to-region (point-min) delimline)
;; We can't send multipart/* messages (i. e. with
;; attachments or the like) via this method.
- (when-let ((type (mail-fetch-field "content-type")))
+ (when-let* ((type (mail-fetch-field "content-type")))
(when (and (string-match "multipart"
(car (mail-header-parse-content-type
type)))
diff --git a/lisp/mail/rfc6068.el b/lisp/mail/rfc6068.el
index 06fe92f0ca7..562e2312f3f 100644
--- a/lisp/mail/rfc6068.el
+++ b/lisp/mail/rfc6068.el
@@ -72,7 +72,7 @@ calling this function."
(when address
(setq address (rfc6068-unhexify-string address))
;; Deal with multiple 'To' recipients.
- (if-let ((elem (assoc "To" headers-alist)))
+ (if-let* ((elem (assoc "To" headers-alist)))
(setcdr elem (concat address ", " (cdr elem)))
(push (cons "To" address) headers-alist)))
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 98ac17a99ed..c70880b0632 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -65,7 +65,7 @@ each undigestified message as markers.")
(defun rmail-digest-parse-mixed-mime ()
"Like `rmail-digest-parse-mime', but for multipart/mixed messages."
- (when-let ((boundary (rmail-content-type-boundary "multipart/mixed")))
+ (when-let* ((boundary (rmail-content-type-boundary "multipart/mixed")))
(let ((global-sep (concat "\n--" boundary))
(digest (concat "^Content-type: multipart/digest;"
"\\s-* boundary=\"?\\([^\";\n]+\\)[\";\n]"))
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 804afe9cb43..44d07557f48 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -168,9 +168,9 @@ specify the property, the `completion-extra-properties'
plist is
consulted. Note that the keys of the
`completion-extra-properties' plist are keyword symbols, not
plain symbols."
- (if-let (((not (eq prop 'category)))
- (cat (completion--metadata-get-1 metadata 'category))
- (over (completion--category-override cat prop)))
+ (if-let* (((not (eq prop 'category)))
+ (cat (completion--metadata-get-1 metadata 'category))
+ (over (completion--category-override cat prop)))
(cdr over)
(completion--metadata-get-1 metadata prop)))
@@ -2564,7 +2564,7 @@ The candidate will still be chosen by `choose-completion'
unless
(defun completions--after-change (_start _end _old-len)
"Update displayed *Completions* buffer after change in buffer contents."
(when completion-auto-deselect
- (when-let (window (get-buffer-window "*Completions*" 0))
+ (when-let* ((window (get-buffer-window "*Completions*" 0)))
(with-selected-window window
(completions--deselect)))))
@@ -3192,7 +3192,7 @@ and `RET' accepts the input typed into the minibuffer."
"Return CMD if `minibuffer-visible-completions' bindings should be active."
(if minibuffer-visible-completions--always-bind
cmd
- (when-let ((window (get-buffer-window "*Completions*" 0)))
+ (when-let* ((window (get-buffer-window "*Completions*" 0)))
(when (and (eq (buffer-local-value 'completion-reference-buffer
(window-buffer window))
(window-buffer (active-minibuffer-window)))
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index e7912a2a4a7..c10bc671a88 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -689,7 +689,7 @@ websites are increasingly rare, but they do still exist."
(defun browse-url-url-at-point ()
(or (thing-at-point 'url t)
;; assume that the user is pointing at something like gnu.org/gnu
- (when-let ((f (thing-at-point 'filename t)))
+ (when-let* ((f (thing-at-point 'filename t)))
(if (string-match-p browse-url-button-regexp f)
f
(concat browse-url-default-scheme "://" f)))))
@@ -764,7 +764,7 @@ interactively. Turn the filename into a URL with function
(defun browse-url-file-url (file)
"Return the URL corresponding to FILE.
Use variable `browse-url-filename-alist' to map filenames to URLs."
- (when-let ((coding (browse-url--file-name-coding-system)))
+ (when-let* ((coding (browse-url--file-name-coding-system)))
(setq file (encode-coding-string file coding)))
(if (and (file-remote-p file)
;; We're applying special rules for FTP URLs for historical
@@ -1361,7 +1361,7 @@ currently selected window instead."
(if (equal (url-type parsed) "file")
;; It's a file; just open it.
(let ((file (url-unhex-string (url-filename parsed))))
- (when-let ((coding (browse-url--file-name-coding-system)))
+ (when-let* ((coding (browse-url--file-name-coding-system)))
(setq file (decode-coding-string file 'utf-8)))
;; The local-part of file: URLs on Windows is supposed to
;; start with an extra slash.
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 8426d04fefd..ed1fc00f541 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1035,8 +1035,8 @@ BYTE-ARRAY must be a list of structure (c1 c2 ...), or a
byte array as
produced by `dbus-string-to-byte-array', and the individual bytes must
be a valid UTF-8 byte sequence."
(declare (advertised-calling-convention (byte-array) "30.1"))
- (if-let ((bytes (seq-filter #'characterp byte-array))
- (string (apply #'unibyte-string bytes)))
+ (if-let* ((bytes (seq-filter #'characterp byte-array))
+ (string (apply #'unibyte-string bytes)))
(let (last-coding-system-used)
(decode-coding-string string 'utf-8 'nocopy))
""))
@@ -2100,7 +2100,7 @@ either a method name, a signal name, or an error name."
"Goto D-Bus message with the same serial number."
(interactive)
(when (mouse-event-p last-input-event) (mouse-set-point last-input-event))
- (when-let ((point (get-text-property (point) 'dbus-serial)))
+ (when-let* ((point (get-text-property (point) 'dbus-serial)))
(goto-char point)))
(defun dbus-monitor-handler (&rest _args)
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 50e23727c61..58c2e9771ba 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -1278,7 +1278,7 @@ prompt for DICTIONARY."
(unless dictionary
(setq dictionary dictionary-default-dictionary))
(if dictionary-display-definition-function
- (if-let ((definition (dictionary-define-word word dictionary)))
+ (if-let* ((definition (dictionary-define-word word dictionary)))
(funcall dictionary-display-definition-function word dictionary
definition)
(user-error "No definition found for \"%s\"" word))
;; if called by pressing the button
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 6559c7e5eb9..7bbbeadaedd 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -79,7 +79,7 @@ if that directory doesn't exist and the DOWNLOAD XDG user
directory
is defined, use the latter instead."
(or (and (file-exists-p eww-default-download-directory)
eww-default-download-directory)
- (when-let ((dir (xdg-user-dir "DOWNLOAD")))
+ (when-let* ((dir (xdg-user-dir "DOWNLOAD")))
(file-name-as-directory dir))
eww-default-download-directory))
@@ -244,8 +244,8 @@ determine the renaming scheme, as follows:
(defun my-eww-rename-buffer ()
(when (eq major-mode \\='eww-mode)
- (when-let ((string (or (plist-get eww-data :title)
- (plist-get eww-data :url))))
+ (when-let* ((string (or (plist-get eww-data :title)
+ (plist-get eww-data :url))))
(format \"*%s*\" string))))
The string of `title' and `url' is always truncated to the value
@@ -625,7 +625,7 @@ for the search engine used."
NO-SELECT non-nil means do not make the new buffer the current buffer."
(interactive "P")
- (if-let ((url (or url (eww-suggested-uris))))
+ (if-let* ((url (or url (eww-suggested-uris))))
(if (or (eq eww-browse-url-new-window-is-tab t)
(and (eq eww-browse-url-new-window-is-tab 'tab-bar)
tab-bar-mode))
@@ -2070,7 +2070,7 @@ Interactively, EVENT is the value of
`last-nonmenu-event'."
(push (cons name (or (plist-get input :value) "on"))
values)))
((equal (plist-get input :type) "file")
- (when-let ((file (plist-get input :filename)))
+ (when-let* ((file (plist-get input :filename)))
(push (list "file"
(cons "filedata"
(with-temp-buffer
@@ -2186,7 +2186,7 @@ If EXTERNAL is double prefix, browse in new buffer."
(eww--before-browse)
(plist-put eww-data :url url)
(goto-char (point-min))
- (if-let ((match (text-property-search-forward 'shr-target-id target
#'member)))
+ (if-let* ((match (text-property-search-forward 'shr-target-id target
#'member)))
(goto-char (prop-match-beginning match))
(goto-char (if (equal target "top")
(point-min)
@@ -2906,9 +2906,9 @@ these attributes is absent, the corresponding element is
nil."
If there is just one alternate link, return its URL. If there
are multiple alternate links, prompt for one in the minibuffer
with completion. If there are none, return nil."
- (when-let ((alternates (eww--alternate-urls
- (plist-get eww-data :dom)
- (plist-get eww-data :url))))
+ (when-let* ((alternates (eww--alternate-urls
+ (plist-get eww-data :dom)
+ (plist-get eww-data :url))))
(let ((url-max-width
(seq-max (mapcar #'string-pixel-width
(mapcar #'car alternates))))
@@ -2952,7 +2952,7 @@ Alternate links are references that an HTML page may
include to
point to its alternative representations, such as a translated
version or an RSS feed."
(interactive nil eww-mode)
- (if-let ((url (eww-read-alternate-url)))
+ (if-let* ((url (eww-read-alternate-url)))
(progn
(kill-new url)
(message "Copied %s to kill ring" url))
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 7c72c67f187..ac36bfe05ce 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -241,7 +241,7 @@ using `browse-url-secondary-browser-function' instead."
(line-beginning-position)))
(not (looking-at goto-address-url-regexp))))
(compose-mail address)
- (if-let ((url (browse-url-url-at-point)))
+ (if-let* ((url (browse-url-url-at-point)))
(browse-url-button-open-url url)
(error "No e-mail address or URL found"))))))
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index 5ff75deb4e6..3e847c758c2 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -856,10 +856,10 @@ If NO-DECODE is non-nil, don't decode STRING."
;; ~/.mailcap file, then we filter out the system entries
;; and see whether we have anything left.
(when mailcap-prefer-mailcap-viewers
- (when-let ((user-entries
- (seq-filter (lambda (elem)
- (eq (cdr (assq 'source elem)) 'user))
- passed)))
+ (when-let* ((user-entries
+ (seq-filter (lambda (elem)
+ (eq (cdr (assq 'source elem)) 'user))
+ passed)))
(setq passed user-entries)))
(setq viewer (car passed))))
(when (and (stringp (cdr (assq 'viewer viewer)))
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 2a713de83c2..c41e2ec153f 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -576,11 +576,11 @@ If ARG is non-nil, instead prompt for connection
parameters."
'certfp)
(rcirc-get-server-cert (car c))))
contact)
- (when-let (((not password))
- (auth (auth-source-search :host server
- :user user-name
- :port port))
- (pwd (auth-info-password (car auth))))
+ (when-let* (((not password))
+ (auth (auth-source-search :host server
+ :user user-name
+ :port port))
+ (pwd (auth-info-password (car auth))))
(setq password pwd))
(when server
(let (connected)
@@ -709,7 +709,7 @@ that are joined after authentication."
process)
;; Ensure any previous process is killed
- (when-let ((old-process (get-process (or server-alias server))))
+ (when-let* ((old-process (get-process (or server-alias server))))
(set-process-sentinel old-process #'ignore)
(delete-process process))
@@ -1158,7 +1158,7 @@ element in PARTS is a list, append it to PARTS."
(let ((last (car (last parts))))
(when (listp last)
(setf parts (append (butlast parts) last))))
- (when-let (message (memq : parts))
+ (when-let* ((message (memq : parts)))
(cl-check-type (cadr message) string)
(setf (cadr message) (concat ":" (cadr message))
parts (remq : parts)))
@@ -1630,7 +1630,7 @@ with it."
rcirc-log-directory)
(rcirc-log-write))
(rcirc-clean-up-buffer "Killed buffer")
- (when-let ((process (get-buffer-process (current-buffer))))
+ (when-let* ((process (get-buffer-process (current-buffer))))
(delete-process process))
(when (and rcirc-buffer-alist ;; it's a server buffer
rcirc-kill-channel-buffers)
@@ -2041,7 +2041,7 @@ connection."
;; do not ignore if we sent the message
(not (string= sender (rcirc-nick process))))
(let* ((buffer (rcirc-target-buffer process sender response target text))
- (time (if-let ((time (rcirc-get-tag "time")))
+ (time (if-let* ((time (rcirc-get-tag "time")))
(parse-iso8601-time-string time t)
(current-time)))
(inhibit-read-only t))
@@ -2178,7 +2178,7 @@ connection."
(defun rcirc-when ()
"Show the time of reception of the message at point."
(interactive)
- (if-let (time (get-text-property (point) 'rcirc-time))
+ (if-let* ((time (get-text-property (point) 'rcirc-time)))
(message (format-time-string "%c" time))
(message "No time information at point.")))
@@ -3133,13 +3133,13 @@ indicated by RESPONSE)."
(or #x03 #x0f eol))
nil t)
(let (foreground background)
- (when-let ((fg-raw (match-string 1))
- (fg (string-to-number fg-raw))
- ((<= 0 fg (1- (length rcirc-color-codes)))))
+ (when-let* ((fg-raw (match-string 1))
+ (fg (string-to-number fg-raw))
+ ((<= 0 fg (1- (length rcirc-color-codes)))))
(setq foreground (aref rcirc-color-codes fg)))
- (when-let ((bg-raw (match-string 2))
- (bg (string-to-number bg-raw))
- ((<= 0 bg (1- (length rcirc-color-codes)))))
+ (when-let* ((bg-raw (match-string 2))
+ (bg (string-to-number bg-raw))
+ ((<= 0 bg (1- (length rcirc-color-codes)))))
(setq background (aref rcirc-color-codes bg)))
(rcirc-add-face (match-beginning 0) (match-end 0)
`(face (,@(and foreground (list :foreground foreground))
@@ -3475,7 +3475,7 @@ PROCESS is the process object for the current connection."
(dolist (target channels)
(rcirc-print process sender "NICK" target new-nick))
;; update chat buffer, if it exists
- (when-let ((chat-buffer (rcirc-get-buffer process old-nick)))
+ (when-let* ((chat-buffer (rcirc-get-buffer process old-nick)))
(with-current-buffer chat-buffer
(rcirc-print process sender "NICK" old-nick new-nick)
(setq rcirc-target new-nick)
@@ -3799,8 +3799,8 @@ is the process object for the current connection."
"Handle a empty tag message from SENDER.
PROCESS is the process object for the current connection."
(dolist (tag rcirc-message-tags)
- (when-let ((handler (intern-soft (concat "rcirc-tag-handler-" (car tag))))
- ((fboundp handler)))
+ (when-let* ((handler (intern-soft (concat "rcirc-tag-handler-" (car tag))))
+ ((fboundp handler)))
(funcall handler process sender (cdr tag)))))
(defun rcirc-handler-BATCH (process _sender args _text)
@@ -3837,7 +3837,7 @@ object for the current connection."
(args (nth 3 message))
(text (nth 4 message))
(rcirc-message-tags (nth 5 message)))
- (if-let (handler (intern-soft (concat "rcirc-handler-"
cmd)))
+ (if-let* ((handler (intern-soft (concat "rcirc-handler-"
cmd))))
(funcall handler process sender args text)
(rcirc-handler-generic process cmd sender args
text))))))))
(setq rcirc-batch-attributes
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index f1062acf7e4..4869969f463 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -751,7 +751,7 @@ full-buffer size."
(funcall function dom))
(t
(shr-generic dom)))
- (when-let ((id (dom-attr dom 'id)))
+ (when-let* ((id (dom-attr dom 'id)))
(push (cons id (set-marker (make-marker) start)) shr--link-targets))
;; If style is set, then this node has set the color.
(when style
@@ -940,7 +940,7 @@ When `shr-fill-text' is nil, only indent."
(defun shr-adaptive-fill-function ()
"Return a fill prefix for the paragraph at point."
- (when-let ((prefix (get-text-property (point) 'shr-prefix-length)))
+ (when-let* ((prefix (get-text-property (point) 'shr-prefix-length)))
(buffer-substring (point) (+ (point) prefix))))
(defun shr-parse-base (url)
@@ -1615,7 +1615,7 @@ Based on
https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-infore
(defun shr-correct-dom-case (dom)
"Correct the case for SVG segments."
(dolist (attr (dom-attributes dom))
- (when-let ((rep (assoc-default (car attr) shr-correct-attribute-case)))
+ (when-let* ((rep (assoc-default (car attr) shr-correct-attribute-case)))
(setcar attr rep)))
(dolist (child (dom-children dom))
(when (consp child)
@@ -1756,13 +1756,13 @@ Based on
https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-infore
(funcall shr-url-transformer (shr-expand-url url))
title)
;; Check whether the URL is suspicious.
- (when-let ((warning (or (textsec-suspicious-p
- (shr-expand-url url) 'url)
- (textsec-suspicious-p
- (cons (shr-expand-url url)
- (buffer-substring (or shr-start start)
- (point)))
- 'link))))
+ (when-let* ((warning (or (textsec-suspicious-p
+ (shr-expand-url url) 'url)
+ (textsec-suspicious-p
+ (cons (shr-expand-url url)
+ (buffer-substring (or shr-start start)
+ (point)))
+ 'link))))
(add-text-properties (or shr-start start) (point)
(list 'face '(shr-link textsec-suspicious)))
(insert (propertize "⚠️" 'help-echo warning))))))
diff --git a/lisp/net/sieve.el b/lisp/net/sieve.el
index a6ba556e7ae..68426ff91ec 100644
--- a/lisp/net/sieve.el
+++ b/lisp/net/sieve.el
@@ -152,7 +152,7 @@ require \"fileinto\";
(interactive)
(sieve-manage-close sieve-manage-buffer)
(kill-buffer sieve-manage-buffer)
- (when-let ((buffer (get-buffer sieve-buffer)))
+ (when-let* ((buffer (get-buffer sieve-buffer)))
(kill-buffer buffer)))
(defun sieve-bury-buffer ()
diff --git a/lisp/outline.el b/lisp/outline.el
index 4d72b17e623..3a021a9d1e6 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1856,8 +1856,8 @@ With a prefix argument, show headings up to that LEVEL."
(save-excursion
(goto-char (point-min))
(while (not (or (eq top-level 1) (eobp)))
- (when-let ((level (and (outline-on-heading-p t)
- (funcall outline-level))))
+ (when-let* ((level (and (outline-on-heading-p t)
+ (funcall outline-level))))
(when (< level (or top-level most-positive-fixnum))
(setq top-level (max level 1))))
(outline-next-heading)))
diff --git a/lisp/pcmpl-git.el b/lisp/pcmpl-git.el
index 95b6859dd23..c282e3eb4a8 100644
--- a/lisp/pcmpl-git.el
+++ b/lisp/pcmpl-git.el
@@ -39,10 +39,10 @@
(defun pcmpl-git--tracked-file-predicate (&rest args)
"Return a predicate function determining the Git status of a file.
Files listed by `git ls-files ARGS' satisfy the predicate."
- (when-let ((files (mapcar #'expand-file-name
- (ignore-errors
- (apply #'process-lines
- vc-git-program "ls-files" args)))))
+ (when-let* ((files (mapcar #'expand-file-name
+ (ignore-errors
+ (apply #'process-lines
+ vc-git-program "ls-files" args)))))
(lambda (file)
(setq file (expand-file-name file))
(if (string-suffix-p "/" file)
diff --git a/lisp/proced.el b/lisp/proced.el
index f99a6f74909..da9212f6802 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -955,11 +955,11 @@ Proced buffers."
"Auto-update Proced buffers using `run-at-time'.
If there are no proced buffers, cancel the timer."
- (if-let (buffers (match-buffers '(derived-mode . proced-mode)))
+ (if-let* ((buffers (match-buffers '(derived-mode . proced-mode))))
(dolist (buf buffers)
- (when-let ((flag (buffer-local-value 'proced-auto-update-flag buf))
- ((or (not (eq flag 'visible))
- (get-buffer-window buf 'visible))))
+ (when-let* ((flag (buffer-local-value 'proced-auto-update-flag buf))
+ ((or (not (eq flag 'visible))
+ (get-buffer-window buf 'visible))))
(with-current-buffer buf
(proced-update t t))))
(cancel-timer proced-auto-update-timer)
diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el
index 3bcfc213fc6..a2cb65f2c71 100644
--- a/lisp/progmodes/bug-reference.el
+++ b/lisp/progmodes/bug-reference.el
@@ -380,15 +380,15 @@ URL-REGEXP against the VCS URL and returns the value to
be set as
Test each configuration in `bug-reference-setup-from-vc-alist'
and `bug-reference--setup-from-vc-alist' and apply it if
applicable."
- (when-let ((file-or-dir (or buffer-file-name
- ;; Catches modes such as vc-dir and Magit.
- default-directory))
- (backend (vc-responsible-backend file-or-dir t))
- (url (seq-some (lambda (remote)
- (ignore-errors
- (vc-call-backend backend 'repository-url
- file-or-dir remote)))
- '("upstream" nil))))
+ (when-let* ((file-or-dir (or buffer-file-name
+ ;; Catches modes such as vc-dir and Magit.
+ default-directory))
+ (backend (vc-responsible-backend file-or-dir t))
+ (url (seq-some (lambda (remote)
+ (ignore-errors
+ (vc-call-backend backend 'repository-url
+ file-or-dir remote)))
+ '("upstream" nil))))
(seq-some (lambda (config)
(apply #'bug-reference-maybe-setup-from-vc url config))
(append bug-reference-setup-from-vc-alist
diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
index f68a6dc108d..4fb61c4ba13 100644
--- a/lisp/progmodes/c-ts-common.el
+++ b/lisp/progmodes/c-ts-common.el
@@ -128,8 +128,8 @@ ARG is passed to `fill-paragraph'."
(looking-at "//"))
;; In rust, NODE will be the body of a comment, and the
;; parent will be the whole comment.
- (if-let ((start (treesit-node-start
- (treesit-node-parent node))))
+ (if-let* ((start (treesit-node-start
+ (treesit-node-parent node))))
(save-excursion
(goto-char start)
(looking-at "//"))))
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 0c2da768833..1b041a0192b 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -287,7 +287,7 @@ one step according to the great-grand-parent indent level.
The
reason there is a difference between grand-parent and
great-grand-parent here is that the node containing the newline
is actually the parent of point at the moment of indentation."
- (when-let ((node (treesit-node-on (point) (point))))
+ (when-let* ((node (treesit-node-on (point) (point))))
(if (string-equal "translation_unit"
(treesit-node-type
(treesit-node-parent
@@ -315,12 +315,12 @@ doesn't have a child.
PARENT is NODE's parent, BOL is the beginning of non-whitespace
characters of the current line."
- (when-let ((prev-sibling
- (or (treesit-node-prev-sibling node t)
- (treesit-node-prev-sibling
- (treesit-node-first-child-for-pos parent bol) t)
- (treesit-node-child parent -1 t)))
- (continue t))
+ (when-let* ((prev-sibling
+ (or (treesit-node-prev-sibling node t)
+ (treesit-node-prev-sibling
+ (treesit-node-first-child-for-pos parent bol) t)
+ (treesit-node-child parent -1 t)))
+ (continue t))
(save-excursion
(while (and prev-sibling continue)
(pcase (treesit-node-type prev-sibling)
@@ -1103,8 +1103,8 @@ is required, not just the declaration part for DEFUN."
`treesit-defun-type-regexp' defines what constructs to indent."
(interactive "*")
- (when-let ((orig-point (point-marker))
- (range (c-ts-mode--emacs-defun-at-point t)))
+ (when-let* ((orig-point (point-marker))
+ (range (c-ts-mode--emacs-defun-at-point t)))
(indent-region (car range) (cdr range))
(goto-char orig-point)))
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 03e6ee4021b..2b9d355795e 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1405,12 +1405,12 @@ POS and RES.")
2)))
;; Remove matches like /bin/sh and do other file name transforms.
(save-match-data
- (when-let ((file-name
- (and (consp file)
- (not (bufferp (car file)))
- (if (cdr file)
- (expand-file-name (car file) (cdr file))
- (car file)))))
+ (when-let* ((file-name
+ (and (consp file)
+ (not (bufferp (car file)))
+ (if (cdr file)
+ (expand-file-name (car file) (cdr file))
+ (car file)))))
(cl-loop for (regexp replacement)
in compilation-transform-file-match-alist
when (string-match regexp file-name)
@@ -3231,7 +3231,7 @@ we try to avoid if possible."
(with-current-buffer (marker-buffer marker)
(save-excursion
(goto-char (marker-position marker))
- (when-let ((prev (compilation--previous-directory (point))))
+ (when-let* ((prev (compilation--previous-directory (point))))
(goto-char prev))
(setq dirs (cdr (or (get-text-property
(1- (point)) 'compilation-directory)
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 0a1f9ee4481..e5c27de81fc 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -710,14 +710,14 @@ compile time if an undeclared LSP interface is used."))
(cl-destructuring-bind
(&key types required-keys optional-keys &allow-other-keys)
(eglot--interface interface-name)
- (when-let ((missing (and enforce-required
- (cl-set-difference required-keys
- (eglot--plist-keys object)))))
+ (when-let* ((missing (and enforce-required
+ (cl-set-difference required-keys
+ (eglot--plist-keys object)))))
(eglot--error "A `%s' must have %s" interface-name missing))
- (when-let ((excess (and disallow-non-standard
- (cl-set-difference
- (eglot--plist-keys object)
- (append required-keys optional-keys)))))
+ (when-let* ((excess (and disallow-non-standard
+ (cl-set-difference
+ (eglot--plist-keys object)
+ (append required-keys optional-keys)))))
(eglot--error "A `%s' mustn't have %s" interface-name excess))
(when check-types
(cl-loop
@@ -1914,7 +1914,7 @@ and just return it. PROMPT shouldn't end with a question
mark."
(cond ((null servers)
(eglot--error "No servers!"))
((or (cdr servers) (not dont-if-just-the-one))
- (let* ((default (when-let ((current (eglot-current-server)))
+ (let* ((default (when-let* ((current (eglot-current-server)))
(funcall name current)))
(read (completing-read
(if default
@@ -2164,7 +2164,7 @@ If it is activated, also signal textDocument/didOpen."
(with-no-warnings
(require 'package)
(unless package-archive-contents (package-refresh-contents))
- (when-let ((existing (cadr (assoc 'eglot package-alist))))
+ (when-let* ((existing (cadr (assoc 'eglot package-alist))))
(package-delete existing t))
(package-install (cadr (assoc 'eglot package-archive-contents)))))
@@ -2457,10 +2457,10 @@ expensive cached value of `file-truename'.")
(current-buffer) beg end
(eglot--diag-type severity)
message `((eglot-lsp-diag . ,diag-spec))
- (when-let ((faces
- (cl-loop for tag across tags
- when (alist-get tag
eglot--tag-faces)
- collect it)))
+ (when-let* ((faces
+ (cl-loop for tag across tags
+ when (alist-get tag
eglot--tag-faces)
+ collect it)))
`((face . ,faces))))))
into diags
finally (cond ((and
@@ -2619,12 +2619,12 @@ buffer."
(append
(eglot--TextDocumentPositionParams)
`(:context
- ,(if-let (trigger (and (characterp eglot--last-inserted-char)
- (cl-find eglot--last-inserted-char
- (eglot-server-capable :completionProvider
- :triggerCharacters)
- :key (lambda (str) (aref str 0))
- :test #'char-equal)))
+ ,(if-let* ((trigger (and (characterp eglot--last-inserted-char)
+ (cl-find eglot--last-inserted-char
+ (eglot-server-capable
:completionProvider
+
:triggerCharacters)
+ :key (lambda (str) (aref str 0))
+ :test #'char-equal))))
`(:triggerKind 2 :triggerCharacter ,trigger) `(:triggerKind 1)))))
(defvar-local eglot--recent-changes nil
@@ -3167,7 +3167,7 @@ for which LSP on-type-formatting should be requested."
(defun eglot-completion-at-point ()
"Eglot's `completion-at-point' function."
;; Commit logs for this function help understand what's going on.
- (when-let (completion-capability (eglot-server-capable :completionProvider))
+ (when-let* ((completion-capability (eglot-server-capable
:completionProvider)))
(let* ((server (eglot--current-server-or-lose))
(bounds (or (bounds-of-thing-at-point 'symbol)
(cons (point) (point))))
@@ -3296,7 +3296,7 @@ for which LSP on-type-formatting should be requested."
(_ (intern (downcase kind))))))
:company-deprecated
(lambda (proxy)
- (when-let ((lsp-item (get-text-property 0 'eglot--lsp-item proxy)))
+ (when-let* ((lsp-item (get-text-property 0 'eglot--lsp-item proxy)))
(or (seq-contains-p (plist-get lsp-item :tags)
1)
(eq t (plist-get lsp-item :deprecated)))))
@@ -3390,7 +3390,7 @@ for which LSP on-type-formatting should be requested."
(with-temp-buffer
(insert siglabel)
;; Add documentation, indented so we can distinguish multiple signatures
- (when-let (doc (and (not briefp) sigdoc (eglot--format-markup sigdoc)))
+ (when-let* ((doc (and (not briefp) sigdoc (eglot--format-markup
sigdoc))))
(goto-char (point-max))
(insert "\n" (replace-regexp-in-string "^" " " doc)))
;; Try to highlight function name only
@@ -3850,12 +3850,12 @@ at point. With prefix argument, prompt for
ACTION-KIND."
(handle-event `(,desc 'deleted ,file))
(handle-event `(,desc 'created ,file1))))))
(watch-dir (dir)
- (when-let ((probe
- (and (file-readable-p dir)
- (or (gethash dir (eglot--file-watches server))
- (puthash dir (list (file-notify-add-watch
- dir '(change)
#'handle-event))
- (eglot--file-watches server))))))
+ (when-let* ((probe
+ (and (file-readable-p dir)
+ (or (gethash dir (eglot--file-watches server))
+ (puthash dir (list (file-notify-add-watch
+ dir '(change)
#'handle-event))
+ (eglot--file-watches server))))))
(push id (cdr probe)))))
(unwind-protect
(progn
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 2f931daedc7..62f1045a512 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -246,7 +246,7 @@ Use `emacs-lisp-byte-compile-and-load' in combination with
`native-comp-jit-compilation' set to t to achieve asynchronous
native compilation of the current buffer's file."
(interactive nil emacs-lisp-mode)
- (when-let ((byte-file (emacs-lisp-native-compile)))
+ (when-let* ((byte-file (emacs-lisp-native-compile)))
(load (file-name-sans-extension byte-file))))
(defun emacs-lisp-macroexpand ()
@@ -1851,7 +1851,7 @@ Also see `elisp-eldoc-var-docstring-with-value'."
Intended for `eldoc-documentation-functions' (which see).
Compared to `elisp-eldoc-var-docstring', this also includes the
current variable value and a bigger chunk of the docstring."
- (when-let ((cs (elisp--current-symbol)))
+ (when-let* ((cs (elisp--current-symbol)))
(when (and (boundp cs)
;; nil and t are boundp!
(not (null cs))
diff --git a/lisp/progmodes/erts-mode.el b/lisp/progmodes/erts-mode.el
index 0cb77b30a75..41904e8bd0d 100644
--- a/lisp/progmodes/erts-mode.el
+++ b/lisp/progmodes/erts-mode.el
@@ -209,8 +209,8 @@ expected results and the actual results in a separate
buffer."
(re-search-backward "^=-=\n" nil t)
(let ((potential-start (match-end 0)))
;; See if we're in a two-clause ("before" and "after") test or not.
- (if-let ((start (and (save-excursion (re-search-backward "^=-=\n" nil t))
- (match-end 0))))
+ (if-let* ((start (and (save-excursion (re-search-backward "^=-=\n" nil
t))
+ (match-end 0))))
(let ((end (save-excursion (re-search-backward "^=-=-=\n" nil t))))
(if (or (not end)
(> start end))
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 9a6b62ca254..3dee1a58e44 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -845,7 +845,7 @@ Return to original margin width if ORIG-WIDTH is non-nil."
(widen)
(dolist (o (overlays-in (point-min) (point-max)))
(when (overlay-get o 'flymake--eol-overlay)
- (if-let ((src-ovs (overlay-get o 'flymake-eol-source-overlays)))
+ (if-let* ((src-ovs (overlay-get o 'flymake-eol-source-overlays)))
(overlay-put o 'before-string (flymake--eol-overlay-summary
src-ovs))
(delete-overlay o))))))
@@ -1533,7 +1533,7 @@ START and STOP and LEN are as in
`after-change-functions'."
(defun flymake-eldoc-function (report-doc &rest _)
"Document diagnostics at point.
Intended for `eldoc-documentation-functions' (which see)."
- (when-let ((diags (flymake-diagnostics (point))))
+ (when-let* ((diags (flymake-diagnostics (point))))
(funcall report-doc
(mapconcat #'flymake-diagnostic-text diags "\n")
:echo (mapconcat #'flymake-diagnostic-oneliner
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 6a9735fbc25..b60e21ff0ae 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3242,7 +3242,7 @@ See `def-gdb-auto-update-handler'."
;; Add the breakpoint/header row to the table.
(gdb-breakpoints--add-breakpoint-row table breakpoint)
;; If this breakpoint has multiple locations, add them as well.
- (when-let ((locations (gdb-mi--field breakpoint 'locations)))
+ (when-let* ((locations (gdb-mi--field breakpoint 'locations)))
(dolist (loc locations)
(add-to-list 'gdb-breakpoints-list
(cons (gdb-mi--field loc 'number) loc))
@@ -4830,7 +4830,7 @@ overlay arrow in source buffer."
(when frame
(setq gdb-selected-frame (gdb-mi--field frame 'func))
(setq gdb-selected-file
- (when-let ((full (gdb-mi--field frame 'fullname)))
+ (when-let* ((full (gdb-mi--field frame 'fullname)))
(file-local-name full)))
(setq gdb-frame-number (gdb-mi--field frame 'level))
(setq gdb-frame-address (gdb-mi--field frame 'addr))
diff --git a/lisp/progmodes/go-ts-mode.el b/lisp/progmodes/go-ts-mode.el
index 6fa8049e5e7..86e74ad58a8 100644
--- a/lisp/progmodes/go-ts-mode.el
+++ b/lisp/progmodes/go-ts-mode.el
@@ -363,7 +363,7 @@ Methods are prefixed with the receiver name, unless
SKIP-PREFIX is t."
The added docstring is prefilled with the defun's name. If the
comment already exists, jump to it."
(interactive)
- (when-let ((defun-node (treesit-defun-at-point)))
+ (when-let* ((defun-node (treesit-defun-at-point)))
(goto-char (treesit-node-start defun-node))
(if (go-ts-mode--comment-on-previous-line-p)
;; go to top comment line
@@ -375,9 +375,9 @@ comment already exists, jump to it."
(defun go-ts-mode--comment-on-previous-line-p ()
"Return t if the previous line is a comment."
- (when-let ((point (- (pos-bol) 1))
- ((> point 0))
- (node (treesit-node-at point)))
+ (when-let* ((point (- (pos-bol) 1))
+ ((> point 0))
+ (node (treesit-node-at point)))
(and
;; check point is actually inside the found node
;; treesit-node-at can return nodes after point
@@ -432,10 +432,10 @@ specifying build tags."
"Return a regular expression for the tests at point.
If region is active, the regexp will include all the functions under the
region."
- (if-let ((range (if (region-active-p)
- (list (region-beginning) (region-end))
- (list (point) (point))))
- (funcs (apply #'go-ts-mode--get-functions-in-range range)))
+ (if-let* ((range (if (region-active-p)
+ (list (region-beginning) (region-end))
+ (list (point) (point))))
+ (funcs (apply #'go-ts-mode--get-functions-in-range range)))
(string-join funcs "|")
(error "No test function found")))
@@ -450,7 +450,7 @@ be run."
(defun go-ts-mode-test-this-file ()
"Run all the unit tests in the current file."
(interactive)
- (if-let ((defuns (go-ts-mode--get-functions-in-range (point-min)
(point-max))))
+ (if-let* ((defuns (go-ts-mode--get-functions-in-range (point-min)
(point-max))))
(go-ts-mode--compile-test (string-join defuns "|"))
(error "No test functions found in the current file")))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index b453ac60ed2..ed8d6e9e0d9 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1357,7 +1357,7 @@ command before it's run."
regexp
files
nil
- (when-let ((ignores (grep-find-ignored-files dir)))
+ (when-let* ((ignores (grep-find-ignored-files dir)))
(concat " --exclude="
(mapconcat
(lambda (ignore)
@@ -1474,7 +1474,7 @@ to indicate whether the grep should be case sensitive or
not."
"Compute the command for \\[rgrep] to use by default."
(require 'find-dired) ; for `find-name-arg'
(let ((ignored-files-arg
- (when-let ((ignored-files (grep-find-ignored-files dir)))
+ (when-let* ((ignored-files (grep-find-ignored-files dir)))
(concat (shell-quote-argument "(" grep-quoting-style)
;; we should use shell-quote-argument here
" -name "
@@ -1498,7 +1498,7 @@ to indicate whether the grep should be case sensitive or
not."
(concat " " (shell-quote-argument "!" grep-quoting-style) " "
ignored-files-arg)))
dir
(concat
- (when-let ((ignored-dirs (rgrep-find-ignored-directories dir)))
+ (when-let* ((ignored-dirs (rgrep-find-ignored-directories dir)))
(concat "-type d "
(shell-quote-argument "(" grep-quoting-style)
;; we should use shell-quote-argument here
@@ -1578,8 +1578,8 @@ command before it's run."
(defun grep-file-at-point (point)
"Return the name of the file at POINT a `grep-mode' buffer.
The returned file name is relative."
- (when-let ((msg (get-text-property point 'compilation-message))
- (loc (compilation--message->loc msg)))
+ (when-let* ((msg (get-text-property point 'compilation-message))
+ (loc (compilation--message->loc msg)))
(caar (compilation--loc->file-struct loc))))
;;;###autoload
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 13d5d7f9451..3c32fac3f42 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -963,8 +963,8 @@ changed by, or (parse-state) if line starts in a quoted
string."
(save-excursion
(skip-chars-backward " \t\n")
(beginning-of-line)
- (when-let ((comm (and (looking-at "^\\.$")
- (nth 8 (syntax-ppss)))))
+ (when-let* ((comm (and (looking-at "^\\.$")
+ (nth 8 (syntax-ppss)))))
(goto-char comm)
(beginning-of-line)
(looking-at perl--format-regexp))))
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 6e6d421110c..e1976144a94 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -591,12 +591,12 @@ doesn't have a child.
PARENT is NODE's parent, BOL is the beginning of non-whitespace
characters of the current line."
- (when-let ((prev-sibling
- (or (treesit-node-prev-sibling node t)
- (treesit-node-prev-sibling
- (treesit-node-first-child-for-pos parent bol) t)
- (treesit-node-child parent -1 t)))
- (continue t))
+ (when-let* ((prev-sibling
+ (or (treesit-node-prev-sibling node t)
+ (treesit-node-prev-sibling
+ (treesit-node-first-child-for-pos parent bol) t)
+ (treesit-node-child parent -1 t)))
+ (continue t))
(save-excursion
(while (and prev-sibling continue)
(goto-char (treesit-node-start prev-sibling))
@@ -1224,8 +1224,8 @@ Return nil if the NODE has no field “name” or if NODE is
not a defun node."
"Indent the current top-level declaration syntactically.
`treesit-defun-type-regexp' defines what constructs to indent."
(interactive "*")
- (when-let ((orig-point (point-marker))
- (node (treesit-defun-at-point)))
+ (when-let* ((orig-point (point-marker))
+ (node (treesit-defun-at-point)))
(indent-region (treesit-node-start node)
(treesit-node-end node))
(goto-char orig-point)))
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 5062021f8a6..4a8afb80b25 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -926,7 +926,7 @@ DIRS must contain directory names."
(generic-cmd (lookup-key project-prefix-map key))
(switch-to-buffer-obey-display-actions t)
(display-buffer-overriding-action (unless place-cmd action)))
- (if-let ((cmd (or place-cmd generic-cmd)))
+ (if-let* ((cmd (or place-cmd generic-cmd)))
(call-interactively cmd)
(user-error "%s is undefined" (key-description key)))))
@@ -1075,8 +1075,8 @@ relative to PROJECT instead.
This supports using a relative file name from the current buffer
when switching projects with `project-switch-project' and then
using a command like `project-find-file'."
- (if-let (filename-proj (and project-current-directory-override
- (project-current nil default-directory)))
+ (if-let* ((filename-proj (and project-current-directory-override
+ (project-current nil default-directory))))
;; file-name-concat requires Emacs 28+
(concat (file-name-as-directory (project-root project))
(file-relative-name filename (project-root filename-proj)))
@@ -1167,7 +1167,7 @@ This has the effect of sharing more history between
projects."
:version "30.1")
(defun project--transplant-file-name (filename project)
- (when-let ((old-root (get-text-property 0 'project filename)))
+ (when-let* ((old-root (get-text-property 0 'project filename)))
(expand-file-name
(file-relative-name filename old-root)
(project-root project))))
@@ -1443,7 +1443,7 @@ If you exit the `query-replace', you can later continue
the
(defun project-prefixed-buffer-name (mode)
(concat "*"
- (if-let ((proj (project-current nil)))
+ (if-let* ((proj (project-current nil)))
(project-name proj)
(file-name-nondirectory
(directory-file-name default-directory)))
@@ -1870,7 +1870,7 @@ result in `project-list-file'. Announce the project's
removal
from the list using REPORT-MESSAGE, which is a format string
passed to `message' as its first argument."
(project--ensure-read-project-list)
- (when-let ((ent (assoc (abbreviate-file-name project-root) project--list)))
+ (when-let* ((ent (assoc (abbreviate-file-name project-root) project--list)))
(setq project--list (delq ent project--list))
(message report-message project-root)
(project--write-project-list)))
@@ -1931,8 +1931,8 @@ When PROMPT is non-nil, use it as the prompt string."
(dolist (dir (reverse (project-known-project-roots)))
;; We filter out directories that no longer map to a project,
;; since they don't have a clean project-name.
- (when-let ((proj (project--find-in-directory dir))
- (name (project-name proj)))
+ (when-let* ((proj (project--find-in-directory dir))
+ (name (project-name proj)))
(push name project--name-history)
(push (cons name proj) ret)))
(reverse ret)))
@@ -2029,10 +2029,10 @@ projects."
(dolist (project (mapcar #'car project--list))
(puthash project t known))
(dolist (subdir dirs)
- (when-let (((file-directory-p subdir))
- (project (project--find-in-directory subdir))
- (project-root (project-root project))
- ((not (gethash project-root known))))
+ (when-let* (((file-directory-p subdir))
+ (project (project--find-in-directory subdir))
+ (project-root (project-root project))
+ ((not (gethash project-root known))))
(project-remember-project project t)
(puthash project-root t known)
(message "Found %s..." project-root)
@@ -2180,8 +2180,8 @@ Otherwise, use the face `help-key-binding' in the prompt."
(let ((temp-map (make-sparse-keymap)))
(set-keymap-parent temp-map project-prefix-map)
(dolist (row commands-menu temp-map)
- (when-let ((cmd (nth 0 row))
- (keychar (nth 2 row)))
+ (when-let* ((cmd (nth 0 row))
+ (keychar (nth 2 row)))
(define-key temp-map (vector keychar) cmd)))))
command
choice)
@@ -2238,7 +2238,7 @@ If you set `uniquify-dirname-transform' to this function,
slash-separated components from `project-name' will be appended to
the buffer's directory name when buffers from two different projects
would otherwise have the same name."
- (if-let (proj (project-current nil dirname))
+ (if-let* ((proj (project-current nil dirname)))
(let ((root (project-root proj)))
(expand-file-name
(file-name-concat
@@ -2273,7 +2273,7 @@ is part of the default mode line beginning with Emacs 30."
(defun project-mode-line-format ()
"Compose the project mode-line."
- (when-let ((project (project-current)))
+ (when-let* ((project (project-current)))
;; Preserve the global value of 'last-coding-system-used'
;; that 'write-region' needs to set for 'basic-save-buffer',
;; but updating the mode line might occur at the same time
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 6d57517cd25..283a545bfb4 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -808,7 +808,7 @@ sign in chained assignment."
(3 'font-lock-operator-face)
(,(python-rx symbol-name)
(progn
- (when-let ((type-start (match-beginning 2)))
+ (when-let* ((type-start (match-beginning 2)))
(goto-char type-start))
(match-end 0))
nil
@@ -1153,7 +1153,7 @@ fontified."
((or "identifier" "none")
(setq font-node child))
("attribute"
- (when-let ((type-node (treesit-node-child-by-field-name child
"attribute")))
+ (when-let* ((type-node (treesit-node-child-by-field-name child
"attribute")))
(setq font-node type-node)))
((or "binary_operator" "subscript")
(python--treesit-fontify-union-types child override start end
type-regex)))
@@ -3264,8 +3264,8 @@ name respectively the current project name."
(pcase dedicated
('nil python-shell-buffer-name)
('project
- (if-let ((proj (and (featurep 'project)
- (project-current))))
+ (if-let* ((proj (and (featurep 'project)
+ (project-current))))
(format "%s[%s]" python-shell-buffer-name (file-name-nondirectory
(directory-file-name
(project-root proj))))
@@ -3788,7 +3788,7 @@ non-nil, means also display the Python shell buffer."
dedicated))))
'(buffer project nil))
(user-error "No Python shell"))
- (when-let ((proc (get-buffer-process (current-buffer))))
+ (when-let* ((proc (get-buffer-process (current-buffer))))
(kill-process proc)
(while (accept-process-output proc)))
(python-shell-make-comint (python-shell-calculate-command)
@@ -4845,9 +4845,9 @@ using that one instead of current buffer's process."
((stringp (car cands))
(if no-delims
;; Reduce completion candidates due to long prefix.
- (if-let ((Lp (length prefix))
- ((string-match "\\(\\sw\\|\\s_\\)+\\'" prefix))
- (L (match-beginning 0)))
+ (if-let* ((Lp (length prefix))
+ ((string-match "\\(\\sw\\|\\s_\\)+\\'" prefix))
+ (L (match-beginning 0)))
;; If extra-offset is not zero:
;; start end
;; o------------------o---------o-------o
@@ -5521,14 +5521,14 @@ def __FFAP_get_module_path(objstr):
(defun python-ffap-module-path (module)
"Function for `ffap-alist' to return path for MODULE."
- (when-let ((process (python-shell-get-process))
- (ready (python-shell-with-shell-buffer
+ (when-let* ((process (python-shell-get-process))
+ (ready (python-shell-with-shell-buffer
(python-util-comint-end-of-output-p)))
- (module-file
- (python-shell-send-string-no-output
- (format "%s\nprint(__FFAP_get_module_path(%s))"
- python-ffap-setup-code
- (python-shell--encode-string module)))))
+ (module-file
+ (python-shell-send-string-no-output
+ (format "%s\nprint(__FFAP_get_module_path(%s))"
+ python-ffap-setup-code
+ (python-shell--encode-string module)))))
(unless (string-empty-p module-file)
(python-util-strip-string module-file))))
@@ -6537,7 +6537,7 @@ This is for compatibility with Emacs < 24.4."
(defun python-util-comint-end-of-output-p ()
"Return non-nil if the last prompt matches input prompt."
- (when-let ((prompt (python-util-comint-last-prompt)))
+ (when-let* ((prompt (python-util-comint-last-prompt)))
(python-shell-comint-end-of-output-p
(buffer-substring-no-properties
(car prompt) (cdr prompt)))))
@@ -6817,8 +6817,8 @@ for key in sorted(result):
(defun python--import-sources ()
"List files containing Python imports that may be useful in the current
buffer."
- (if-let (((featurep 'project)) ;For compatibility with Emacs < 26
- (proj (project-current)))
+ (if-let* (((featurep 'project)) ;For compatibility with Emacs < 26
+ (proj (project-current)))
(seq-filter (lambda (s) (string-match-p "\\.py[iwx]?\\'" s))
(project-files proj))
(list default-directory)))
@@ -6930,9 +6930,9 @@ asking.
When calling from Lisp, use a non-nil NAME to restrict the
suggestions to imports defining NAME."
(interactive (list (when current-prefix-arg (thing-at-point 'symbol))))
- (when-let ((statement (python--query-import name
- (python--import-sources)
- "Add import: ")))
+ (when-let* ((statement (python--query-import name
+ (python--import-sources)
+ "Add import: ")))
(if (python--do-isort "--add" statement)
(message "Added `%s'" statement)
(message "(No changes in Python imports needed)"))))
@@ -6955,8 +6955,8 @@ argument, restrict the suggestions to imports defining
the symbol
at point. If there is only one such suggestion, act without
asking."
(interactive (list (when current-prefix-arg (thing-at-point 'symbol))))
- (when-let ((statement (python--query-import name (current-buffer)
- "Remove import: ")))
+ (when-let* ((statement (python--query-import name (current-buffer)
+ "Remove import: ")))
(if (python--do-isort "--rm" statement)
(message "Removed `%s'" statement)
(message "(No changes in Python imports needed)"))))
@@ -6998,11 +6998,11 @@ asking."
(forward-line 1))))
;; Compute imports to be added
(dolist (name (seq-uniq undefined))
- (when-let ((statement (python--query-import name
- (python--import-sources)
- (format "\
+ (when-let* ((statement (python--query-import name
+ (python--import-sources)
+ (format "\
Add import for undefined name `%s' (empty to skip): "
- name))))
+ name))))
(push statement add)))
;; Compute imports to be removed
(dolist (name (seq-uniq unused))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 28bd42aebde..cc06e06ef78 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1050,7 +1050,7 @@ beginning of the line."
"Return the string used to group a set of locations.
This function is used as a value for `add-log-current-defun-function'."
(xref--group-name-for-display
- (if-let (item (xref--item-at-point))
+ (if-let* ((item (xref--item-at-point)))
(xref-location-group (xref-match-item-location item))
(xref--imenu-extract-index-name))
(xref--project-root (project-current))))
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 1de26826ea1..f13fa489cae 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -560,8 +560,8 @@ This function can be used to force exit of repetition while
it's active."
(mapconcat (lambda (key-cmd)
(let ((key (car key-cmd))
(cmd (cdr key-cmd)))
- (if-let ((hint (and (symbolp cmd)
- (get cmd 'repeat-hint))))
+ (if-let* ((hint (and (symbolp cmd)
+ (get cmd 'repeat-hint))))
;; Reuse `read-multiple-choice' formatting.
(cdr (rmc--add-key-description (list key hint)))
(propertize (key-description (vector key))
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 012e305f7f4..e2b7b4c9f06 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -416,22 +416,22 @@ It runs the hook `save-place-after-find-file-hook'."
"Position point in a Dired buffer according to its saved place.
This is run via `dired-initial-position-hook', which see."
(or save-place-loaded (save-place-load-alist-from-file))
- (when-let ((directory (and (derived-mode-p 'dired-mode)
- (boundp 'dired-subdir-alist)
- dired-subdir-alist
- (dired-current-directory)))
- (item (expand-file-name (if (consp directory)
- (car directory)
- directory)))
- (cell (assoc (if save-place-abbreviate-file-names
- (abbreviate-file-name item) item)
- save-place-alist)))
+ (when-let* ((directory (and (derived-mode-p 'dired-mode)
+ (boundp 'dired-subdir-alist)
+ dired-subdir-alist
+ (dired-current-directory)))
+ (item (expand-file-name (if (consp directory)
+ (car directory)
+ directory)))
+ (cell (assoc (if save-place-abbreviate-file-names
+ (abbreviate-file-name item) item)
+ save-place-alist)))
(or revert-buffer-in-progress-p
(cond
((integerp (cdr cell))
(goto-char (cdr cell)))
((listp (cdr cell))
- (when-let ((elt (assq 'dired-filename (cdr cell))))
+ (when-let* ((elt (assq 'dired-filename (cdr cell))))
(dired-goto-file (expand-file-name (cdr elt)))))))
;; and make sure it will be saved again for later
(setq save-place-mode t)))
diff --git a/lisp/server.el b/lisp/server.el
index abfd3d4d753..d45fb2b25ab 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1904,7 +1904,7 @@ if there are no other active clients."
(length> server-clients 1)
(seq-some
(lambda (frame)
- (when-let ((p (frame-parameter frame 'client)))
+ (when-let* ((p (frame-parameter frame 'client)))
(not (eq proc p))))
(frame-list)))
;; If `server-stop-automatically' is not enabled, there
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 877b2c8b5ee..5eaa94b4633 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -294,7 +294,7 @@ Argument can be a simple name, remote file name, or already
a
(defsubst shadow-make-fullname (hup &optional host name)
"Make a Tramp style fullname out of HUP, a `tramp-file-name' structure.
Replace HOST, and NAME when non-nil. HOST can also be a remote file name."
- (when-let ((hup (copy-tramp-file-name hup)))
+ (when-let* ((hup (copy-tramp-file-name hup)))
(when host
(if (file-remote-p host)
(setq name (or name (and hup (tramp-file-name-localname hup)))
@@ -364,7 +364,7 @@ Will return the name bare if it is a local file."
Do so by replacing (when possible) home directory with ~/, and
hostname with cluster name that includes it. Filename should be
absolute and true."
- (when-let ((hup (shadow-parse-name file)))
+ (when-let* ((hup (shadow-parse-name file)))
(let* ((homedir (if (shadow-local-file hup)
shadow-homedir
(file-name-as-directory
@@ -464,8 +464,8 @@ It may have different filenames on each site. When this
file is edited, the
new version will be copied to each of the other locations. Sites can be
specific hostnames, or names of clusters (see `shadow-define-cluster')."
(interactive)
- (when-let ((hup (shadow-parse-name
- (shadow-contract-file-name (buffer-file-name)))))
+ (when-let* ((hup (shadow-parse-name
+ (shadow-contract-file-name (buffer-file-name)))))
(let* ((name (tramp-file-name-localname hup))
site group)
(while (setq site (shadow-read-site))
diff --git a/lisp/shell.el b/lisp/shell.el
index 965e6edcb37..6cfae470cd7 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1802,7 +1802,7 @@ works better if `comint-fontify-input-mode' is enabled."
(progn
(remove-hook 'comint-indirect-setup-hook
shell--highlight-undef-indirect t)
(setq shell--highlight-undef-indirect nil)
- (when-let ((buf (comint-indirect-buffer t)))
+ (when-let* ((buf (comint-indirect-buffer t)))
(with-current-buffer buf
(font-lock-remove-keywords nil shell-highlight-undef-keywords))))
(font-lock-remove-keywords nil shell-highlight-undef-keywords))
@@ -1842,7 +1842,7 @@ works better if `comint-fontify-input-mode' is enabled."
(font-lock-add-keywords nil shell-highlight-undef-keywords t))))
(cond (comint-fontify-input-mode
(setq shell--highlight-undef-indirect setup)
- (if-let ((buf (comint-indirect-buffer t)))
+ (if-let* ((buf (comint-indirect-buffer t)))
(with-current-buffer buf
(funcall setup))
(add-hook 'comint-indirect-setup-hook setup nil t)))
diff --git a/lisp/simple.el b/lisp/simple.el
index e35cfe0479b..2ffd6e86e56 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2399,7 +2399,7 @@ mode when reading the command name."
(defun command-completion-using-modes-p (symbol buffer)
"Say whether SYMBOL has been marked as a mode-specific command in BUFFER."
;; Check the modes.
- (when-let ((modes (command-modes symbol)))
+ (when-let* ((modes (command-modes symbol)))
;; Common fast case: Just a single mode.
(if (null (cdr modes))
(or (provided-mode-derived-p
@@ -2801,10 +2801,10 @@ don't clear it."
(t
;; Pass `cmd' rather than `final', for the backtrace's sake.
(prog1 (call-interactively cmd record-flag keys)
- (when-let ((info
- (and (symbolp cmd)
- (not (get cmd 'command-execute-obsolete-warned))
- (get cmd 'byte-obsolete-info))))
+ (when-let* ((info
+ (and (symbolp cmd)
+ (not (get cmd 'command-execute-obsolete-warned))
+ (get cmd 'byte-obsolete-info))))
(put cmd 'command-execute-obsolete-warned t)
(message "%s" (macroexp--obsolete-warning
cmd info "command"
@@ -4779,7 +4779,7 @@ Names'.
If a file name handler is unable to retrieve the effective uid,
this function will instead return -1."
- (if-let ((handler (find-file-name-handler default-directory 'file-user-uid)))
+ (if-let* ((handler (find-file-name-handler default-directory
'file-user-uid)))
(funcall handler 'file-user-uid)
(user-uid)))
@@ -4791,7 +4791,7 @@ Names'.
If a file name handler is unable to retrieve the effective gid,
this function will instead return -1."
- (if-let ((handler (find-file-name-handler default-directory
'file-group-gid)))
+ (if-let* ((handler (find-file-name-handler default-directory
'file-group-gid)))
(funcall handler 'file-group-gid)
(group-gid)))
@@ -10054,7 +10054,7 @@ the completions is popped up and down."
(let ((inhibit-read-only t))
(add-text-properties (point) (min (1+ (point)) (point-max))
'(first-completion t))))
- (when-let ((pos (next-single-property-change (point) 'mouse-face)))
+ (when-let* ((pos (next-single-property-change (point) 'mouse-face)))
(goto-char pos))))
(defun last-completion ()
@@ -10064,7 +10064,7 @@ the completions is popped up and down."
(point-max) 'mouse-face nil (point-min)))
;; Move to the start of last one.
(unless (get-text-property (point) 'mouse-face)
- (when-let ((pos (previous-single-property-change (point) 'mouse-face)))
+ (when-let* ((pos (previous-single-property-change (point) 'mouse-face)))
(goto-char pos))))
(defun previous-completion (n)
@@ -10491,10 +10491,10 @@ to move point between completions.\n\n")))))))
(defun switch-to-completions ()
"Select the completion list window."
(interactive)
- (when-let ((window (or (get-buffer-window "*Completions*" 0)
- ;; Make sure we have a completions window.
- (progn (minibuffer-completion-help)
- (get-buffer-window "*Completions*" 0)))))
+ (when-let* ((window (or (get-buffer-window "*Completions*" 0)
+ ;; Make sure we have a completions window.
+ (progn (minibuffer-completion-help)
+ (get-buffer-window "*Completions*" 0)))))
(select-window window)
(when (bobp)
(cond
diff --git a/lisp/startup.el b/lisp/startup.el
index 738eec772ec..3436409a35e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1106,9 +1106,9 @@ init-file, or to a default value if loading is not
possible."
;; The next test is for builds without native
;; compilation support or builds with unexec.
(boundp 'comp-eln-to-el-h))
- (if-let (source (gethash (file-name-nondirectory
- user-init-file)
- comp-eln-to-el-h))
+ (if-let* ((source (gethash (file-name-nondirectory
+ user-init-file)
+ comp-eln-to-el-h)))
;; source exists or the .eln file would not load
(setq user-init-file source)
(message "Warning: unknown source file for init file %S"
diff --git a/lisp/subr.el b/lisp/subr.el
index 9113235ca5d..e630087b68f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2623,8 +2623,17 @@ Affects only hooks run in the current buffer."
(defmacro if-let* (varlist then &rest else)
"Bind variables according to VARLIST and evaluate THEN or ELSE.
-This is like `if-let' but doesn't handle a VARLIST of the form
-\(SYMBOL SOMETHING) specially."
+Evaluate each binding in turn, as in `let*', stopping if a
+binding value is nil. If all are non-nil return the value of
+THEN, otherwise the value of the last form in ELSE, or nil if
+there are none.
+
+Each element of VARLIST is a list (SYMBOL VALUEFORM) that binds
+SYMBOL to the value of VALUEFORM. An element can additionally be
+of the form (VALUEFORM), which is evaluated and checked for nil;
+i.e. SYMBOL can be omitted if only the test result is of
+interest. It can also be of the form SYMBOL, then the binding of
+SYMBOL is checked for nil."
(declare (indent 2)
(debug ((&rest [&or symbolp (symbolp form) (form)])
body)))
@@ -2637,8 +2646,10 @@ This is like `if-let' but doesn't handle a VARLIST of
the form
(defmacro when-let* (varlist &rest body)
"Bind variables according to VARLIST and conditionally evaluate BODY.
-This is like `when-let' but doesn't handle a VARLIST of the form
-\(SYMBOL SOMETHING) specially.
+Evaluate each binding in turn, stopping if a binding value is nil.
+If all are non-nil, return the value of the last form in BODY.
+
+The variable list VARLIST is the same as in `if-let*'.
See also `and-let*'."
(declare (indent 1) (debug if-let*))
@@ -2665,21 +2676,10 @@ for forms evaluated for side-effect with returned
values ignored."
(defmacro if-let (spec then &rest else)
"Bind variables according to SPEC and evaluate THEN or ELSE.
-Evaluate each binding in turn, as in `let*', stopping if a
-binding value is nil. If all are non-nil return the value of
-THEN, otherwise the value of the last form in ELSE, or nil if
-there are none.
-
-Each element of SPEC is a list (SYMBOL VALUEFORM) that binds
-SYMBOL to the value of VALUEFORM. An element can additionally be
-of the form (VALUEFORM), which is evaluated and checked for nil;
-i.e. SYMBOL can be omitted if only the test result is of
-interest. It can also be of the form SYMBOL, then the binding of
-SYMBOL is checked for nil.
-
-As a special case, interprets a SPEC of the form \(SYMBOL SOMETHING)
-like \((SYMBOL SOMETHING)). This exists for backward compatibility
-with an old syntax that accepted only one binding."
+This is like `if-let*' except, as a special case, interpret a SPEC of
+the form \(SYMBOL SOMETHING) like \((SYMBOL SOMETHING)). This exists
+for backward compatibility with an old syntax that accepted only one
+binding."
(declare (indent 2)
(debug ([&or (symbolp form) ; must be first, Bug#48489
(&rest [&or symbolp (symbolp form) (form)])]
@@ -2699,6 +2699,10 @@ The variable list SPEC is the same as in `if-let'."
(declare (indent 1) (debug if-let))
(list 'if-let spec (macroexp-progn body)))
+(make-obsolete 'if-let 'if-let* "31.1")
+(make-obsolete 'when-let "use `when-let*' or `and-let*' instead."
+ "31.1")
+
(defmacro while-let (spec &rest body)
"Bind variables according to SPEC and conditionally evaluate BODY.
Evaluate each binding in turn, stopping if a binding value is nil.
diff --git a/lisp/tab-line.el b/lisp/tab-line.el
index 92b52b6936c..3c83a02739a 100644
--- a/lisp/tab-line.el
+++ b/lisp/tab-line.el
@@ -461,7 +461,7 @@ named the same as the mode.")
(defun tab-line-tabs-buffer-group-by-project (&optional buffer)
"Group tab buffers by project name."
(with-current-buffer buffer
- (if-let ((project (project-current)))
+ (if-let* ((project (project-current)))
(project-name project)
"No project")))
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 7278bee48d4..a0366374d34 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -1049,7 +1049,7 @@ return nil. Otherwise point is returned."
(while (and (not found)
(not (eobp)))
(forward-line 1)
- (when-let ((descriptor (ignore-errors (tar-get-descriptor))))
+ (when-let* ((descriptor (ignore-errors (tar-get-descriptor))))
(when (equal (tar-header-name descriptor) file)
(setq found t))))
(if (not found)
@@ -1074,7 +1074,7 @@ return nil. Otherwise point is returned."
(beginning-of-line)
(bobp)))))
(tar-next-line n)
- (when-let ((descriptor (ignore-errors (tar-get-descriptor))))
+ (when-let* ((descriptor (ignore-errors (tar-get-descriptor))))
(let ((candidate (tar-header-name descriptor))
(buffer (current-buffer)))
(when (and candidate
diff --git a/lisp/term/android-win.el b/lisp/term/android-win.el
index df1cdc5143e..5ecf789e364 100644
--- a/lisp/term/android-win.el
+++ b/lisp/term/android-win.el
@@ -159,7 +159,7 @@ two markers or an overlay. Otherwise, it is nil."
VALUE should be something suitable for passing to
`gui-set-selection'."
(unless (stringp value)
- (when-let ((bounds (android-selection-bounds value)))
+ (when-let* ((bounds (android-selection-bounds value)))
(setq value (ignore-errors
(with-current-buffer (nth 2 bounds)
(buffer-substring (nth 0 bounds)
@@ -204,7 +204,7 @@ VALUE should be something suitable for passing to
&context (window-system android))
;; First, try to turn value into a string.
;; Don't set anything if that did not work.
- (when-let ((string (android-encode-select-string value)))
+ (when-let* ((string (android-encode-select-string value)))
(cond ((eq type 'CLIPBOARD)
(android-set-clipboard string))
((eq type 'PRIMARY)
diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el
index efc0a129062..c6091669adc 100644
--- a/lisp/term/haiku-win.el
+++ b/lisp/term/haiku-win.el
@@ -142,7 +142,7 @@ two markers or an overlay. Otherwise, it is nil."
Return a list of the appropriate MIME type, and UTF-8 data of
VALUE as a unibyte string, or nil if VALUE was not a string."
(unless (stringp value)
- (when-let ((bounds (haiku-selection-bounds value)))
+ (when-let* ((bounds (haiku-selection-bounds value)))
(setq value (ignore-errors
(with-current-buffer (nth 2 bounds)
(buffer-substring (nth 0 bounds)
@@ -260,7 +260,7 @@ CLIPBOARD should be the symbol `PRIMARY', `SECONDARY' or
VALUE will be encoded as Latin-1 (like on X Windows) and stored
under the type `text/plain;charset=iso-8859-1'."
(unless (stringp value)
- (when-let ((bounds (haiku-selection-bounds value)))
+ (when-let* ((bounds (haiku-selection-bounds value)))
(setq value (ignore-errors
(with-current-buffer (nth 2 bounds)
(buffer-substring (nth 0 bounds)
@@ -274,7 +274,7 @@ under the type `text/plain;charset=iso-8859-1'."
VALUE will be encoded as UTF-8 and stored under the type
`text/plain'."
(unless (stringp value)
- (when-let ((bounds (haiku-selection-bounds value)))
+ (when-let* ((bounds (haiku-selection-bounds value)))
(setq value (ignore-errors
(with-current-buffer (nth 2 bounds)
(buffer-substring (nth 0 bounds)
diff --git a/lisp/textmodes/emacs-news-mode.el
b/lisp/textmodes/emacs-news-mode.el
index 6321bd8efad..bb514f462ea 100644
--- a/lisp/textmodes/emacs-news-mode.el
+++ b/lisp/textmodes/emacs-news-mode.el
@@ -247,7 +247,7 @@ untagged NEWS entry."
(while (re-search-forward "'\\([^-][^ \t\n]+\\)'" nil t)
;; Filter out references to key sequences.
(let ((string (match-string 1)))
- (when-let ((symbol (intern-soft string)))
+ (when-let* ((symbol (intern-soft string)))
(when (or (boundp symbol)
(fboundp symbol))
(buttonize-region (match-beginning 1) (match-end 1)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 35550d1bbc4..404f682d379 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -3723,7 +3723,7 @@ If APPEND is non-nil, don't erase previous debugging
output."
(while cur
(unless (string-prefix-p word (car cur))
(setcar cur (concat word (substring (car cur) len))))
- (while (when-let ((next (cadr cur)))
+ (while (when-let* ((next (cadr cur)))
(not (string-prefix-p word next t)))
(setcdr cur (cddr cur)))
(setq cur (cdr cur)))
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index ee585896946..cc86294df09 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1205,7 +1205,7 @@ and move to the line in the SGML document that caused it."
(or sgml-saved-validate-command
(concat sgml-validate-command
" "
- (when-let ((name (buffer-file-name)))
+ (when-let* ((name (buffer-file-name)))
(shell-quote-argument
(file-name-nondirectory name))))))))
(setq sgml-saved-validate-command command)
@@ -2436,14 +2436,14 @@ To work around that, do:
(defun html-mode--complete-at-point ()
;; Complete a tag like <colg etc.
(or
- (when-let ((tag (save-excursion
- (and (looking-back "<\\([^ \t\n]*\\)"
- (line-beginning-position))
- (match-string 1)))))
+ (when-let* ((tag (save-excursion
+ (and (looking-back "<\\([^ \t\n]*\\)"
+ (line-beginning-position))
+ (match-string 1)))))
(list (match-beginning 1) (point)
(mapcar #'car html-tag-alist)))
;; Complete params like <colgroup ali etc.
- (when-let ((tag (save-excursion (sgml-beginning-of-tag)))
+ (when-let* ((tag (save-excursion (sgml-beginning-of-tag)))
(params (seq-filter #'consp (cdr (assoc tag html-tag-alist))))
(param (save-excursion
(and (looking-back "[ \t\n]\\([^= \t\n]*\\)"
@@ -2452,14 +2452,14 @@ To work around that, do:
(list (match-beginning 1) (point)
(mapcar #'car params)))
;; Complete param values like <colgroup align=mi etc.
- (when-let ((tag (save-excursion (sgml-beginning-of-tag)))
- (params (seq-filter #'consp (cdr (assoc tag html-tag-alist))))
- (param (save-excursion
- (and (looking-back
- "[ \t\n]\\([^= \t\n]+\\)=\\([^= \t\n]*\\)"
- (line-beginning-position))
- (match-string 1))))
- (values (cdr (assoc param params))))
+ (when-let* ((tag (save-excursion (sgml-beginning-of-tag)))
+ (params (seq-filter #'consp (cdr (assoc tag html-tag-alist))))
+ (param (save-excursion
+ (and (looking-back
+ "[ \t\n]\\([^= \t\n]+\\)=\\([^= \t\n]*\\)"
+ (line-beginning-position))
+ (match-string 1))))
+ (values (cdr (assoc param params))))
(list (match-beginning 2) (point)
(mapcar #'car values)))))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index cb934690782..9cb95f59da4 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2752,9 +2752,9 @@ line LINE of the window, or centered if LINE is nil."
(let ((tex-shell (get-buffer "*tex-shell*")))
(if (null tex-shell)
(message "No TeX output buffer")
- (when-let ((window
- (with-suppressed-warnings ((obsolete
display-tex-shell-buffer-action))
- (display-buffer tex-shell
display-tex-shell-buffer-action))))
+ (when-let* ((window
+ (with-suppressed-warnings ((obsolete
display-tex-shell-buffer-action))
+ (display-buffer tex-shell
display-tex-shell-buffer-action))))
(with-selected-window window
(bury-buffer tex-shell)
(goto-char (point-max))
@@ -4006,12 +4006,12 @@ There might be text before point."
(seq-union amalist extlist #'string-match-p))))
(setq tex--buffers-list bufs)
(dolist (buf bufs)
- (when-let ((fbuf (buffer-file-name buf))
- (ext (file-name-extension fbuf))
- (finext (concat "*." ext))
- ((not (seq-find (lambda (elt) (string-match-p elt finext))
- extlist-new)))
- ((push finext extlist-new)))))
+ (when-let* ((fbuf (buffer-file-name buf))
+ (ext (file-name-extension fbuf))
+ (finext (concat "*." ext))
+ ((not (seq-find (lambda (elt) (string-match-p elt
finext))
+ extlist-new)))
+ ((push finext extlist-new)))))
(unless (seq-set-equal-p extlist-new extlist)
(setf (alist-get mode semantic-symref-filepattern-alist)
extlist-new))))
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 3cfd3905701..51b59ca50f4 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -408,7 +408,7 @@ E.g.:
(defun thing-at-point-file-at-point (&optional _lax _bounds)
"Return the name of the existing file at point."
- (when-let ((filename (thing-at-point 'filename)))
+ (when-let* ((filename (thing-at-point 'filename)))
(setq filename (expand-file-name filename))
(and (file-exists-p filename)
filename)))
@@ -423,7 +423,7 @@ E.g.:
(defun thing-at-point-face-at-point (&optional _lax _bounds)
"Return the name of the face at point as a symbol."
- (when-let ((face (thing-at-point 'symbol)))
+ (when-let* ((face (thing-at-point 'symbol)))
(and (facep face) (intern face))))
(put 'face 'thing-at-point 'thing-at-point-face-at-point)
diff --git a/lisp/thread.el b/lisp/thread.el
index 4c428f30f71..b1edf3e4678 100644
--- a/lisp/thread.el
+++ b/lisp/thread.el
@@ -126,7 +126,7 @@ other describing THREAD's blocker, if any."
(cond
((not (thread-live-p thread)) '("Finished" ""))
((eq thread (current-thread)) '("Running" ""))
- (t (if-let ((blocker (thread--blocker thread)))
+ (t (if-let* ((blocker (thread--blocker thread)))
`("Blocked" ,(prin1-to-string blocker))
'("Yielded" "")))))
diff --git a/lisp/time.el b/lisp/time.el
index 47d6b4a705d..3bb34657e07 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -548,7 +548,7 @@ If the value is t instead of an alist, use the value of
(defun world-clock-copy-time-as-kill ()
"Copy current line into the kill ring."
(interactive nil world-clock-mode)
- (when-let ((str (buffer-substring-no-properties (pos-bol) (pos-eol))))
+ (when-let* ((str (buffer-substring-no-properties (pos-bol) (pos-eol))))
(kill-new str)
(message str)))
@@ -598,7 +598,7 @@ See `world-clock'."
The variable `world-clock-list' specifies which time zones to use.
To turn off the world time display, go to the window and type \\[quit-window]."
(interactive)
- (if-let ((buffer (get-buffer world-clock-buffer-name)))
+ (if-let* ((buffer (get-buffer world-clock-buffer-name)))
(pop-to-buffer buffer)
(pop-to-buffer world-clock-buffer-name)
(when world-clock-timer-enable
diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el
index d8e9dc2d791..677360b2ed4 100644
--- a/lisp/touch-screen.el
+++ b/lisp/touch-screen.el
@@ -1759,8 +1759,8 @@ functions undertaking event management themselves to call
;; The positions of tools currently pressed against the screen
;; have changed. If there is a tool being tracked as part of a
;; gesture, look it up in the list of tools.
- (if-let ((new-point (assq (car touch-screen-current-tool)
- (cadr event))))
+ (if-let* ((new-point (assq (car touch-screen-current-tool)
+ (cadr event))))
(if touch-screen-aux-tool
(touch-screen-handle-aux-point-update (cdr new-point)
(car new-point))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 6046563ae3e..f02703a5cd3 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -150,7 +150,7 @@ In a multi-language buffer, make sure
`treesit-language-at' wouldn't return the correct result."
(if treesit-language-at-point-function
(funcall treesit-language-at-point-function position)
- (when-let ((parser (car (treesit-parser-list))))
+ (when-let* ((parser (car (treesit-parser-list))))
(treesit-parser-language parser))))
;;; Node API supplement
@@ -198,9 +198,9 @@ unless PARSER-OR-LANG is a parser, or PARSER-OR-LANG is a
language and doesn't match the language of the local parser."
(let* ((root (if (treesit-parser-p parser-or-lang)
(treesit-parser-root-node parser-or-lang)
- (or (when-let ((parser
- (car (treesit-local-parsers-at
- pos parser-or-lang))))
+ (or (when-let* ((parser
+ (car (treesit-local-parsers-at
+ pos parser-or-lang))))
(treesit-parser-root-node parser))
(treesit-buffer-root-node
(or parser-or-lang
@@ -256,10 +256,10 @@ parser first."
(let* ((lang-at-point (treesit-language-at beg))
(root (if (treesit-parser-p parser-or-lang)
(treesit-parser-root-node parser-or-lang)
- (or (when-let ((parser
- (car (treesit-local-parsers-on
- beg end (or parser-or-lang
- lang-at-point)))))
+ (or (when-let* ((parser
+ (car (treesit-local-parsers-on
+ beg end (or parser-or-lang
+ lang-at-point)))))
(treesit-parser-root-node parser))
(treesit-buffer-root-node
(or parser-or-lang lang-at-point))))))
@@ -294,11 +294,11 @@ Use the first parser in the parser list if LANGUAGE is
omitted.
If LANGUAGE is non-nil, use the first parser for LANGUAGE with
TAG in the parser list, or create one if none exists. TAG
defaults to nil."
- (if-let ((parser
- (if language
- (treesit-parser-create language nil nil tag)
- (or (car (treesit-parser-list))
- (signal 'treesit-no-parser (list (current-buffer)))))))
+ (if-let* ((parser
+ (if language
+ (treesit-parser-create language nil nil tag)
+ (or (car (treesit-parser-list))
+ (signal 'treesit-no-parser (list (current-buffer)))))))
(treesit-parser-root-node parser)))
(defun treesit-filter-child (node pred &optional named)
@@ -382,8 +382,8 @@ If NAMED is non-nil, count named child only."
(defun treesit-node-field-name (node)
"Return the field name of NODE as a child of its parent."
- (when-let ((parent (treesit-node-parent node))
- (idx (treesit-node-index node)))
+ (when-let* ((parent (treesit-node-parent node))
+ (idx (treesit-node-index node)))
(treesit-node-field-name-for-child parent idx)))
(defun treesit-node-get (node instructions)
@@ -678,8 +678,8 @@ instead. HOST-PARSER is the host parser which created the
local
PARSER."
(let ((res nil))
(dolist (ov (overlays-at (or pos (point))))
- (when-let ((parser (overlay-get ov 'treesit-parser))
- (host-parser (overlay-get ov 'treesit-host-parser)))
+ (when-let* ((parser (overlay-get ov 'treesit-parser))
+ (host-parser (overlay-get ov 'treesit-host-parser)))
(when (or (null language)
(eq (treesit-parser-language parser)
language))
@@ -700,8 +700,8 @@ instead. HOST-PARSER is the host parser which created the
local
PARSER."
(let ((res nil))
(dolist (ov (overlays-in (or beg (point-min)) (or end (point-max))))
- (when-let ((parser (overlay-get ov 'treesit-parser))
- (host-parser (overlay-get ov 'treesit-host-parser)))
+ (when-let* ((parser (overlay-get ov 'treesit-parser))
+ (host-parser (overlay-get ov 'treesit-host-parser)))
(when (or (null language)
(eq (treesit-parser-language parser)
language))
@@ -715,10 +715,10 @@ For every local parser overlay between BEG and END, if its
`treesit-parser-ov-timestamp' is smaller than MODIFIED-TICK, delete
it."
(dolist (ov (overlays-in beg end))
- (when-let ((ov-timestamp
- (overlay-get ov 'treesit-parser-ov-timestamp)))
+ (when-let* ((ov-timestamp
+ (overlay-get ov 'treesit-parser-ov-timestamp)))
(when (< ov-timestamp modified-tick)
- (when-let ((local-parser (overlay-get ov 'treesit-parser)))
+ (when-let* ((local-parser (overlay-get ov 'treesit-parser)))
(treesit-parser-delete local-parser))
(delete-overlay ov)))))
@@ -1143,7 +1143,7 @@ signals the `treesit-font-lock-error' error if that
happens.
If LANGUAGE is non-nil, only compute features for that language,
and leave settings for other languages unchanged."
- (when-let ((intersection (cl-intersection add-list remove-list)))
+ (when-let* ((intersection (cl-intersection add-list remove-list)))
(signal 'treesit-font-lock-error
(list "ADD-LIST and REMOVE-LIST contain the same feature"
intersection)))
@@ -1392,7 +1392,7 @@ If LOUDLY is non-nil, display some debugging information."
(setq treesit--font-lock-fast-mode nil))))
;; Only activate if ENABLE flag is t.
- (when-let
+ (when-let*
((activate (eq t enable))
(nodes (if (eq t treesit--font-lock-fast-mode)
(mapcan
@@ -2335,8 +2335,8 @@ friends."
(if (= arg -1)
(cons (treesit-node-start prev)
(treesit-node-end prev))
- (when-let ((n (treesit-node-child
- parent (+ arg (treesit-node-index prev t)) t)))
+ (when-let* ((n (treesit-node-child
+ parent (+ arg (treesit-node-index prev t)) t)))
(cons (treesit-node-end n)
(treesit-node-start n))))
(loop (treesit-node-next-sibling prev t)
@@ -2858,7 +2858,7 @@ The delimiter between nested defun names is controlled by
(let ((node (treesit-defun-at-point))
(name nil))
(while node
- (when-let ((new-name (treesit-defun-name node)))
+ (when-let* ((new-name (treesit-defun-name node)))
(if name
(setq name (concat new-name
treesit-add-log-defun-delimiter
@@ -3175,7 +3175,7 @@ before calling this function."
;; Remove existing local parsers.
(dolist (ov (overlays-in (point-min) (point-max)))
- (when-let ((parser (overlay-get ov 'treesit-parser)))
+ (when-let* ((parser (overlay-get ov 'treesit-parser)))
(treesit-parser-delete parser)
(delete-overlay ov))))
@@ -3397,9 +3397,9 @@ in the region."
(when (and top-level (not highlight-only))
(erase-buffer)
(treesit--explorer-draw-node top-level))
- (when-let ((pos (treesit--explorer-highlight-node nodes-hl))
- (window (get-buffer-window
- treesit--explorer-buffer)))
+ (when-let* ((pos (treesit--explorer-highlight-node nodes-hl))
+ (window (get-buffer-window
+ treesit--explorer-buffer)))
(if highlight-only
(goto-char pos)
;; If HIGHLIGHT-ONLY is nil, we erased the buffer and
@@ -3700,26 +3700,26 @@ nil, the grammar is installed to the standard location,
the
"Language: "
(mapcar #'car treesit-language-source-alist)))
'interactive))
- (when-let ((recipe
- (or (assoc lang treesit-language-source-alist)
- (if (eq out-dir 'interactive)
- (treesit--install-language-grammar-build-recipe
- lang)
- (signal 'treesit-error `("Cannot find recipe for this
language" ,lang)))))
- (default-out-dir
- (or (car treesit--install-language-grammar-out-dir-history)
- (locate-user-emacs-file "tree-sitter")))
- (out-dir
- (if (eq out-dir 'interactive)
- (read-string
- (format "Install to (default: %s): "
- default-out-dir)
- nil
- 'treesit--install-language-grammar-out-dir-history
- default-out-dir)
- ;; When called non-interactively, OUT-DIR should
- ;; default to DEFAULT-OUT-DIR.
- (or out-dir default-out-dir))))
+ (when-let* ((recipe
+ (or (assoc lang treesit-language-source-alist)
+ (if (eq out-dir 'interactive)
+ (treesit--install-language-grammar-build-recipe
+ lang)
+ (signal 'treesit-error `("Cannot find recipe for this
language" ,lang)))))
+ (default-out-dir
+ (or (car treesit--install-language-grammar-out-dir-history)
+ (locate-user-emacs-file "tree-sitter")))
+ (out-dir
+ (if (eq out-dir 'interactive)
+ (read-string
+ (format "Install to (default: %s): "
+ default-out-dir)
+ nil
+ 'treesit--install-language-grammar-out-dir-history
+ default-out-dir)
+ ;; When called non-interactively, OUT-DIR should
+ ;; default to DEFAULT-OUT-DIR.
+ (or out-dir default-out-dir))))
(condition-case err
(progn
(apply #'treesit--install-language-grammar-1
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 2bf62d7cfbb..253d2ecfe72 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -259,9 +259,9 @@ how long to wait for a response before giving up."
(url-debug 'retrieval
"Spinning in url-retrieve-synchronously: nil (%S)"
proc-buffer)
- (when-let ((redirect-buffer
- (buffer-local-value 'url-redirect-buffer
- proc-buffer)))
+ (when-let* ((redirect-buffer
+ (buffer-local-value 'url-redirect-buffer
+ proc-buffer)))
(unless (eq redirect-buffer proc-buffer)
(url-debug
'retrieval "Redirect in url-retrieve-synchronously: %S ->
%S"
@@ -270,7 +270,7 @@ how long to wait for a response before giving up."
(kill-buffer proc-buffer))
;; Accommodate hack in commit 55d1d8b.
(setq proc-buffer redirect-buffer)))
- (when-let ((proc (get-buffer-process proc-buffer)))
+ (when-let* ((proc (get-buffer-process proc-buffer)))
(when (memq (process-status proc)
'(closed exit signal failed))
;; Process sentinel vagaries occasionally cause
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 13258b15845..e6bfc5e64f3 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1244,7 +1244,7 @@ spacing of the \"Lower\" chunk."
(write-region beg2 end2 file2 nil 'nomessage)
(unwind-protect
(save-current-buffer
- (if-let (buffer (get-buffer smerge-diff-buffer-name))
+ (if-let* ((buffer (get-buffer smerge-diff-buffer-name)))
(set-buffer buffer)
(set-buffer (get-buffer-create smerge-diff-buffer-name))
(setq buffer-read-only t))
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index d733b36f8ff..4e1b1831389 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1456,9 +1456,9 @@ These are the commands available for use in the file
status buffer:
(let ((use-vc-backend backend))
(vc-dir-mode)
;; Activate the backend-specific minor mode, if any.
- (when-let ((minor-mode
- (intern-soft (format "vc-dir-%s-mode"
- (downcase (symbol-name backend))))))
+ (when-let* ((minor-mode
+ (intern-soft (format "vc-dir-%s-mode"
+ (downcase (symbol-name backend))))))
(funcall minor-mode 1)))))
(defun vc-default-dir-extra-headers (_backend _dir)
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 36456fdb2e2..634b6fe1555 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -460,7 +460,7 @@ Display the buffer in some window, but don't select it."
args))))
(setq proc (apply #'vc-do-command t 'async command nil args))))
(unless vc--inhibit-async-window
- (when-let ((window (display-buffer buffer)))
+ (when-let* ((window (display-buffer buffer)))
(set-window-start window new-window-start)))
proc))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f2dc584bba9..ff0bc68e2d4 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -737,14 +737,14 @@ or an empty string if none."
(let ((branch (vc-git--current-branch))
tracking remote-url)
(if branch
- (when-let ((branch-merge
- (vc-git--out-match
- `("config" ,(concat "branch." branch ".merge"))
- "^\\(refs/heads/\\)?\\(.+\\)$" 2))
- (branch-remote
- (vc-git--out-match
- `("config" ,(concat "branch." branch ".remote"))
- "\\([^\n]+\\)" 1)))
+ (when-let* ((branch-merge
+ (vc-git--out-match
+ `("config" ,(concat "branch." branch ".merge"))
+ "^\\(refs/heads/\\)?\\(.+\\)$" 2))
+ (branch-remote
+ (vc-git--out-match
+ `("config" ,(concat "branch." branch ".remote"))
+ "\\([^\n]+\\)" 1)))
(if (string= branch-remote ".")
(setq tracking branch-merge
remote-url "none (tracking local branch)")
@@ -877,7 +877,7 @@ or an empty string if none."
(list
(concat
(propertize "Stash : " 'face 'vc-dir-header)
- (if-let ((stash-list (vc-git-stash-list)))
+ (if-let* ((stash-list (vc-git-stash-list)))
(let* ((len (length stash-list))
(limit
(if (integerp vc-git-show-stash)
@@ -1051,19 +1051,19 @@ If toggling on, also insert its message into the
buffer."
(defun vc-git--log-edit-summary-check (limit)
(and (re-search-forward "^Summary: " limit t)
- (when-let ((regex
- (cond ((and (natnump vc-git-log-edit-summary-max-len)
- (natnump vc-git-log-edit-summary-target-len))
- (format ".\\{,%d\\}\\(.\\{,%d\\}\\)\\(.*\\)"
- vc-git-log-edit-summary-target-len
- (- vc-git-log-edit-summary-max-len
- vc-git-log-edit-summary-target-len)))
- ((natnump vc-git-log-edit-summary-max-len)
- (format ".\\{,%d\\}\\(?2:.*\\)"
- vc-git-log-edit-summary-max-len))
- ((natnump vc-git-log-edit-summary-target-len)
- (format ".\\{,%d\\}\\(.*\\)"
- vc-git-log-edit-summary-target-len)))))
+ (when-let* ((regex
+ (cond ((and (natnump vc-git-log-edit-summary-max-len)
+ (natnump vc-git-log-edit-summary-target-len))
+ (format ".\\{,%d\\}\\(.\\{,%d\\}\\)\\(.*\\)"
+ vc-git-log-edit-summary-target-len
+ (- vc-git-log-edit-summary-max-len
+ vc-git-log-edit-summary-target-len)))
+ ((natnump vc-git-log-edit-summary-max-len)
+ (format ".\\{,%d\\}\\(?2:.*\\)"
+ vc-git-log-edit-summary-max-len))
+ ((natnump vc-git-log-edit-summary-target-len)
+ (format ".\\{,%d\\}\\(.*\\)"
+ vc-git-log-edit-summary-target-len)))))
(re-search-forward regex limit t))))
(define-derived-mode vc-git-log-edit-mode log-edit-mode "Log-Edit/git"
@@ -2229,7 +2229,7 @@ This command shares argument histories with \\[rgrep] and
\\[grep]."
(vc-resynch-buffer (vc-git-root default-directory) t t))
(defun vc-git-stash-list ()
- (when-let ((out (vc-git--run-command-string nil "stash" "list")))
+ (when-let* ((out (vc-git--run-command-string nil "stash" "list")))
(split-string
(replace-regexp-in-string
"^stash@" " " out)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index f64fd55f6a8..6498b8522fd 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1058,8 +1058,8 @@ responsible for the given file."
(dirs (delq nil
(mapcar
(lambda (backend)
- (when-let ((dir (vc-call-backend
- backend 'responsible-p file)))
+ (when-let* ((dir (vc-call-backend
+ backend 'responsible-p file)))
;; We run DIR through `expand-file-name'
;; so that abbreviated directories, such
;; as "~/", wouldn't look "less specific"
@@ -2174,7 +2174,7 @@ deduced fileset."
(defun vc-buffer-sync-fileset (fileset not-urgent)
(dolist (filename (cadr fileset))
- (when-let ((buffer (find-buffer-visiting filename)))
+ (when-let* ((buffer (find-buffer-visiting filename)))
(with-current-buffer buffer
(vc-buffer-sync not-urgent)))))
@@ -3834,9 +3834,9 @@ cloning; the syntax of REV depends on what BACKEND
accepts."
(catch 'ok
(dolist (backend vc-handled-backends)
(ignore-error vc-not-supported
- (when-let ((res (vc-call-backend
- backend 'clone
- remote directory rev)))
+ (when-let* ((res (vc-call-backend
+ backend 'clone
+ remote directory rev)))
(throw 'ok res)))))))
(declare-function log-view-current-tag "log-view" (&optional pos))
diff --git a/lisp/visual-wrap.el b/lisp/visual-wrap.el
index fa128d287a4..b6117960bf7 100644
--- a/lisp/visual-wrap.el
+++ b/lisp/visual-wrap.el
@@ -117,9 +117,9 @@ extra indent = 2
"Apply visual-wrapping properties to the logical line starting at POSITION."
(save-excursion
(goto-char position)
- (when-let ((first-line-prefix (fill-match-adaptive-prefix))
- (next-line-prefix (visual-wrap--content-prefix
- first-line-prefix position)))
+ (when-let* ((first-line-prefix (fill-match-adaptive-prefix))
+ (next-line-prefix (visual-wrap--content-prefix
+ first-line-prefix position)))
(when (numberp next-line-prefix)
;; Set a minimum width for the prefix so it lines up correctly
;; with subsequent lines. Make sure not to do this past the end
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 1d47f80b0dd..6fbf6257232 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1042,8 +1042,8 @@ button end points."
(defun widget-text (widget)
"Get the text representation of the widget."
- (when-let ((from (widget-get widget :from))
- (to (widget-get widget :to)))
+ (when-let* ((from (widget-get widget :from))
+ (to (widget-get widget :to)))
(when (eq (marker-buffer from) (marker-buffer to)) ; is this check
necessary?
(buffer-substring-no-properties from to))))
@@ -2942,7 +2942,7 @@ Otherwise, the new widget is the default child of WIDGET.
The new widget gets inserted at the position of the BEFORE child."
(save-excursion
(let ((children (widget-get widget :children))
- (last-deleted (when-let ((lst (widget-get widget :last-deleted)))
+ (last-deleted (when-let* ((lst (widget-get widget :last-deleted)))
(prog1
(pop lst)
(widget-put widget :last-deleted lst)))))
diff --git a/lisp/window-tool-bar.el b/lisp/window-tool-bar.el
index 63484da3255..2f16addfb33 100644
--- a/lisp/window-tool-bar.el
+++ b/lisp/window-tool-bar.el
@@ -305,8 +305,8 @@ MENU-ITEM is a menu item to convert. See info node
`(elisp)Tool Bar'."
'face
'window-tool-bar-button-disabled
str))
- (when-let ((spec (and (window-tool-bar--use-images)
- (plist-get menu-item :image))))
+ (when-let* ((spec (and (window-tool-bar--use-images)
+ (plist-get menu-item :image))))
(put-text-property 0 len
'display
(append spec
diff --git a/lisp/window.el b/lisp/window.el
index b50770cbd7e..c790118c5e0 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -8094,7 +8094,7 @@ specified by the ACTION argument."
(while (and functions (not window))
(setq window (funcall (car functions) buffer alist)
functions (cdr functions)))
- (when-let ((select (assq 'post-command-select-window alist)))
+ (when-let* ((select (assq 'post-command-select-window alist)))
(letrec ((old-selected-window (selected-window))
(postfun
(lambda ()
@@ -8187,10 +8187,10 @@ This is an action function for buffer display, see Info
node `(elisp) Buffer Display Action Functions'. It should be
called only by `display-buffer' or a function directly or
indirectly called by the latter."
- (when-let ((window (or (display-buffer-reuse-window buffer alist)
- (display-buffer-same-window buffer alist)
- (display-buffer-pop-up-window buffer alist)
- (display-buffer-use-some-window buffer alist))))
+ (when-let* ((window (or (display-buffer-reuse-window buffer alist)
+ (display-buffer-same-window buffer alist)
+ (display-buffer-pop-up-window buffer alist)
+ (display-buffer-use-some-window buffer alist))))
(delete-other-windows window)
window))
@@ -11071,10 +11071,10 @@ that can be later used as argument for
`window-point-context-use-function'.
Remember the returned context in the window parameter `context'."
(walk-windows
(lambda (w)
- (when-let ((fn (buffer-local-value 'window-point-context-set-function
- (window-buffer w)))
- ((functionp fn))
- (context (funcall fn w)))
+ (when-let* ((fn (buffer-local-value 'window-point-context-set-function
+ (window-buffer w)))
+ ((functionp fn))
+ (context (funcall fn w)))
(set-window-parameter
w 'context (cons (buffer-name (window-buffer w)) context))))
'nomini))
@@ -11090,11 +11090,11 @@ The function called is supposed to set the window
point to the location
found by the provided context."
(walk-windows
(lambda (w)
- (when-let ((fn (buffer-local-value 'window-point-context-use-function
- (window-buffer w)))
- ((functionp fn))
- (context (window-parameter w 'context))
- ((equal (buffer-name (window-buffer w)) (car context))))
+ (when-let* ((fn (buffer-local-value 'window-point-context-use-function
+ (window-buffer w)))
+ ((functionp fn))
+ (context (window-parameter w 'context))
+ ((equal (buffer-name (window-buffer w)) (car context))))
(funcall fn w (cdr context))
(set-window-parameter w 'context nil)))
'nomini))
@@ -11119,11 +11119,11 @@ found by the provided context."
(let ((point (window-point w)))
(save-excursion
(goto-char point)
- (when-let ((f (alist-get 'front-context-string context))
- ((search-forward f (point-max) t)))
+ (when-let* ((f (alist-get 'front-context-string context))
+ ((search-forward f (point-max) t)))
(goto-char (match-beginning 0))
- (when-let ((r (alist-get 'rear-context-string context))
- ((search-backward r (point-min) t)))
+ (when-let* ((r (alist-get 'rear-context-string context))
+ ((search-backward r (point-min) t)))
(goto-char (match-end 0))
(setq point (point)))))
(set-window-point w point))))
diff --git a/lisp/xdg.el b/lisp/xdg.el
index 4c675489400..dc04fa88b03 100644
--- a/lisp/xdg.el
+++ b/lisp/xdg.el
@@ -291,7 +291,7 @@ According to the XDG Desktop Entry Specification version
0.5:
colon-separated list of strings ... $XDG_CURRENT_DESKTOP
should have been set by the login manager, according to the
value of the DesktopNames found in the session file."
- (when-let ((ret (getenv "XDG_CURRENT_DESKTOP")))
+ (when-let* ((ret (getenv "XDG_CURRENT_DESKTOP")))
(string-split ret ":")))
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index c5a84db6d4a..04581a75bc0 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -439,7 +439,7 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the
originating xwidget."
(cond ((eq xwidget-event-type 'load-changed)
(let ((title (xwidget-webkit-title xwidget))
(uri (xwidget-webkit-uri xwidget)))
- (when-let ((buffer (get-buffer "*Xwidget WebKit History*")))
+ (when-let* ((buffer (get-buffer "*Xwidget WebKit History*")))
(with-current-buffer buffer
(revert-buffer)))
(with-current-buffer (xwidget-buffer xwidget)
diff --git a/lisp/yank-media.el b/lisp/yank-media.el
index 563aae85419..6655bb705ef 100644
--- a/lisp/yank-media.el
+++ b/lisp/yank-media.el
@@ -81,7 +81,7 @@ all the different selection types."
(gui-get-selection 'CLIPBOARD 'TARGETS)))
(defun yank-media--get-selection (data-type)
- (when-let ((data (gui-get-selection 'CLIPBOARD data-type)))
+ (when-let* ((data (gui-get-selection 'CLIPBOARD data-type)))
(if (string-match-p "\\`text/" (symbol-name data-type))
(yank-media-types--format data-type data)
data)))
@@ -116,7 +116,7 @@ non-supported selection data types."
(let ((elements nil))
;; First gather all the data.
(dolist (type '(PRIMARY CLIPBOARD))
- (when-let ((data-types (gui-get-selection type 'TARGETS)))
+ (when-let* ((data-types (gui-get-selection type 'TARGETS)))
(when (vectorp data-types)
(seq-do (lambda (data-type)
(unless (memq data-type '( TARGETS MULTIPLE
diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el
index 10a4ff34239..0d6fc701eec 100644
--- a/test/lisp/comint-tests.el
+++ b/test/lisp/comint-tests.el
@@ -73,9 +73,9 @@ happen to lurk on PATH when running the test suite."
(defun comint-tests/test-password-function (password-function)
"PASSWORD-FUNCTION can return nil or a string."
- (when-let ((cat (if (eq system-type 'windows-nt)
- (w32-native-executable-find "cat")
- (executable-find "cat"))))
+ (when-let* ((cat (if (eq system-type 'windows-nt)
+ (w32-native-executable-find "cat")
+ (executable-find "cat"))))
(let ((comint-password-function password-function))
(cl-letf (((symbol-function 'read-passwd)
(lambda (&rest _args) "non-nil")))
diff --git a/test/lisp/completion-preview-tests.el
b/test/lisp/completion-preview-tests.el
index b190ecb7020..cfbf6d101e2 100644
--- a/test/lisp/completion-preview-tests.el
+++ b/test/lisp/completion-preview-tests.el
@@ -24,7 +24,7 @@
(defun completion-preview-tests--capf (completions &rest props)
(lambda ()
- (when-let ((bounds (bounds-of-thing-at-point 'symbol)))
+ (when-let* ((bounds (bounds-of-thing-at-point 'symbol)))
(append (list (car bounds) (cdr bounds) completions) props))))
(defun completion-preview-tests--check-preview
diff --git a/test/lisp/cus-edit-tests.el b/test/lisp/cus-edit-tests.el
index ecef4c35b47..cfebcdc3551 100644
--- a/test/lisp/cus-edit-tests.el
+++ b/test/lisp/cus-edit-tests.el
@@ -31,7 +31,7 @@
`(save-window-excursion
(unwind-protect
(progn ,@body)
- (when-let ((buf (get-buffer ,buffer)))
+ (when-let* ((buf (get-buffer ,buffer)))
(kill-buffer buf)))))
diff --git a/test/lisp/erc/erc-scenarios-base-local-modules.el
b/test/lisp/erc/erc-scenarios-base-local-modules.el
index 9604c6ea17c..e84671d35ed 100644
--- a/test/lisp/erc/erc-scenarios-base-local-modules.el
+++ b/test/lisp/erc/erc-scenarios-base-local-modules.el
@@ -153,7 +153,7 @@
(define-erc-module -phony-sblm- nil
"Test module for `erc-scenarios-base-local-modules--var-persistence'."
- ((when-let ((vars (or erc--server-reconnecting erc--target-priors)))
+ ((when-let* ((vars (or erc--server-reconnecting erc--target-priors)))
(should (assq 'erc--phony-sblm--mode vars))
(setq erc-scenarios-base-local-modules--local-var
(alist-get 'erc-scenarios-base-local-modules--local-var vars)))
diff --git a/test/lisp/erc/erc-scenarios-stamp.el
b/test/lisp/erc/erc-scenarios-stamp.el
index 2e836e163bc..8aea091333b 100644
--- a/test/lisp/erc/erc-scenarios-stamp.el
+++ b/test/lisp/erc/erc-scenarios-stamp.el
@@ -29,7 +29,7 @@
(defvar erc-scenarios-stamp--user-marker nil)
(defun erc-scenarios-stamp--on-post-modify ()
- (when-let (((erc--check-msg-prop 'erc--cmd 4)))
+ (when-let* (((erc--check-msg-prop 'erc--cmd 4)))
(set-marker erc-scenarios-stamp--user-marker (point-max))
(ert-info ("User marker correctly placed at `erc-insert-marker'")
(should (= ?\n (char-before erc-scenarios-stamp--user-marker)))
diff --git a/test/lisp/erc/erc-services-tests.el
b/test/lisp/erc/erc-services-tests.el
index 126f6d7bbdd..a4420fbcbe2 100644
--- a/test/lisp/erc/erc-services-tests.el
+++ b/test/lisp/erc/erc-services-tests.el
@@ -485,7 +485,7 @@
;; This function gives ^ (faked here to avoid gpg and file IO). See
;; `auth-source-pass--with-store' in ../auth-source-pass-tests.el
(defun erc-services-tests--asp-parse-entry (store entry)
- (when-let ((found (cl-find entry store :key #'car :test #'string=)))
+ (when-let* ((found (cl-find entry store :key #'car :test #'string=)))
(list (assoc 'secret (cdr found)))))
(defvar erc-join-tests--auth-source-pass-entries
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index eddb3a5b2c8..4c5521721f0 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -3444,8 +3444,8 @@
(ert-deftest erc-modules--internal-property ()
(let (ours)
(mapatoms (lambda (s)
- (when-let ((v (get s 'erc--module))
- ((eq v s)))
+ (when-let* ((v (get s 'erc--module))
+ ((eq v s)))
(push s ours))))
(should (equal (sort ours #'string-lessp) erc-tests--modules))))
@@ -3480,7 +3480,7 @@
(setq mods (sort mods (lambda (a b) (if (zerop (random 2)) a b))))
(dolist (mod mods)
(unless (keywordp mod)
- (push (if-let ((mode (erc--find-mode mod))) mod (list :missing mod))
+ (push (if-let* ((mode (erc--find-mode mod))) mod (list :missing mod))
moded)))
(message "%S"
(sort moded (lambda (a b)
@@ -3578,7 +3578,7 @@
(cl-letf (((symbol-function 'require)
(lambda (s &rest _)
;; Simulate library being loaded, things defined.
- (when-let ((h (alist-get s on-load))) (funcall h))
+ (when-let* ((h (alist-get s on-load))) (funcall h))
(push (cons 'req s) calls)))
;; Spoof global module detection.
diff --git a/test/lisp/erc/resources/erc-d/erc-d-i.el
b/test/lisp/erc/resources/erc-d/erc-d-i.el
index 97cd56408ce..89aacdd2ec3 100644
--- a/test/lisp/erc/resources/erc-d/erc-d-i.el
+++ b/test/lisp/erc/resources/erc-d/erc-d-i.el
@@ -102,15 +102,15 @@ With DECODE, decode as UTF-8 text."
(setq s (decode-coding-string s 'utf-8 t)))
(let ((mes (make-erc-d-i-message :unparsed s :compat (not decode)))
tokens)
- (when-let (((not (string-empty-p s)))
- ((eq ?@ (aref s 0)))
- (m (string-match " " s))
- (u (substring s 1 m)))
+ (when-let* (((not (string-empty-p s)))
+ ((eq ?@ (aref s 0)))
+ (m (string-match " " s))
+ (u (substring s 1 m)))
(setf (erc-d-i-message.tags mes) (erc-d-i--validate-tags u)
s (substring s (1+ m))))
- (if-let ((m (string-search " :" s))
- (other-toks (split-string (substring s 0 m) " " t))
- (rest (substring s (+ 2 m))))
+ (if-let* ((m (string-search " :" s))
+ (other-toks (split-string (substring s 0 m) " " t))
+ (rest (substring s (+ 2 m))))
(setf (erc-d-i-message.contents mes) rest
tokens (nconc other-toks (list rest)))
(setf tokens (split-string s " " t " ")
diff --git a/test/lisp/erc/resources/erc-d/erc-d-t.el
b/test/lisp/erc/resources/erc-d/erc-d-t.el
index 2dc8398198f..d0d48c6ce4d 100644
--- a/test/lisp/erc/resources/erc-d/erc-d-t.el
+++ b/test/lisp/erc/resources/erc-d/erc-d-t.el
@@ -38,11 +38,11 @@
(when (and (boundp 'erc-server-flood-timer)
(timerp erc-server-flood-timer))
(cancel-timer erc-server-flood-timer))
- (when-let ((proc (get-buffer-process buf)))
+ (when-let* ((proc (get-buffer-process buf)))
(delete-process proc))
(when (buffer-live-p buf)
(kill-buffer buf))))
- (while (when-let ((buf (pop erc-d-u--canned-buffers)))
+ (while (when-let* ((buf (pop erc-d-u--canned-buffers)))
(kill-buffer buf))))
(defun erc-d-t-silence-around (orig &rest args)
@@ -74,10 +74,10 @@ returning."
(push o procs)))
(dolist (proc procs)
(delete-process proc)
- (when-let ((buf (process-buffer proc)))
+ (when-let* ((buf (process-buffer proc)))
(push buf bufs)))
(dolist (buf bufs)
- (when-let ((proc (get-buffer-process buf)))
+ (when-let* ((proc (get-buffer-process buf)))
(delete-process proc))
(when (bufferp buf)
(ignore-errors (kill-buffer buf)))))
diff --git a/test/lisp/erc/resources/erc-d/erc-d-tests.el
b/test/lisp/erc/resources/erc-d/erc-d-tests.el
index a626ddd8edc..22afe8454ee 100644
--- a/test/lisp/erc/resources/erc-d/erc-d-tests.el
+++ b/test/lisp/erc/resources/erc-d/erc-d-tests.el
@@ -318,23 +318,23 @@
m (erc-d-i--parse-message input))
(ert-info ("Parses tags correctly")
(setq ours (erc-d-i-message.tags m))
- (if-let ((tags (assoc-default 'tags atoms)))
+ (if-let* ((tags (assoc-default 'tags atoms)))
(pcase-dolist (`(,key . ,value) ours)
(should (string= (cdr (assq key tags)) (or value ""))))
(should-not ours)))
(ert-info ("Parses verbs correctly")
(setq ours (erc-d-i-message.command m))
- (if-let ((verbs (assoc-default 'verb atoms)))
+ (if-let* ((verbs (assoc-default 'verb atoms)))
(should (string= (downcase verbs) (downcase ours)))
(should (string-empty-p ours))))
(ert-info ("Parses sources correctly")
(setq ours (erc-d-i-message.sender m))
- (if-let ((source (assoc-default 'source atoms)))
+ (if-let* ((source (assoc-default 'source atoms)))
(should (string= source ours))
(should (string-empty-p ours))))
(ert-info ("Parses params correctly")
(setq ours (erc-d-i-message.command-args m))
- (if-let ((params (assoc-default 'params atoms)))
+ (if-let* ((params (assoc-default 'params atoms)))
(should (equal ours params))
(should-not ours))))))
diff --git a/test/lisp/erc/resources/erc-d/erc-d-u.el
b/test/lisp/erc/resources/erc-d/erc-d-u.el
index 11202f41112..8ba33fc9032 100644
--- a/test/lisp/erc/resources/erc-d/erc-d-u.el
+++ b/test/lisp/erc/resources/erc-d/erc-d-u.el
@@ -150,7 +150,7 @@ of zero or more response specs."
(erc-d-u--canned-read dialog))
(defun erc-d-u--read-exchange-slowly (num orig info)
- (when-let ((spec (funcall orig info)))
+ (when-let* ((spec (funcall orig info)))
(when (symbolp (car spec))
(setf spec (copy-sequence spec)
(nth 1 spec) (cond ((functionp num) (funcall num (nth 1 spec)))
diff --git a/test/lisp/erc/resources/erc-d/erc-d.el
b/test/lisp/erc/resources/erc-d/erc-d.el
index 89701442ff6..08c8a958c6b 100644
--- a/test/lisp/erc/resources/erc-d/erc-d.el
+++ b/test/lisp/erc/resources/erc-d/erc-d.el
@@ -382,7 +382,7 @@ Return associated server."
"Raise timeout error for EXCHANGE.
This will start the teardown for DIALOG."
(setf (erc-d-exchange-spec exchange) nil)
- (if-let ((finalizer (erc-d-dialog-finalizer dialog)))
+ (if-let* ((finalizer (erc-d-dialog-finalizer dialog)))
(funcall finalizer dialog exchange)
(erc-d--teardown 'erc-d-timeout "Timed out awaiting request: %s"
(list :name (erc-d-exchange-tag exchange)
@@ -801,7 +801,7 @@ with leading-tilde tags."
(defun erc-d--finalize-done (dialog)
;; Linger logic for individual dialogs is handled elsewhere
- (if-let ((finalizer (erc-d-dialog-finalizer dialog)))
+ (if-let* ((finalizer (erc-d-dialog-finalizer dialog)))
(funcall finalizer dialog)
(let ((d (process-get (erc-d-dialog-process dialog) :dialog-linger-secs)))
(push (run-at-time d nil #'erc-d--teardown)
@@ -876,7 +876,7 @@ back others indicating the lifecycle stage of the current
dialog."
(apply #'erc-d--teardown matched)
(erc-d-on-match dialog matched)
(setf (erc-d-dialog-matched dialog) matched)
- (if-let ((s (erc-d--command-meter-replies dialog matched nil)))
+ (if-let* ((s (erc-d--command-meter-replies dialog matched nil)))
(throw 'yield s)
(setf (erc-d-dialog-matched dialog) nil))))
(erc-d--command-refresh dialog matched)))))))
diff --git a/test/lisp/erc/resources/erc-scenarios-common.el
b/test/lisp/erc/resources/erc-scenarios-common.el
index 130b0aae109..1f663a90f78 100644
--- a/test/lisp/erc/resources/erc-scenarios-common.el
+++ b/test/lisp/erc/resources/erc-scenarios-common.el
@@ -185,8 +185,8 @@ Dialog resource directories are located by expanding the
variable
(ert-info ("Restore autojoin, etc., kill ERC buffers")
(dolist (buf (buffer-list))
- (when-let ((erc-d-u--process-buffer)
- (proc (get-buffer-process buf)))
+ (when-let* ((erc-d-u--process-buffer)
+ (proc (get-buffer-process buf)))
(delete-process proc)))
(erc-scenarios-common--remove-silence)
diff --git a/test/lisp/erc/resources/erc-tests-common.el
b/test/lisp/erc/resources/erc-tests-common.el
index db0c5d626c9..a9495ecb28d 100644
--- a/test/lisp/erc/resources/erc-tests-common.el
+++ b/test/lisp/erc/resources/erc-tests-common.el
@@ -246,8 +246,8 @@ For simplicity, assume string evaluates to itself."
(defvar erc-stamp--deferred-date-stamp)
(let (erc-stamp--deferred-date-stamp)
(prog1 (apply orig args)
- (when-let ((inst erc-stamp--deferred-date-stamp)
- (fn (erc-stamp--date-fn inst)))
+ (when-let* ((inst erc-stamp--deferred-date-stamp)
+ (fn (erc-stamp--date-fn inst)))
(funcall fn)))))
(defun erc-tests-common-display-message (&rest args)
@@ -338,8 +338,8 @@ string."
"Return subprocess for running CODE in an inferior Emacs.
Include SWITCHES, like \"-batch\", as well as libs, after
interspersing \"-l\" between members."
- (let* ((package (if-let ((found (getenv "ERC_PACKAGE_NAME"))
- ((string-prefix-p "erc-" found)))
+ (let* ((package (if-let* ((found (getenv "ERC_PACKAGE_NAME"))
+ ((string-prefix-p "erc-" found)))
(intern found)
'erc))
;; For integrations testing with managed configs that use a
diff --git a/test/lisp/ibuffer-tests.el b/test/lisp/ibuffer-tests.el
index ea9e663b1ad..4422bbe6660 100644
--- a/test/lisp/ibuffer-tests.el
+++ b/test/lisp/ibuffer-tests.el
@@ -132,7 +132,7 @@
(ibuffer-switch-to-saved-filter-groups "saved-filters")
(should (assoc "Elisp" (cdar ibuffer-saved-filter-groups))))
(setq ibuffer-saved-filter-groups orig-filters)
- (when-let ((it (get-buffer "*Ibuffer*")))
+ (when-let* ((it (get-buffer "*Ibuffer*")))
(and (buffer-live-p it) (kill-buffer it))))))
diff --git a/test/lisp/international/mule-tests.el
b/test/lisp/international/mule-tests.el
index 9c869cc8e6f..5bcb8f5a551 100644
--- a/test/lisp/international/mule-tests.el
+++ b/test/lisp/international/mule-tests.el
@@ -67,7 +67,7 @@
(ert-deftest mule-cmds-tests--ucs-names-missing-names ()
(let (code-points)
(dotimes (u (1+ (max-char 'ucs)))
- (when-let ((name (get-char-code-property u 'name)))
+ (when-let* ((name (get-char-code-property u 'name)))
(when (and (not (<= #xD800 u #xDFFF))
(not (<= #x18800 u #x18AFF))
(not (char-from-name name)))
diff --git a/test/lisp/progmodes/python-tests.el
b/test/lisp/progmodes/python-tests.el
index 9eef82e9c90..4cc4040d0ff 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -3790,8 +3790,8 @@ condition is met. If env string EMACS_PYTHON_INTERPRETER
exists, use it
as preferred one."
(unless python-tests-shell-interpreters
(setq python-tests-shell-interpreters
- (if-let ((interpreter (getenv "EMACS_PYTHON_INTERPRETER")))
- (if-let ((info (python-tests--get-interpreter-info interpreter)))
+ (if-let* ((interpreter (getenv "EMACS_PYTHON_INTERPRETER")))
+ (if-let* ((info (python-tests--get-interpreter-info
interpreter)))
(list info)
(error "Couldn't find EMACS_PYTHON_INTERPRETER(%s) in path"
interpreter))
@@ -3805,7 +3805,7 @@ as preferred one."
"Get Python interpreter information specified by NAME.
The information returned is a cons cell consisting of the file path and
the version string."
- (when-let ((interpreter (executable-find name)))
+ (when-let* ((interpreter (executable-find name)))
(with-temp-buffer
(and (equal (call-process interpreter nil t nil "--version") 0)
(goto-char (point-min))
diff --git a/test/lisp/progmodes/ruby-ts-mode-tests.el
b/test/lisp/progmodes/ruby-ts-mode-tests.el
index 05d98974acf..08620294ebe 100644
--- a/test/lisp/progmodes/ruby-ts-mode-tests.el
+++ b/test/lisp/progmodes/ruby-ts-mode-tests.el
@@ -275,8 +275,8 @@ The whitespace before and including \"|\" on each line is
removed."
expected))))))
(defmacro ruby-ts-resource-file (file)
- `(when-let ((testfile ,(or (macroexp-file-name)
- buffer-file-name)))
+ `(when-let* ((testfile ,(or (macroexp-file-name)
+ buffer-file-name)))
(let ((default-directory (file-name-directory testfile)))
(file-truename
(expand-file-name (format "ruby-mode-resources/%s" ,file))))))
diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el
index 11260204750..5efb75b6d85 100644
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@ -547,7 +547,7 @@ Return the last evalled form in BODY."
(delq nil
(mapcar
(lambda (chr)
- (when-let (it (alist-get chr char-nums))
+ (when-let* ((it (alist-get chr char-nums)))
(if (cdr it)
`(,(cons 'or it) ,chr)
`(,(car it) ,chr))))
diff --git a/test/src/emacs-tests.el b/test/src/emacs-tests.el
index 19c3793b93d..06b0b00862b 100644
--- a/test/src/emacs-tests.el
+++ b/test/src/emacs-tests.el
@@ -221,7 +221,7 @@ which the process was running."
(terpri)
(princ (buffer-substring-no-properties (point-min) (point-max)))
;; Search audit logs for Seccomp messages.
- (when-let ((ausearch (executable-find "ausearch")))
+ (when-let* ((ausearch (executable-find "ausearch")))
(terpri)
(princ "Potentially relevant Seccomp audit events:")
(terpri)
@@ -236,7 +236,7 @@ which the process was running."
(format-time-string "%T" end-time)
"--interpret")))
;; Print coredump information if available.
- (when-let ((coredumpctl (executable-find "coredumpctl")))
+ (when-let* ((coredumpctl (executable-find "coredumpctl")))
(terpri)
(princ "Potentially useful coredump information:")
(terpri)
diff --git a/test/src/process-tests.el b/test/src/process-tests.el
index 862416a49a9..98bdbbd42ee 100644
--- a/test/src/process-tests.el
+++ b/test/src/process-tests.el
@@ -946,8 +946,8 @@ COMMAND must be a list returned by
(defun process-tests--emacs-command ()
"Return a command to reinvoke the current Emacs instance.
Return nil if that doesn't appear to be possible."
- (when-let ((binary (process-tests--emacs-binary))
- (dump (process-tests--dump-file)))
+ (when-let* ((binary (process-tests--emacs-binary))
+ (dump (process-tests--dump-file)))
(cons binary
(unless (eq dump :not-needed)
(list (concat "--dump-file="
@@ -962,18 +962,18 @@ Return nil if that can't be determined."
(stringp invocation-directory)
(not (file-remote-p invocation-directory))
(file-name-absolute-p invocation-directory)
- (when-let ((file (process-tests--usable-file-for-reinvoke
- (expand-file-name invocation-name
- invocation-directory))))
+ (when-let* ((file (process-tests--usable-file-for-reinvoke
+ (expand-file-name invocation-name
+ invocation-directory))))
(and (file-executable-p file) file))))
(defun process-tests--dump-file ()
"Return the filename of the dump file used to start Emacs.
Return nil if that can't be determined. Return `:not-needed' if
Emacs wasn't started with a dump file."
- (if-let ((stats (and (fboundp 'pdumper-stats) (pdumper-stats))))
- (when-let ((file (process-tests--usable-file-for-reinvoke
- (cdr (assq 'dump-file-name stats)))))
+ (if-let* ((stats (and (fboundp 'pdumper-stats) (pdumper-stats))))
+ (when-let* ((file (process-tests--usable-file-for-reinvoke
+ (cdr (assq 'dump-file-name stats)))))
(and (file-readable-p file) file))
:not-needed))
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index ca595c41244..50f205421d7 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -1022,10 +1022,10 @@ and \"]\"."
;; Four functions: next-end, prev-beg, next-beg, prev-end.
(mapcar (lambda (conf)
(lambda ()
- (if-let ((pos (funcall
- #'treesit-navigate-thing
- (point) (car conf) (cdr conf)
- treesit-defun-type-regexp tactic)))
+ (if-let* ((pos (funcall
+ #'treesit-navigate-thing
+ (point) (car conf) (cdr conf)
+ treesit-defun-type-regexp tactic)))
(save-excursion
(goto-char pos)
(funcall treesit-defun-skipper)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 8903106bb78: Mark if-let and when-let obsolete,
Sean Whitton <=