
* 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.
669 lines
26 KiB
EmacsLisp
669 lines
26 KiB
EmacsLisp
;;; pp.el --- pretty printer for Emacs Lisp -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 1989, 1993, 2001-2024 Free Software Foundation, Inc.
|
|
|
|
;; Author: Randal Schwartz <merlyn@stonehenge.com>
|
|
;; Keywords: lisp
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'cl-lib)
|
|
|
|
(defgroup pp nil
|
|
"Pretty printer for Emacs Lisp."
|
|
:prefix "pp-"
|
|
:group 'lisp)
|
|
|
|
(defcustom pp-escape-newlines t
|
|
"Value of `print-escape-newlines' used by pp-* functions."
|
|
:type 'boolean)
|
|
|
|
(defcustom pp-max-width t
|
|
"Max width to use when formatting.
|
|
If nil, there's no max width. If t, use the window width.
|
|
Otherwise this should be a number."
|
|
:type '(choice (const :tag "none" nil)
|
|
(const :tag "window width" t)
|
|
number)
|
|
:version "29.1")
|
|
|
|
(defcustom pp-use-max-width nil
|
|
"If non-nil, `pp'-related functions will try to fold lines.
|
|
The target width is given by the `pp-max-width' variable.
|
|
Note that this could slow down `pp' considerably when formatting
|
|
large lists."
|
|
:type 'boolean
|
|
:version "29.1")
|
|
(make-obsolete-variable 'pp-use-max-width 'pp-default-function "30.1")
|
|
|
|
(defcustom pp-default-function #'pp-fill
|
|
;; FIXME: The best pretty printer to use depends on the use-case
|
|
;; so maybe we should allow callers to specify what they want (maybe with
|
|
;; options like `fast', `compact', `code', `data', ...) and these
|
|
;; can then be mapped to actual pretty-printing algorithms.
|
|
;; Then again, callers can just directly call the corresponding function.
|
|
"Function that `pp' should dispatch to for pretty printing.
|
|
That function can be called in one of two ways:
|
|
- with a single argument, which it should insert and pretty-print at point.
|
|
- with two arguments which delimit a region containing Lisp sexps
|
|
which should be pretty-printed.
|
|
In both cases, the function can presume that the buffer is setup for
|
|
Lisp syntax."
|
|
:type '(choice
|
|
(const :tag "Fit within `fill-column'" pp-fill)
|
|
(const :tag "Emacs<29 algorithm, fast and good enough" pp-28)
|
|
(const :tag "Work hard for code (slow on large inputs)"
|
|
pp-emacs-lisp-code)
|
|
(const :tag "`pp-emacs-lisp-code' if `pp-use-max-width' else `pp-28'"
|
|
pp-29)
|
|
function)
|
|
:version "30.1")
|
|
|
|
(defvar pp--inhibit-function-formatting nil)
|
|
|
|
;; There are basically two APIs for a pretty-printing function:
|
|
;;
|
|
;; - either the function takes an object (and prints it in addition to
|
|
;; prettifying it).
|
|
;; - or the function takes a region containing an already printed object
|
|
;; and prettifies its content.
|
|
;;
|
|
;; `pp--object' and `pp--region' are helper functions to convert one
|
|
;; API to the other.
|
|
|
|
|
|
(defun pp--object (object region-function)
|
|
"Pretty-print OBJECT at point.
|
|
The prettifying is done by REGION-FUNCTION which is
|
|
called with two positions as arguments and should fold lines
|
|
within that region. Returns the result as a string."
|
|
(let ((print-escape-newlines pp-escape-newlines)
|
|
(print-quoted t)
|
|
(beg (point)))
|
|
;; FIXME: In many cases it would be preferable to use `cl-prin1' here.
|
|
(prin1 object (current-buffer))
|
|
(funcall region-function beg (point))))
|
|
|
|
(defun pp--region (beg end object-function)
|
|
"Pretty-print the object(s) contained within BEG..END.
|
|
OBJECT-FUNCTION is called with a single object as argument
|
|
and should pretty print it at point into the current buffer."
|
|
(save-excursion
|
|
(with-restriction beg end
|
|
(goto-char (point-min))
|
|
(while
|
|
(progn
|
|
;; We'll throw away all the comments within objects, but let's
|
|
;; try at least to preserve the comments between objects.
|
|
(forward-comment (point-max))
|
|
(let ((beg (point))
|
|
(object (ignore-error end-of-buffer
|
|
(list (read (current-buffer))))))
|
|
(when (consp object)
|
|
(delete-region beg (point))
|
|
(funcall object-function (car object))
|
|
t)))))))
|
|
|
|
(defun pp-29 (beg-or-sexp &optional end) ;FIXME: Better name?
|
|
"Prettify the current region with printed representation of a Lisp object.
|
|
Uses the pretty-printing algorithm that was standard in Emacs-29,
|
|
which, depending on `pp-use-max-width', will either use `pp-28'
|
|
or `pp-emacs-lisp-code'."
|
|
(if pp-use-max-width
|
|
(let ((pp--inhibit-function-formatting t)) ;FIXME: Why?
|
|
(pp-emacs-lisp-code beg-or-sexp end))
|
|
(pp-28 beg-or-sexp end)))
|
|
|
|
;;;###autoload
|
|
(defun pp-to-string (object &optional pp-function)
|
|
"Return a string containing the pretty-printed representation of OBJECT.
|
|
OBJECT can be any Lisp object. Quoting characters are used as needed
|
|
to make output that `read' can handle, whenever this is possible.
|
|
Optional argument PP-FUNCTION overrides `pp-default-function'."
|
|
(with-temp-buffer
|
|
(lisp-mode-variables nil)
|
|
(set-syntax-table emacs-lisp-mode-syntax-table)
|
|
(funcall (or pp-function pp-default-function) object)
|
|
;; Preserve old behavior of (usually) finishing with a newline.
|
|
(unless (bolp) (insert "\n"))
|
|
(buffer-string)))
|
|
|
|
(defun pp--within-fill-column-p ()
|
|
"Return non-nil if point is within `fill-column'."
|
|
;; Try and make it O(fill-column) rather than O(current-column),
|
|
;; so as to avoid major slowdowns on long lines.
|
|
;; FIXME: This doesn't account for invisible text or `display' properties :-(
|
|
(and (save-excursion
|
|
(re-search-backward
|
|
"^\\|\n" (max (point-min) (- (point) fill-column)) t))
|
|
(<= (current-column) fill-column)))
|
|
|
|
(defun pp-fill (beg &optional end)
|
|
"Break lines in Lisp code between BEG and END so it fits within `fill-column'.
|
|
Presumes the current buffer has syntax and indentation properly
|
|
configured for that.
|
|
Designed under the assumption that the region occupies a single line,
|
|
tho it should also work if that's not the case.
|
|
Can also be called with a single argument, in which case
|
|
it inserts and pretty-prints that arg at point."
|
|
(interactive "r")
|
|
(if (null end) (pp--object beg #'pp-fill)
|
|
(goto-char beg)
|
|
(let* ((end (copy-marker end t))
|
|
(avoid-unbreakable
|
|
(lambda ()
|
|
(and (memq (char-before) '(?# ?s ?f))
|
|
(memq (char-after) '(?\[ ?\())
|
|
(looking-back "#[sf]?" (- (point) 2))
|
|
(goto-char (match-beginning 0)))))
|
|
(newline (lambda ()
|
|
(skip-chars-forward ")]}")
|
|
(unless (save-excursion (skip-chars-forward " \t") (eolp))
|
|
(funcall avoid-unbreakable)
|
|
(insert "\n")
|
|
(indent-according-to-mode)))))
|
|
(while (progn (forward-comment (point-max))
|
|
(< (point) end))
|
|
(let ((beg (point))
|
|
;; Whether we're in front of an element with paired delimiters.
|
|
;; Can be something funky like #'(lambda ..) or ,'#s(...)
|
|
;; Or also #^[..].
|
|
(paired (when (looking-at "['`,#]*[[:alpha:]^]*\\([({[\"]\\)")
|
|
(match-beginning 1))))
|
|
;; Go to the end of the sexp.
|
|
(goto-char (or (scan-sexps (or paired (point)) 1) end))
|
|
(unless
|
|
(and
|
|
;; The sexp is all on a single line.
|
|
(save-excursion (not (search-backward "\n" beg t)))
|
|
;; And its end is within `fill-column'.
|
|
(or (pp--within-fill-column-p)
|
|
;; If the end of the sexp is beyond `fill-column',
|
|
;; try to move the sexp to its own line.
|
|
(and
|
|
(save-excursion
|
|
(goto-char beg)
|
|
;; We skip backward over open parens because cutting
|
|
;; the line right after an open paren does not help
|
|
;; reduce the indentation depth.
|
|
;; Similarly, we prefer to cut before a "." than after
|
|
;; it because it reduces the indentation depth.
|
|
(while
|
|
(progn
|
|
(funcall avoid-unbreakable)
|
|
(not (zerop (skip-chars-backward " \t({[',.")))))
|
|
(if (bolp)
|
|
;; The sexp already starts on its own line.
|
|
(progn (goto-char beg) nil)
|
|
(setq beg (copy-marker beg t))
|
|
(if paired (setq paired (copy-marker paired t)))
|
|
;; We could try to undo this insertion if it
|
|
;; doesn't reduce the indentation depth, but I'm
|
|
;; not sure it's worth the trouble.
|
|
(insert "\n") (indent-according-to-mode)
|
|
t))
|
|
;; Check again if we moved the whole exp to a new line.
|
|
(pp--within-fill-column-p))))
|
|
;; The sexp is spread over several lines, and/or its end is
|
|
;; (still) beyond `fill-column'.
|
|
(when (and paired (not (eq ?\" (char-after paired))))
|
|
;; The sexp has sub-parts, so let's try and spread
|
|
;; them over several lines.
|
|
(save-excursion
|
|
(goto-char beg)
|
|
(when (looking-at "(\\([^][()\" \t\n;']+\\)")
|
|
;; Inside an expression of the form (SYM ARG1
|
|
;; ARG2 ... ARGn) where SYM has a `lisp-indent-function'
|
|
;; property that's a number, insert a newline after
|
|
;; the corresponding ARGi, because it tends to lead to
|
|
;; more natural and less indented code.
|
|
(let* ((sym (intern-soft (match-string 1)))
|
|
(lif (and sym (get sym 'lisp-indent-function))))
|
|
(if (eq lif 'defun) (setq lif 2))
|
|
(when (natnump lif)
|
|
(goto-char (match-end 0))
|
|
;; Do nothing if there aren't enough args.
|
|
(ignore-error scan-error
|
|
(forward-sexp lif)
|
|
(funcall newline))))))
|
|
(save-excursion
|
|
(pp-fill (1+ paired) (1- (point)))))
|
|
;; Now the sexp either ends beyond `fill-column' or is
|
|
;; spread over several lines (or both). Either way, the
|
|
;; rest of the line should be moved to its own line.
|
|
(funcall newline)))))))
|
|
|
|
;;;###autoload
|
|
(defun pp-buffer ()
|
|
"Prettify the current buffer with printed representation of a Lisp object."
|
|
(interactive)
|
|
;; The old code used `indent-sexp' which mostly works "anywhere",
|
|
;; so let's make sure we also work right in buffers that aren't
|
|
;; setup specifically for Lisp.
|
|
(if (and (eq (syntax-table) emacs-lisp-mode-syntax-table)
|
|
(eq indent-line-function #'lisp-indent-line))
|
|
(funcall pp-default-function (point-min) (point-max))
|
|
(with-syntax-table emacs-lisp-mode-syntax-table
|
|
(let ((indent-line-function #'lisp-indent-line))
|
|
(funcall pp-default-function (point-min) (point-max)))))
|
|
;; Preserve old behavior of (usually) finishing with a newline and
|
|
;; with point at BOB.
|
|
(goto-char (point-max))
|
|
(unless (bolp) (insert "\n"))
|
|
(goto-char (point-min)))
|
|
|
|
(defun pp-28 (beg &optional end) ;FIXME: Better name?
|
|
"Prettify the current region with printed representation of a Lisp object.
|
|
Uses the pretty-printing algorithm that was standard before Emacs-30.
|
|
Non-interactively can also be called with a single argument, in which
|
|
case that argument will be inserted pretty-printed at point."
|
|
(interactive "r")
|
|
(if (null end) (pp--object beg #'pp-29)
|
|
(with-restriction beg end
|
|
(goto-char (point-min))
|
|
(while (not (eobp))
|
|
(cond
|
|
((ignore-errors (down-list 1) t)
|
|
(save-excursion
|
|
(backward-char 1)
|
|
(skip-chars-backward "'`#^")
|
|
(when (and (not (bobp)) (memq (char-before) '(?\s ?\t ?\n)))
|
|
(delete-region
|
|
(point)
|
|
(progn (skip-chars-backward " \t\n") (point)))
|
|
(insert "\n"))))
|
|
((ignore-errors (up-list 1) t)
|
|
(skip-syntax-forward ")")
|
|
(delete-region
|
|
(point)
|
|
(progn (skip-chars-forward " \t\n") (point)))
|
|
(insert ?\n))
|
|
(t (goto-char (point-max)))))
|
|
(goto-char (point-min))
|
|
(indent-sexp))))
|
|
|
|
;;;###autoload
|
|
(defun pp (object &optional stream)
|
|
"Output the pretty-printed representation of OBJECT, any Lisp object.
|
|
Quoting characters are printed as needed to make output that `read'
|
|
can handle, whenever this is possible.
|
|
|
|
Uses the pretty-printing code specified in `pp-default-function'.
|
|
|
|
Output stream is STREAM, or value of `standard-output' (which see)."
|
|
(let ((stream (or stream standard-output)))
|
|
(cond
|
|
((and (eq stream (current-buffer))
|
|
;; Make sure the current buffer is setup sanely.
|
|
(eq (syntax-table) emacs-lisp-mode-syntax-table)
|
|
(eq indent-line-function #'lisp-indent-line))
|
|
;; Skip the buffer->string->buffer middle man.
|
|
(funcall pp-default-function object)
|
|
;; Preserve old behavior of (usually) finishing with a newline.
|
|
(unless (bolp) (insert "\n")))
|
|
(t
|
|
(save-current-buffer
|
|
(when (bufferp stream) (set-buffer stream))
|
|
(let ((begin (point))
|
|
(cols (current-column)))
|
|
(princ (pp-to-string object) (or stream standard-output))
|
|
(when (and (> cols 0) (bufferp stream))
|
|
(indent-rigidly begin (point) cols))))))))
|
|
|
|
;;;###autoload
|
|
(defun pp-display-expression (expression out-buffer-name &optional lisp)
|
|
"Prettify and display EXPRESSION in an appropriate way, depending on length.
|
|
If LISP, format with `pp-emacs-lisp-code'; use `pp' otherwise.
|
|
|
|
If a temporary buffer is needed for representation, it will be named
|
|
after OUT-BUFFER-NAME."
|
|
(let* ((lexical lexical-binding)
|
|
(old-show-function temp-buffer-show-function)
|
|
;; Use this function to display the buffer.
|
|
;; This function either decides not to display it at all
|
|
;; or displays it in the usual way.
|
|
(temp-buffer-show-function
|
|
(lambda (buf)
|
|
(with-current-buffer buf
|
|
(goto-char (point-min))
|
|
(end-of-line 1)
|
|
(if (or (< (1+ (point)) (point-max))
|
|
(>= (- (point) (point-min)) (frame-width)))
|
|
(let ((temp-buffer-show-function old-show-function)
|
|
(old-selected (selected-window))
|
|
(window (display-buffer buf)))
|
|
(goto-char (point-min)) ; expected by some hooks ...
|
|
(make-frame-visible (window-frame window))
|
|
(unwind-protect
|
|
(progn
|
|
(select-window window)
|
|
(run-hooks 'temp-buffer-show-hook))
|
|
(when (window-live-p old-selected)
|
|
(select-window old-selected))))
|
|
(message "%s" (buffer-substring (point-min) (point))))))))
|
|
(with-output-to-temp-buffer out-buffer-name
|
|
(if lisp
|
|
(with-current-buffer standard-output
|
|
(pp-emacs-lisp-code expression))
|
|
(pp expression))
|
|
(with-current-buffer standard-output
|
|
(emacs-lisp-mode)
|
|
(setq lexical-binding lexical)
|
|
(setq buffer-read-only nil)
|
|
(setq-local font-lock-verbose nil)))))
|
|
|
|
(defun pp-insert-short-sexp (sexp &optional width)
|
|
"Insert a short description of SEXP in the current buffer.
|
|
WIDTH is the maximum width to use for it and it defaults to the
|
|
space available between point and the window margin."
|
|
(let ((printed (format "%S" sexp)))
|
|
(if (and (not (string-search "\n" printed))
|
|
(<= (string-width printed)
|
|
(or width (- (window-width) (current-column)))))
|
|
(insert printed)
|
|
(insert-text-button
|
|
"[Show]"
|
|
'follow-link t
|
|
'action (lambda (&rest _ignore)
|
|
;; FIXME: Why "eval output"?
|
|
(pp-display-expression sexp "*Pp Eval Output*"))
|
|
'help-echo "mouse-2, RET: pretty print value in another buffer"))))
|
|
|
|
;;;###autoload
|
|
(defun pp-eval-expression (expression)
|
|
"Evaluate EXPRESSION and pretty-print its value.
|
|
Also add the value to the front of the list in the variable `values'."
|
|
(interactive
|
|
(list (read--expression "Eval: ")))
|
|
(message "Evaluating...")
|
|
(let ((result (eval expression lexical-binding)))
|
|
(values--store-value result)
|
|
(pp-display-expression result "*Pp Eval Output*" pp-use-max-width)))
|
|
|
|
;;;###autoload
|
|
(defun pp-macroexpand-expression (expression)
|
|
"Macroexpand EXPRESSION and pretty-print its value."
|
|
(interactive
|
|
(list (read--expression "Macroexpand: ")))
|
|
(pp-display-expression (macroexpand-1 expression) "*Pp Macroexpand Output*"
|
|
pp-use-max-width))
|
|
|
|
(defun pp-last-sexp ()
|
|
"Read sexp before point. Ignore leading comment characters."
|
|
(with-syntax-table emacs-lisp-mode-syntax-table
|
|
(let ((pt (point)))
|
|
(save-excursion
|
|
(forward-sexp -1)
|
|
;; Make `pp-eval-last-sexp' work the same way `eval-last-sexp'
|
|
;; does.
|
|
(when (looking-at ",@?")
|
|
(goto-char (match-end 0)))
|
|
(read
|
|
;; If first line is commented, ignore all leading comments:
|
|
(if (save-excursion (beginning-of-line) (looking-at-p "[ \t]*;"))
|
|
(let ((exp (buffer-substring (point) pt))
|
|
(start nil))
|
|
(while (string-match "\n[ \t]*;+" exp start)
|
|
(setq start (1+ (match-beginning 0))
|
|
exp (concat (substring exp 0 start)
|
|
(substring exp (match-end 0)))))
|
|
exp)
|
|
(current-buffer)))))))
|
|
|
|
;;;###autoload
|
|
(defun pp-eval-last-sexp (arg)
|
|
"Run `pp-eval-expression' on sexp before point.
|
|
With ARG, pretty-print output into current buffer.
|
|
Ignores leading comment characters."
|
|
(interactive "P")
|
|
(if arg
|
|
(insert (pp-to-string (eval (elisp--eval-defun-1
|
|
(macroexpand (pp-last-sexp)))
|
|
lexical-binding)))
|
|
(pp-eval-expression (elisp--eval-defun-1
|
|
(macroexpand (pp-last-sexp))))))
|
|
|
|
;;;###autoload
|
|
(defun pp-macroexpand-last-sexp (arg)
|
|
"Run `pp-macroexpand-expression' on sexp before point.
|
|
With ARG, pretty-print output into current buffer.
|
|
Ignores leading comment characters."
|
|
(interactive "P")
|
|
(if arg
|
|
(insert (pp-to-string (macroexpand-1 (pp-last-sexp))))
|
|
(pp-macroexpand-expression (pp-last-sexp))))
|
|
|
|
;;;###autoload
|
|
(defun pp-emacs-lisp-code (sexp &optional end)
|
|
"Insert SEXP into the current buffer, formatted as Emacs Lisp code.
|
|
Use the `pp-max-width' variable to control the desired line length.
|
|
Note that this could be slow for large SEXPs.
|
|
Can also be called with two arguments, in which case they're taken to be
|
|
the bounds of a region containing Lisp code to pretty-print."
|
|
(require 'edebug)
|
|
(if end (pp--region sexp end #'pp-emacs-lisp-code)
|
|
(let ((obuf (current-buffer)))
|
|
(with-temp-buffer
|
|
(emacs-lisp-mode)
|
|
(pp--insert-lisp sexp)
|
|
(insert "\n")
|
|
(goto-char (point-min))
|
|
(indent-sexp)
|
|
(while (re-search-forward " +$" nil t)
|
|
(replace-match ""))
|
|
(insert-into-buffer obuf)))))
|
|
|
|
(defvar pp--quoting-syntaxes
|
|
`((quote . "'")
|
|
(function . "#'")
|
|
(,backquote-backquote-symbol . "`")
|
|
(,backquote-unquote-symbol . ",")
|
|
(,backquote-splice-symbol . ",@")))
|
|
|
|
(defun pp--quoted-or-unquoted-form-p (cons)
|
|
;; Return non-nil when CONS has one of the forms 'X, `X, ,X or ,@X
|
|
(let ((head (car cons)))
|
|
(and (symbolp head)
|
|
(assq head pp--quoting-syntaxes)
|
|
(let ((rest (cdr cons)))
|
|
(and (consp rest) (null (cdr rest)))))))
|
|
|
|
(defun pp--insert-lisp (sexp)
|
|
(cl-case (type-of sexp)
|
|
(vector (pp--format-vector sexp))
|
|
(cons (cond
|
|
((consp (cdr sexp))
|
|
(let ((head (car sexp)))
|
|
(if-let* (((null (cddr sexp)))
|
|
(syntax-entry (assq head pp--quoting-syntaxes)))
|
|
(progn
|
|
(insert (cdr syntax-entry))
|
|
(pp--insert-lisp (cadr sexp)))
|
|
(pp--format-list sexp))))
|
|
(t
|
|
(pp--format-list sexp))))
|
|
;; Print some of the smaller integers as characters, perhaps?
|
|
(integer
|
|
(if (<= ?0 sexp ?z)
|
|
(princ (prin1-char sexp) (current-buffer))
|
|
(prin1 sexp (current-buffer))))
|
|
(string
|
|
(let ((print-escape-newlines t))
|
|
(prin1 sexp (current-buffer))))
|
|
(otherwise (prin1 sexp (current-buffer)))))
|
|
|
|
(defun pp--format-vector (sexp)
|
|
(insert "[")
|
|
(cl-loop for i from 0
|
|
for element across sexp
|
|
do (pp--insert (and (> i 0) " ") element))
|
|
(insert "]"))
|
|
|
|
(defun pp--format-list (sexp &optional start)
|
|
(if (not (let ((head (car sexp)))
|
|
(or pp--inhibit-function-formatting
|
|
(not (symbolp head))
|
|
(keywordp head)
|
|
(let ((l sexp))
|
|
(catch 'not-funcall
|
|
(while l
|
|
(when (or
|
|
(atom l) ; SEXP is a dotted list
|
|
;; Does SEXP have a form like (ELT... . ,X) ?
|
|
(pp--quoted-or-unquoted-form-p l))
|
|
(throw 'not-funcall t))
|
|
(setq l (cdr l)))
|
|
nil)))))
|
|
(pp--format-function sexp)
|
|
(insert "(")
|
|
(pp--insert start (pop sexp))
|
|
(while sexp
|
|
(if (consp sexp)
|
|
(if (not (pp--quoted-or-unquoted-form-p sexp))
|
|
(pp--insert " " (pop sexp))
|
|
(pp--insert " . " sexp)
|
|
(setq sexp nil))
|
|
(pp--insert " . " sexp)
|
|
(setq sexp nil)))
|
|
(insert ")")))
|
|
|
|
(defun pp--format-function (sexp)
|
|
(let* ((sym (car sexp))
|
|
(edebug (get sym 'edebug-form-spec))
|
|
(indent (get sym 'lisp-indent-function))
|
|
(doc (get sym 'doc-string-elt)))
|
|
(when (eq indent 'defun)
|
|
(setq indent 2))
|
|
;; We probably want to keep all the elements before the doc string
|
|
;; on a single line.
|
|
(when doc
|
|
(setq indent (1- doc)))
|
|
;; Special-case closures -- these shouldn't really exist in actual
|
|
;; source code, so there's no indentation information. But make
|
|
;; them output slightly better.
|
|
(when (and (not indent)
|
|
(eq sym 'closure))
|
|
(setq indent 0))
|
|
(pp--insert "(" sym)
|
|
(pop sexp)
|
|
;; Get the first entries on the first line.
|
|
(if indent
|
|
(pp--format-definition sexp indent edebug)
|
|
(let ((prev 0))
|
|
(while sexp
|
|
(let ((start (point)))
|
|
;; Don't put sexps on the same line as a multi-line sexp
|
|
;; preceding it.
|
|
(pp--insert (if (> prev 1) "\n" " ")
|
|
(pop sexp))
|
|
(setq prev (count-lines start (point)))))))
|
|
(insert ")")))
|
|
|
|
(defun pp--format-definition (sexp indent edebug)
|
|
(while (and (cl-plusp indent)
|
|
sexp)
|
|
(insert " ")
|
|
;; We don't understand all the edebug specs.
|
|
(unless (consp edebug)
|
|
(setq edebug nil))
|
|
(if (and (consp (car edebug))
|
|
(eq (caar edebug) '&rest)
|
|
(proper-list-p (car sexp)))
|
|
(pp--insert-binding (pop sexp))
|
|
(if (null (car sexp))
|
|
(insert "()")
|
|
(pp--insert-lisp (car sexp)))
|
|
(pop sexp))
|
|
(pop edebug)
|
|
(cl-decf indent))
|
|
(when (stringp (car sexp))
|
|
(insert "\n")
|
|
(prin1 (pop sexp) (current-buffer)))
|
|
;; Then insert the rest with line breaks before each form.
|
|
(while sexp
|
|
(insert "\n")
|
|
(if (keywordp (car sexp))
|
|
(progn
|
|
(pp--insert-lisp (pop sexp))
|
|
(when sexp
|
|
(pp--insert " " (pop sexp))))
|
|
(pp--insert-lisp (pop sexp)))))
|
|
|
|
(defun pp--insert-binding (sexp)
|
|
(insert "(")
|
|
(while sexp
|
|
(if (consp (car sexp))
|
|
;; Newlines after each (...) binding.
|
|
(progn
|
|
(pp--insert-lisp (car sexp))
|
|
(when (cdr sexp)
|
|
(insert "\n")))
|
|
;; Keep plain symbols on the same line.
|
|
(pp--insert " " (car sexp)))
|
|
(pop sexp))
|
|
(insert ")"))
|
|
|
|
(defun pp--insert (delim &rest things)
|
|
(let ((start (if (markerp delim)
|
|
(prog1
|
|
delim
|
|
(setq delim nil))
|
|
(point-marker))))
|
|
(when delim
|
|
(insert delim))
|
|
(dolist (thing things)
|
|
(pp--insert-lisp thing))
|
|
;; We need to indent what we have so far to see if we have to fold.
|
|
(pp--indent-buffer)
|
|
(when (> (current-column) (pp--max-width))
|
|
(save-excursion
|
|
(goto-char start)
|
|
(unless (looking-at "[ \t]+$")
|
|
(insert "\n"))
|
|
(pp--indent-buffer)
|
|
(goto-char (point-max))
|
|
;; If we're still too wide, then go up one step and try to
|
|
;; insert a newline there.
|
|
(when (> (current-column) (pp--max-width))
|
|
(condition-case ()
|
|
(backward-up-list 1)
|
|
(:success (when (and (not (bobp)) (looking-back " " 2))
|
|
(insert "\n")))
|
|
(error nil)))))))
|
|
|
|
(defun pp--max-width ()
|
|
(cond ((numberp pp-max-width)
|
|
pp-max-width)
|
|
((null pp-max-width)
|
|
most-positive-fixnum)
|
|
((eq pp-max-width t)
|
|
(window-width))
|
|
(t
|
|
(error "Invalid pp-max-width value: %s" pp-max-width))))
|
|
|
|
(defun pp--indent-buffer ()
|
|
(goto-char (point-min))
|
|
(while (not (eobp))
|
|
(lisp-indent-line)
|
|
(forward-line 1)))
|
|
|
|
(provide 'pp) ; so (require 'pp) works
|
|
|
|
;;; pp.el ends here
|