From e199151c8f7dd3d44570df461dbaa69c1d54f32f Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@user.noreply.gitlab.com> Date: Sun, 19 Apr 2020 15:24:21 +0200 Subject: [PATCH] Upgrade packages --- elpa/archives/gnu/archive-contents | 15 ++- elpa/log4e-20170401.1304/log4e-pkg.el | 2 - .../log4e-autoloads.el | 0 elpa/log4e-20200419.933/log4e-pkg.el | 2 + .../log4e.el | 24 ++-- .../log4e.elc | Bin 21129 -> 21114 bytes .../AUTHORS.md | 0 .../LICENSE | 0 .../dir | 0 .../git-rebase.el | 0 .../git-rebase.elc | Bin .../magit-apply.el | 0 .../magit-apply.elc | Bin .../magit-autoloads.el | 0 .../magit-autorevert.el | 0 .../magit-autorevert.elc | Bin .../magit-bisect.el | 0 .../magit-bisect.elc | Bin .../magit-blame.el | 0 .../magit-blame.elc | Bin .../magit-bookmark.el | 0 .../magit-bookmark.elc | Bin .../magit-branch.el | 0 .../magit-branch.elc | Bin .../magit-clone.el | 0 .../magit-clone.elc | Bin .../magit-commit.el | 0 .../magit-commit.elc | Bin .../magit-core.el | 0 .../magit-core.elc | Bin .../magit-diff.el | 0 .../magit-diff.elc | Bin .../magit-ediff.el | 0 .../magit-ediff.elc | Bin .../magit-extras.el | 0 .../magit-extras.elc | Bin .../magit-fetch.el | 0 .../magit-fetch.elc | Bin .../magit-files.el | 0 .../magit-files.elc | Bin .../magit-git.el | 0 .../magit-git.elc | Bin .../magit-gitignore.el | 0 .../magit-gitignore.elc | Bin .../magit-imenu.el | 0 .../magit-imenu.elc | Bin .../magit-log.el | 0 .../magit-log.elc | Bin .../magit-margin.el | 0 .../magit-margin.elc | Bin .../magit-merge.el | 2 +- .../magit-merge.elc | Bin 13563 -> 13564 bytes .../magit-mode.el | 0 .../magit-mode.elc | Bin .../magit-notes.el | 0 .../magit-notes.elc | Bin .../magit-obsolete.el | 0 .../magit-obsolete.elc | Bin .../magit-patch.el | 0 .../magit-patch.elc | Bin .../magit-pkg.el | 2 +- .../magit-process.el | 0 .../magit-process.elc | Bin .../magit-pull.el | 0 .../magit-pull.elc | Bin .../magit-push.el | 0 .../magit-push.elc | Bin .../magit-reflog.el | 0 .../magit-reflog.elc | Bin .../magit-refs.el | 0 .../magit-refs.elc | Bin .../magit-remote.el | 0 .../magit-remote.elc | Bin .../magit-repos.el | 0 .../magit-repos.elc | Bin .../magit-reset.el | 0 .../magit-reset.elc | Bin .../magit-section.el | 0 .../magit-section.elc | Bin .../magit-sequence.el | 0 .../magit-sequence.elc | Bin .../magit-stash.el | 0 .../magit-stash.elc | Bin .../magit-status.el | 0 .../magit-status.elc | Bin .../magit-submodule.el | 0 .../magit-submodule.elc | Bin .../magit-subtree.el | 0 .../magit-subtree.elc | Bin .../magit-tag.el | 23 +++- .../magit-tag.elc | Bin 7151 -> 7839 bytes .../magit-transient.el | 0 .../magit-transient.elc | Bin .../magit-utils.el | 0 .../magit-utils.elc | Bin .../magit-wip.el | 0 .../magit-wip.elc | Bin .../magit-worktree.el | 0 .../magit-worktree.elc | Bin .../magit.el | 0 .../magit.elc | Bin .../magit.info | 0 .../magit.info-1 | 0 .../magit.info-2 | 0 elpa/olivetti-20200414.328/olivetti-pkg.el | 2 - .../olivetti-autoloads.el | 0 elpa/olivetti-20200417.607/olivetti-pkg.el | 2 + .../olivetti.el | 7 +- .../olivetti.elc | Bin .../data/stdlib-changes | 0 .../package-lint-autoloads.el | 0 .../package-lint-pkg.el | 2 +- .../package-lint.el | 14 ++- .../package-lint.elc | Bin 43448 -> 43931 bytes .../dir | 0 .../racket-bug-report.el | 0 .../racket-bug-report.elc | Bin .../racket-cmd.el | 0 .../racket-cmd.elc | Bin .../racket-collection.el | 0 .../racket-collection.elc | Bin .../racket-common.el | 0 .../racket-common.elc | Bin .../racket-complete.el | 0 .../racket-complete.elc | Bin .../racket-custom.el | 0 .../racket-custom.elc | Bin .../racket-debug.el | 16 +-- .../racket-debug.elc | Bin 12605 -> 12836 bytes .../racket-describe.el | 0 .../racket-describe.elc | Bin .../racket-edit.el | 0 .../racket-edit.elc | Bin .../racket-eldoc.el | 0 .../racket-eldoc.elc | Bin .../racket-font-lock.el | 46 ++++---- .../racket-font-lock.elc | Bin 47815 -> 47843 bytes .../racket-imenu.el | 0 .../racket-imenu.elc | Bin .../racket-indent.el | 0 .../racket-indent.elc | Bin .../racket-keywords-and-builtins.el | 0 .../racket-keywords-and-builtins.elc | Bin .../racket-logger.el | 0 .../racket-logger.elc | Bin .../racket-mode-autoloads.el | 0 .../racket-mode-pkg.el | 2 +- .../racket-mode.el | 0 .../racket-mode.elc | Bin .../racket-mode.info | 0 .../racket-parens.el | 0 .../racket-parens.elc | Bin .../racket-ppss.el | 0 .../racket-ppss.elc | Bin .../racket-profile.el | 0 .../racket-profile.elc | Bin .../racket-repl-buffer-name.el | 0 .../racket-repl-buffer-name.elc | Bin .../racket-repl.el | 0 .../racket-repl.elc | Bin .../racket-show.el | 0 .../racket-show.elc | Bin .../racket-smart-open.el | 0 .../racket-smart-open.elc | Bin .../racket-stepper.el | 0 .../racket-stepper.elc | Bin .../racket-unicode-input-method.el | 0 .../racket-unicode-input-method.elc | Bin .../racket-util.el | 0 .../racket-util.elc | Bin .../racket-visit.el | 0 .../racket-visit.elc | Bin .../racket-wsl.el | 0 .../racket-wsl.elc | Bin .../racket-xp-complete.el | 0 .../racket-xp-complete.elc | Bin .../racket-xp.el | 0 .../racket-xp.elc | Bin .../racket/command-server.rkt | 1 + .../racket/commands/check-syntax.rkt | 0 .../racket/commands/coverage.rkt | 0 .../racket/commands/describe.rkt | 0 .../racket/commands/find-module.rkt | 0 .../racket/commands/help.rkt | 0 .../racket/commands/macro.rkt | 2 +- .../racket/commands/module-names.rkt | 0 .../racket/commands/profile.rkt | 0 .../racket/commands/requires.rkt | 0 .../racket/debug-annotator.rkt | 0 .../racket/debug.rkt | 47 ++++++-- .../racket/elisp.rkt | 0 .../racket/error.rkt | 0 .../racket/example/example.rkt | 0 .../racket/example/example.rkt.faceup | 0 .../racket/example/indent.rkt | 0 .../racket/example/indent.rkt.faceup | 0 .../racket/find-module-path-completions.rkt | 0 .../racket/find.rkt | 0 .../racket/fresh-line.rkt | 0 .../racket/gui.rkt | 0 .../racket/identifier.rkt | 0 .../racket/image.rkt | 0 .../racket/imports.rkt | 0 .../racket/instrument.rkt | 0 .../racket/interactions.rkt | 0 .../racket/keywords.rkt | 0 .../racket/logger.rkt | 0 .../racket/main.rkt | 0 .../racket/mod.rkt | 0 .../racket/print.rkt | 0 .../racket/repl-session.rkt | 86 ++++++++++++++ .../racket/repl.rkt | 106 +++--------------- .../racket/scribble.rkt | 0 .../racket/syntax.rkt | 0 .../racket/test/find-examples.rkt | 0 .../racket/test/find.rkt | 0 .../racket/util.rkt | 0 elpa/web-mode-20200406.759/web-mode-pkg.el | 2 - .../web-mode-autoloads.el | 0 elpa/web-mode-20200418.2218/web-mode-pkg.el | 2 + .../web-mode.el | 103 ++++++++++++++--- .../web-mode.elc | Bin 326941 -> 328392 bytes init.el | 2 + projectile-bookmarks.eld | 2 +- 224 files changed, 334 insertions(+), 180 deletions(-) delete mode 100644 elpa/log4e-20170401.1304/log4e-pkg.el rename elpa/{log4e-20170401.1304 => log4e-20200419.933}/log4e-autoloads.el (100%) create mode 100644 elpa/log4e-20200419.933/log4e-pkg.el rename elpa/{log4e-20170401.1304 => log4e-20200419.933}/log4e.el (97%) rename elpa/{log4e-20170401.1304 => log4e-20200419.933}/log4e.elc (90%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/AUTHORS.md (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/LICENSE (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/dir (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/git-rebase.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/git-rebase.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-apply.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-apply.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-autoloads.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-autorevert.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-autorevert.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-bisect.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-bisect.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-blame.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-blame.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-bookmark.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-bookmark.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-branch.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-branch.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-clone.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-clone.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-commit.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-commit.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-core.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-core.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-diff.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-diff.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-ediff.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-ediff.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-extras.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-extras.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-fetch.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-fetch.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-files.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-files.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-git.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-git.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-gitignore.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-gitignore.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-imenu.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-imenu.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-log.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-log.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-margin.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-margin.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-merge.el (99%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-merge.elc (92%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-mode.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-mode.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-notes.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-notes.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-obsolete.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-obsolete.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-patch.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-patch.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-pkg.el (76%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-process.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-process.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-pull.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-pull.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-push.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-push.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-reflog.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-reflog.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-refs.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-refs.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-remote.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-remote.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-repos.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-repos.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-reset.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-reset.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-section.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-section.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-sequence.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-sequence.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-stash.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-stash.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-status.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-status.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-submodule.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-submodule.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-subtree.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-subtree.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-tag.el (88%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-tag.elc (84%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-transient.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-transient.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-utils.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-utils.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-wip.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-wip.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-worktree.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit-worktree.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit.el (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit.elc (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit.info (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit.info-1 (100%) rename elpa/{magit-20200408.2341 => magit-20200418.939}/magit.info-2 (100%) delete mode 100644 elpa/olivetti-20200414.328/olivetti-pkg.el rename elpa/{olivetti-20200414.328 => olivetti-20200417.607}/olivetti-autoloads.el (100%) create mode 100644 elpa/olivetti-20200417.607/olivetti-pkg.el rename elpa/{olivetti-20200414.328 => olivetti-20200417.607}/olivetti.el (98%) rename elpa/{olivetti-20200414.328 => olivetti-20200417.607}/olivetti.elc (100%) rename elpa/{package-lint-20200415.606 => package-lint-20200419.406}/data/stdlib-changes (100%) rename elpa/{package-lint-20200415.606 => package-lint-20200419.406}/package-lint-autoloads.el (100%) rename elpa/{package-lint-20200415.606 => package-lint-20200419.406}/package-lint-pkg.el (85%) rename elpa/{package-lint-20200415.606 => package-lint-20200419.406}/package-lint.el (98%) rename elpa/{package-lint-20200415.606 => package-lint-20200419.406}/package-lint.elc (85%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/dir (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-bug-report.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-bug-report.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-cmd.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-cmd.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-collection.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-collection.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-common.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-common.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-complete.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-complete.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-custom.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-custom.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-debug.el (96%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-debug.elc (75%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-describe.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-describe.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-edit.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-edit.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-eldoc.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-eldoc.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-font-lock.el (90%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-font-lock.elc (98%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-imenu.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-imenu.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-indent.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-indent.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-keywords-and-builtins.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-keywords-and-builtins.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-logger.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-logger.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-mode-autoloads.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-mode-pkg.el (79%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-mode.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-mode.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-mode.info (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-parens.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-parens.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-ppss.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-ppss.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-profile.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-profile.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-repl-buffer-name.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-repl-buffer-name.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-repl.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-repl.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-show.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-show.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-smart-open.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-smart-open.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-stepper.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-stepper.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-unicode-input-method.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-unicode-input-method.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-util.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-util.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-visit.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-visit.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-wsl.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-wsl.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-xp-complete.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-xp-complete.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-xp.el (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket-xp.elc (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/command-server.rkt (99%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/check-syntax.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/coverage.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/describe.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/find-module.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/help.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/macro.rkt (99%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/module-names.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/profile.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/commands/requires.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/debug-annotator.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/debug.rkt (87%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/elisp.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/error.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/example/example.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/example/example.rkt.faceup (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/example/indent.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/example/indent.rkt.faceup (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/find-module-path-completions.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/find.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/fresh-line.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/gui.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/identifier.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/image.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/imports.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/instrument.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/interactions.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/keywords.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/logger.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/main.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/mod.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/print.rkt (100%) create mode 100644 elpa/racket-mode-20200417.1741/racket/repl-session.rkt rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/repl.rkt (80%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/scribble.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/syntax.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/test/find-examples.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/test/find.rkt (100%) rename elpa/{racket-mode-20200412.1611 => racket-mode-20200417.1741}/racket/util.rkt (100%) delete mode 100644 elpa/web-mode-20200406.759/web-mode-pkg.el rename elpa/{web-mode-20200406.759 => web-mode-20200418.2218}/web-mode-autoloads.el (100%) create mode 100644 elpa/web-mode-20200418.2218/web-mode-pkg.el rename elpa/{web-mode-20200406.759 => web-mode-20200418.2218}/web-mode.el (99%) rename elpa/{web-mode-20200406.759 => web-mode-20200418.2218}/web-mode.elc (82%) diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents index b48c3a13..c7016138 100644 --- a/elpa/archives/gnu/archive-contents +++ b/elpa/archives/gnu/archive-contents @@ -581,7 +581,7 @@ ("Leo Liu" . "sdl.web@gmail.com")) (:keywords "killing" "convenience"))]) (ebdb . - [(0 6 13) + [(0 6 16) ((emacs (25 1)) (cl-lib @@ -610,7 +610,7 @@ ((pyim (1 6 0)) (ebdb - (0 2))) + (0 6 17))) "China-specific internationalization support for EBDB" single ((:url . "http://elpa.gnu.org/packages/ebdb-i18n-chn.html") (:authors @@ -635,7 +635,7 @@ ("Eduardo Ochs" . "eduardoochs@gmail.com")) (:keywords "lisp" "e-scripts"))]) (eglot . - [(1 5) + [(1 6) ((emacs (26 1)) (jsonrpc @@ -1549,7 +1549,7 @@ ("Phillip Lord" . "phillip.lord@russet.org.uk")) (:url . "http://elpa.gnu.org/packages/persist.html"))]) (phps-mode . - [(0 3 41) + [(0 3 42) ((emacs (26))) "Major mode for PHP with Semantic integration" tar @@ -1871,6 +1871,13 @@ ("Ralph Amissah & Ambrose Kofi Laing")) (:maintainer "Ralph Amissah" . "ralph.amissah@gmail.com") (:url . "http://www.sisudoc.org/"))]) + (sm-c-mode . + [(1 0) + nil "C major mode based on SMIE" single + ((:url . "http://elpa.gnu.org/packages/sm-c-mode.html") + (:authors + ("Stefan Monnier" . "monnier@iro.umontreal.ca")) + (:maintainer "Stefan Monnier" . "monnier@iro.umontreal.ca"))]) (smalltalk-mode . [(3 2 92) nil "Major mode for the GNU Smalltalk programming language" tar diff --git a/elpa/log4e-20170401.1304/log4e-pkg.el b/elpa/log4e-20170401.1304/log4e-pkg.el deleted file mode 100644 index ee90adfb..00000000 --- a/elpa/log4e-20170401.1304/log4e-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "log4e" "20170401.1304" "provide logging framework for elisp" 'nil :commit "c69424e407be0d9d0e54b427d8b18b1ac5a607e2" :keywords '("log") :authors '(("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) :maintainer '("Hiroaki Otsu" . "ootsuhiroaki@gmail.com") :url "https://github.com/aki2o/log4e") diff --git a/elpa/log4e-20170401.1304/log4e-autoloads.el b/elpa/log4e-20200419.933/log4e-autoloads.el similarity index 100% rename from elpa/log4e-20170401.1304/log4e-autoloads.el rename to elpa/log4e-20200419.933/log4e-autoloads.el diff --git a/elpa/log4e-20200419.933/log4e-pkg.el b/elpa/log4e-20200419.933/log4e-pkg.el new file mode 100644 index 00000000..0f7b4af1 --- /dev/null +++ b/elpa/log4e-20200419.933/log4e-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "log4e" "20200419.933" "provide logging framework for elisp" 'nil :commit "2540cb8d8fbb4b039a9fe41dfd956817d7ac0337" :keywords '("log") :authors '(("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) :maintainer '("Hiroaki Otsu" . "ootsuhiroaki@gmail.com") :url "https://github.com/aki2o/log4e") diff --git a/elpa/log4e-20170401.1304/log4e.el b/elpa/log4e-20200419.933/log4e.el similarity index 97% rename from elpa/log4e-20170401.1304/log4e.el rename to elpa/log4e-20200419.933/log4e.el index 52437943..980393b1 100644 --- a/elpa/log4e-20170401.1304/log4e.el +++ b/elpa/log4e-20200419.933/log4e.el @@ -4,9 +4,9 @@ ;; Author: Hiroaki Otsu ;; Keywords: log -;; Package-Version: 20170401.1304 +;; Package-Version: 20200419.933 ;; URL: https://github.com/aki2o/log4e -;; Version: 0.3.1 +;; Version: 0.3.2 ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -109,6 +109,7 @@ '(msg &rest msgargs) '(level msg &rest msgargs))) (buff (log4e--make-symbol-log-buffer prefix)) + (msgbuff (log4e--make-symbol-msg-buffer prefix)) (codsys (log4e--make-symbol-buffer-coding-system prefix)) (logtmpl (log4e--make-symbol-log-template prefix)) (timetmpl (log4e--make-symbol-time-template prefix)) @@ -121,9 +122,9 @@ (defun ,(intern (concat prefix "--" (or suffix "log"))) ,argform ,(format "Do logging for %s level log. %sMSG/MSGARGS are passed to `format'." - (or (eval level) "any") + (if suffix level "any") (if suffix "" "LEVEL is symbol as a log level in '(trace debug info warn error fatal).\n")) - (let ((log4e--current-msg-buffer ,(log4e--make-symbol-msg-buffer prefix))) + (let ((log4e--current-msg-buffer ,msgbuff)) (apply 'log4e--logging ,buff ,codsys ,logtmpl ,timetmpl ,minlvl ,maxlvl ,logging-p ,(if suffix level 'level) msg msgargs))) ;; Define logging macro @@ -131,25 +132,22 @@ ,(format "Do logging for %s level log. %sMSG/MSGARGS are passed to `format'. Evaluation of MSGARGS is invoked only if %s level log should be printed." - (or (eval level) "any") + (if suffix level "any") (if suffix "" "LEVEL is symbol as a log level in '(trace debug info warn error fatal).\n") - (or (eval level) "the")) - (let ((prefix ,prefix) - (suffix ,suffix) - (level ',level) - (msg msg) - (msgargs msgargs) + (if suffix level "the")) + (let (,@(if suffix (list `(level ',level)) '()) (buff (log4e--make-symbol-log-buffer ,prefix)) + (msgbuff (log4e--make-symbol-msg-buffer ,prefix)) (codsys (log4e--make-symbol-buffer-coding-system ,prefix)) (logtmpl (log4e--make-symbol-log-template ,prefix)) (timetmpl (log4e--make-symbol-time-template ,prefix)) (minlvl (log4e--make-symbol-min-level ,prefix)) (maxlvl (log4e--make-symbol-max-level ,prefix)) (logging-p (log4e--make-symbol-toggle-logging ,prefix))) - `(let ((log4e--current-msg-buffer ,(log4e--make-symbol-msg-buffer prefix))) + `(let ((log4e--current-msg-buffer ,msgbuff)) (when (and ,logging-p (log4e--logging-level-p ,minlvl ,maxlvl ,level)) - (log4e--logging ,buff ,codsys ,logtmpl ,timetmpl ,minlvl ,maxlvl ,logging-p ,(if suffix level 'level) ,msg ,@msgargs))))) + (log4e--logging ,buff ,codsys ,logtmpl ,timetmpl ,minlvl ,maxlvl ,logging-p ,level ,msg ,@msgargs))))) ))) diff --git a/elpa/log4e-20170401.1304/log4e.elc b/elpa/log4e-20200419.933/log4e.elc similarity index 90% rename from elpa/log4e-20170401.1304/log4e.elc rename to elpa/log4e-20200419.933/log4e.elc index 90de2a32bda87dd63c1e460e1a5700eaf4356825..ba58fd86ebae47245f5ae1c67274553be8bc1f51 100644 GIT binary patch delta 507 zcmYjNF;4<97?m?bE`jx9VnG+@)gg7=)jNpO@A||@9>fFJ^S$7i# z5=TdkKf)FN0CCZ;C!$Th_VvB5udls%@O<8T9`6EuJu1L51yEDpO{~Y3mg7d&$QWrO zWdO1k7F8WO0`LiH+O-*ktdbx~&tut&hV~3GaHSn3bC z1oR0H*P}7Bs?&swPJH>F zFIT>l@Bb)Zy4Sc_m8BbZB2nu%41NU)43d}z-@%ybz#m|4KW1ckVieWWnA&i?Sd{O< zO2{Wx1=!Sa+}Nd@E*)|$W8Q%L+R)_-`H)ZZUFj^m1#0bfy>+zG>7Aa}r5Q@jo^+3; z6z3e zlt-yf%#!E&psc2Pd-fVZxO0qUD}CWvJE74$452ovK`W>lQ_+Quyo$`v|HNR74af`Y tjoP+B?Y2GGDQLyH_Kg3cYeg=Hm+v*lmQTwM8u!{aD|d0tp|ZT5`2;rQkoy1t diff --git a/elpa/magit-20200408.2341/AUTHORS.md b/elpa/magit-20200418.939/AUTHORS.md similarity index 100% rename from elpa/magit-20200408.2341/AUTHORS.md rename to elpa/magit-20200418.939/AUTHORS.md diff --git a/elpa/magit-20200408.2341/LICENSE b/elpa/magit-20200418.939/LICENSE similarity index 100% rename from elpa/magit-20200408.2341/LICENSE rename to elpa/magit-20200418.939/LICENSE diff --git a/elpa/magit-20200408.2341/dir b/elpa/magit-20200418.939/dir similarity index 100% rename from elpa/magit-20200408.2341/dir rename to elpa/magit-20200418.939/dir diff --git a/elpa/magit-20200408.2341/git-rebase.el b/elpa/magit-20200418.939/git-rebase.el similarity index 100% rename from elpa/magit-20200408.2341/git-rebase.el rename to elpa/magit-20200418.939/git-rebase.el diff --git a/elpa/magit-20200408.2341/git-rebase.elc b/elpa/magit-20200418.939/git-rebase.elc similarity index 100% rename from elpa/magit-20200408.2341/git-rebase.elc rename to elpa/magit-20200418.939/git-rebase.elc diff --git a/elpa/magit-20200408.2341/magit-apply.el b/elpa/magit-20200418.939/magit-apply.el similarity index 100% rename from elpa/magit-20200408.2341/magit-apply.el rename to elpa/magit-20200418.939/magit-apply.el diff --git a/elpa/magit-20200408.2341/magit-apply.elc b/elpa/magit-20200418.939/magit-apply.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-apply.elc rename to elpa/magit-20200418.939/magit-apply.elc diff --git a/elpa/magit-20200408.2341/magit-autoloads.el b/elpa/magit-20200418.939/magit-autoloads.el similarity index 100% rename from elpa/magit-20200408.2341/magit-autoloads.el rename to elpa/magit-20200418.939/magit-autoloads.el diff --git a/elpa/magit-20200408.2341/magit-autorevert.el b/elpa/magit-20200418.939/magit-autorevert.el similarity index 100% rename from elpa/magit-20200408.2341/magit-autorevert.el rename to elpa/magit-20200418.939/magit-autorevert.el diff --git a/elpa/magit-20200408.2341/magit-autorevert.elc b/elpa/magit-20200418.939/magit-autorevert.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-autorevert.elc rename to elpa/magit-20200418.939/magit-autorevert.elc diff --git a/elpa/magit-20200408.2341/magit-bisect.el b/elpa/magit-20200418.939/magit-bisect.el similarity index 100% rename from elpa/magit-20200408.2341/magit-bisect.el rename to elpa/magit-20200418.939/magit-bisect.el diff --git a/elpa/magit-20200408.2341/magit-bisect.elc b/elpa/magit-20200418.939/magit-bisect.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-bisect.elc rename to elpa/magit-20200418.939/magit-bisect.elc diff --git a/elpa/magit-20200408.2341/magit-blame.el b/elpa/magit-20200418.939/magit-blame.el similarity index 100% rename from elpa/magit-20200408.2341/magit-blame.el rename to elpa/magit-20200418.939/magit-blame.el diff --git a/elpa/magit-20200408.2341/magit-blame.elc b/elpa/magit-20200418.939/magit-blame.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-blame.elc rename to elpa/magit-20200418.939/magit-blame.elc diff --git a/elpa/magit-20200408.2341/magit-bookmark.el b/elpa/magit-20200418.939/magit-bookmark.el similarity index 100% rename from elpa/magit-20200408.2341/magit-bookmark.el rename to elpa/magit-20200418.939/magit-bookmark.el diff --git a/elpa/magit-20200408.2341/magit-bookmark.elc b/elpa/magit-20200418.939/magit-bookmark.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-bookmark.elc rename to elpa/magit-20200418.939/magit-bookmark.elc diff --git a/elpa/magit-20200408.2341/magit-branch.el b/elpa/magit-20200418.939/magit-branch.el similarity index 100% rename from elpa/magit-20200408.2341/magit-branch.el rename to elpa/magit-20200418.939/magit-branch.el diff --git a/elpa/magit-20200408.2341/magit-branch.elc b/elpa/magit-20200418.939/magit-branch.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-branch.elc rename to elpa/magit-20200418.939/magit-branch.elc diff --git a/elpa/magit-20200408.2341/magit-clone.el b/elpa/magit-20200418.939/magit-clone.el similarity index 100% rename from elpa/magit-20200408.2341/magit-clone.el rename to elpa/magit-20200418.939/magit-clone.el diff --git a/elpa/magit-20200408.2341/magit-clone.elc b/elpa/magit-20200418.939/magit-clone.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-clone.elc rename to elpa/magit-20200418.939/magit-clone.elc diff --git a/elpa/magit-20200408.2341/magit-commit.el b/elpa/magit-20200418.939/magit-commit.el similarity index 100% rename from elpa/magit-20200408.2341/magit-commit.el rename to elpa/magit-20200418.939/magit-commit.el diff --git a/elpa/magit-20200408.2341/magit-commit.elc b/elpa/magit-20200418.939/magit-commit.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-commit.elc rename to elpa/magit-20200418.939/magit-commit.elc diff --git a/elpa/magit-20200408.2341/magit-core.el b/elpa/magit-20200418.939/magit-core.el similarity index 100% rename from elpa/magit-20200408.2341/magit-core.el rename to elpa/magit-20200418.939/magit-core.el diff --git a/elpa/magit-20200408.2341/magit-core.elc b/elpa/magit-20200418.939/magit-core.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-core.elc rename to elpa/magit-20200418.939/magit-core.elc diff --git a/elpa/magit-20200408.2341/magit-diff.el b/elpa/magit-20200418.939/magit-diff.el similarity index 100% rename from elpa/magit-20200408.2341/magit-diff.el rename to elpa/magit-20200418.939/magit-diff.el diff --git a/elpa/magit-20200408.2341/magit-diff.elc b/elpa/magit-20200418.939/magit-diff.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-diff.elc rename to elpa/magit-20200418.939/magit-diff.elc diff --git a/elpa/magit-20200408.2341/magit-ediff.el b/elpa/magit-20200418.939/magit-ediff.el similarity index 100% rename from elpa/magit-20200408.2341/magit-ediff.el rename to elpa/magit-20200418.939/magit-ediff.el diff --git a/elpa/magit-20200408.2341/magit-ediff.elc b/elpa/magit-20200418.939/magit-ediff.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-ediff.elc rename to elpa/magit-20200418.939/magit-ediff.elc diff --git a/elpa/magit-20200408.2341/magit-extras.el b/elpa/magit-20200418.939/magit-extras.el similarity index 100% rename from elpa/magit-20200408.2341/magit-extras.el rename to elpa/magit-20200418.939/magit-extras.el diff --git a/elpa/magit-20200408.2341/magit-extras.elc b/elpa/magit-20200418.939/magit-extras.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-extras.elc rename to elpa/magit-20200418.939/magit-extras.elc diff --git a/elpa/magit-20200408.2341/magit-fetch.el b/elpa/magit-20200418.939/magit-fetch.el similarity index 100% rename from elpa/magit-20200408.2341/magit-fetch.el rename to elpa/magit-20200418.939/magit-fetch.el diff --git a/elpa/magit-20200408.2341/magit-fetch.elc b/elpa/magit-20200418.939/magit-fetch.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-fetch.elc rename to elpa/magit-20200418.939/magit-fetch.elc diff --git a/elpa/magit-20200408.2341/magit-files.el b/elpa/magit-20200418.939/magit-files.el similarity index 100% rename from elpa/magit-20200408.2341/magit-files.el rename to elpa/magit-20200418.939/magit-files.el diff --git a/elpa/magit-20200408.2341/magit-files.elc b/elpa/magit-20200418.939/magit-files.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-files.elc rename to elpa/magit-20200418.939/magit-files.elc diff --git a/elpa/magit-20200408.2341/magit-git.el b/elpa/magit-20200418.939/magit-git.el similarity index 100% rename from elpa/magit-20200408.2341/magit-git.el rename to elpa/magit-20200418.939/magit-git.el diff --git a/elpa/magit-20200408.2341/magit-git.elc b/elpa/magit-20200418.939/magit-git.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-git.elc rename to elpa/magit-20200418.939/magit-git.elc diff --git a/elpa/magit-20200408.2341/magit-gitignore.el b/elpa/magit-20200418.939/magit-gitignore.el similarity index 100% rename from elpa/magit-20200408.2341/magit-gitignore.el rename to elpa/magit-20200418.939/magit-gitignore.el diff --git a/elpa/magit-20200408.2341/magit-gitignore.elc b/elpa/magit-20200418.939/magit-gitignore.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-gitignore.elc rename to elpa/magit-20200418.939/magit-gitignore.elc diff --git a/elpa/magit-20200408.2341/magit-imenu.el b/elpa/magit-20200418.939/magit-imenu.el similarity index 100% rename from elpa/magit-20200408.2341/magit-imenu.el rename to elpa/magit-20200418.939/magit-imenu.el diff --git a/elpa/magit-20200408.2341/magit-imenu.elc b/elpa/magit-20200418.939/magit-imenu.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-imenu.elc rename to elpa/magit-20200418.939/magit-imenu.elc diff --git a/elpa/magit-20200408.2341/magit-log.el b/elpa/magit-20200418.939/magit-log.el similarity index 100% rename from elpa/magit-20200408.2341/magit-log.el rename to elpa/magit-20200418.939/magit-log.el diff --git a/elpa/magit-20200408.2341/magit-log.elc b/elpa/magit-20200418.939/magit-log.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-log.elc rename to elpa/magit-20200418.939/magit-log.elc diff --git a/elpa/magit-20200408.2341/magit-margin.el b/elpa/magit-20200418.939/magit-margin.el similarity index 100% rename from elpa/magit-20200408.2341/magit-margin.el rename to elpa/magit-20200418.939/magit-margin.el diff --git a/elpa/magit-20200408.2341/magit-margin.elc b/elpa/magit-20200418.939/magit-margin.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-margin.elc rename to elpa/magit-20200418.939/magit-margin.elc diff --git a/elpa/magit-20200408.2341/magit-merge.el b/elpa/magit-20200418.939/magit-merge.el similarity index 99% rename from elpa/magit-20200408.2341/magit-merge.el rename to elpa/magit-20200418.939/magit-merge.el index 839414b5..7ea12eab 100644 --- a/elpa/magit-20200408.2341/magit-merge.el +++ b/elpa/magit-20200418.939/magit-merge.el @@ -180,7 +180,7 @@ then also remove the respective remote branch." (if-let ((pr (magit-get "branch" branch "pullRequest"))) (magit-run-git-async "merge" args "-m" - (format "Merge branch '%s'%s [%s]" + (format "Merge branch '%s'%s [#%s]" branch (let ((current (magit-get-current-branch))) (if (equal current "master") "" (format " into %s" current))) diff --git a/elpa/magit-20200408.2341/magit-merge.elc b/elpa/magit-20200418.939/magit-merge.elc similarity index 92% rename from elpa/magit-20200408.2341/magit-merge.elc rename to elpa/magit-20200418.939/magit-merge.elc index b2dcb3d4acdd05a543855345b1d12aac87f1d160..71ca9901fb9f99096b4697934e0f93285d5b73eb 100644 GIT binary patch delta 91 zcmeyJ`6qKjgDj)+<_6gZOiZQ*lMhIUPp(vWz-R_#X>XpR7{JJAxcRNpK4wN!ps3j9 qLuxmeSWGlyH7D2eOKjezDapiWH2H$|MMksDi*#%`fO;R8NCN;R&md_4 delta 82 zcmey9`8#t%gY4!;*#}HaCYF;ANQh6aQh2~<3T0_;o~szZ$Y`+nozgyLMiZc@*yh7( gH<%cWH_y>DVPZ6#d{O%%qv__wI<_1@O%F|^0Yft$WdHyG diff --git a/elpa/magit-20200408.2341/magit-mode.el b/elpa/magit-20200418.939/magit-mode.el similarity index 100% rename from elpa/magit-20200408.2341/magit-mode.el rename to elpa/magit-20200418.939/magit-mode.el diff --git a/elpa/magit-20200408.2341/magit-mode.elc b/elpa/magit-20200418.939/magit-mode.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-mode.elc rename to elpa/magit-20200418.939/magit-mode.elc diff --git a/elpa/magit-20200408.2341/magit-notes.el b/elpa/magit-20200418.939/magit-notes.el similarity index 100% rename from elpa/magit-20200408.2341/magit-notes.el rename to elpa/magit-20200418.939/magit-notes.el diff --git a/elpa/magit-20200408.2341/magit-notes.elc b/elpa/magit-20200418.939/magit-notes.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-notes.elc rename to elpa/magit-20200418.939/magit-notes.elc diff --git a/elpa/magit-20200408.2341/magit-obsolete.el b/elpa/magit-20200418.939/magit-obsolete.el similarity index 100% rename from elpa/magit-20200408.2341/magit-obsolete.el rename to elpa/magit-20200418.939/magit-obsolete.el diff --git a/elpa/magit-20200408.2341/magit-obsolete.elc b/elpa/magit-20200418.939/magit-obsolete.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-obsolete.elc rename to elpa/magit-20200418.939/magit-obsolete.elc diff --git a/elpa/magit-20200408.2341/magit-patch.el b/elpa/magit-20200418.939/magit-patch.el similarity index 100% rename from elpa/magit-20200408.2341/magit-patch.el rename to elpa/magit-20200418.939/magit-patch.el diff --git a/elpa/magit-20200408.2341/magit-patch.elc b/elpa/magit-20200418.939/magit-patch.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-patch.elc rename to elpa/magit-20200418.939/magit-patch.elc diff --git a/elpa/magit-20200408.2341/magit-pkg.el b/elpa/magit-20200418.939/magit-pkg.el similarity index 76% rename from elpa/magit-20200408.2341/magit-pkg.el rename to elpa/magit-20200418.939/magit-pkg.el index 61971577..6558ca80 100644 --- a/elpa/magit-20200408.2341/magit-pkg.el +++ b/elpa/magit-20200418.939/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20200408.2341" "A Git porcelain inside Emacs." +(define-package "magit" "20200418.939" "A Git porcelain inside Emacs." '((emacs "25.1") (async "20180527") (dash "20180910") diff --git a/elpa/magit-20200408.2341/magit-process.el b/elpa/magit-20200418.939/magit-process.el similarity index 100% rename from elpa/magit-20200408.2341/magit-process.el rename to elpa/magit-20200418.939/magit-process.el diff --git a/elpa/magit-20200408.2341/magit-process.elc b/elpa/magit-20200418.939/magit-process.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-process.elc rename to elpa/magit-20200418.939/magit-process.elc diff --git a/elpa/magit-20200408.2341/magit-pull.el b/elpa/magit-20200418.939/magit-pull.el similarity index 100% rename from elpa/magit-20200408.2341/magit-pull.el rename to elpa/magit-20200418.939/magit-pull.el diff --git a/elpa/magit-20200408.2341/magit-pull.elc b/elpa/magit-20200418.939/magit-pull.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-pull.elc rename to elpa/magit-20200418.939/magit-pull.elc diff --git a/elpa/magit-20200408.2341/magit-push.el b/elpa/magit-20200418.939/magit-push.el similarity index 100% rename from elpa/magit-20200408.2341/magit-push.el rename to elpa/magit-20200418.939/magit-push.el diff --git a/elpa/magit-20200408.2341/magit-push.elc b/elpa/magit-20200418.939/magit-push.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-push.elc rename to elpa/magit-20200418.939/magit-push.elc diff --git a/elpa/magit-20200408.2341/magit-reflog.el b/elpa/magit-20200418.939/magit-reflog.el similarity index 100% rename from elpa/magit-20200408.2341/magit-reflog.el rename to elpa/magit-20200418.939/magit-reflog.el diff --git a/elpa/magit-20200408.2341/magit-reflog.elc b/elpa/magit-20200418.939/magit-reflog.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-reflog.elc rename to elpa/magit-20200418.939/magit-reflog.elc diff --git a/elpa/magit-20200408.2341/magit-refs.el b/elpa/magit-20200418.939/magit-refs.el similarity index 100% rename from elpa/magit-20200408.2341/magit-refs.el rename to elpa/magit-20200418.939/magit-refs.el diff --git a/elpa/magit-20200408.2341/magit-refs.elc b/elpa/magit-20200418.939/magit-refs.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-refs.elc rename to elpa/magit-20200418.939/magit-refs.elc diff --git a/elpa/magit-20200408.2341/magit-remote.el b/elpa/magit-20200418.939/magit-remote.el similarity index 100% rename from elpa/magit-20200408.2341/magit-remote.el rename to elpa/magit-20200418.939/magit-remote.el diff --git a/elpa/magit-20200408.2341/magit-remote.elc b/elpa/magit-20200418.939/magit-remote.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-remote.elc rename to elpa/magit-20200418.939/magit-remote.elc diff --git a/elpa/magit-20200408.2341/magit-repos.el b/elpa/magit-20200418.939/magit-repos.el similarity index 100% rename from elpa/magit-20200408.2341/magit-repos.el rename to elpa/magit-20200418.939/magit-repos.el diff --git a/elpa/magit-20200408.2341/magit-repos.elc b/elpa/magit-20200418.939/magit-repos.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-repos.elc rename to elpa/magit-20200418.939/magit-repos.elc diff --git a/elpa/magit-20200408.2341/magit-reset.el b/elpa/magit-20200418.939/magit-reset.el similarity index 100% rename from elpa/magit-20200408.2341/magit-reset.el rename to elpa/magit-20200418.939/magit-reset.el diff --git a/elpa/magit-20200408.2341/magit-reset.elc b/elpa/magit-20200418.939/magit-reset.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-reset.elc rename to elpa/magit-20200418.939/magit-reset.elc diff --git a/elpa/magit-20200408.2341/magit-section.el b/elpa/magit-20200418.939/magit-section.el similarity index 100% rename from elpa/magit-20200408.2341/magit-section.el rename to elpa/magit-20200418.939/magit-section.el diff --git a/elpa/magit-20200408.2341/magit-section.elc b/elpa/magit-20200418.939/magit-section.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-section.elc rename to elpa/magit-20200418.939/magit-section.elc diff --git a/elpa/magit-20200408.2341/magit-sequence.el b/elpa/magit-20200418.939/magit-sequence.el similarity index 100% rename from elpa/magit-20200408.2341/magit-sequence.el rename to elpa/magit-20200418.939/magit-sequence.el diff --git a/elpa/magit-20200408.2341/magit-sequence.elc b/elpa/magit-20200418.939/magit-sequence.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-sequence.elc rename to elpa/magit-20200418.939/magit-sequence.elc diff --git a/elpa/magit-20200408.2341/magit-stash.el b/elpa/magit-20200418.939/magit-stash.el similarity index 100% rename from elpa/magit-20200408.2341/magit-stash.el rename to elpa/magit-20200418.939/magit-stash.el diff --git a/elpa/magit-20200408.2341/magit-stash.elc b/elpa/magit-20200418.939/magit-stash.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-stash.elc rename to elpa/magit-20200418.939/magit-stash.elc diff --git a/elpa/magit-20200408.2341/magit-status.el b/elpa/magit-20200418.939/magit-status.el similarity index 100% rename from elpa/magit-20200408.2341/magit-status.el rename to elpa/magit-20200418.939/magit-status.el diff --git a/elpa/magit-20200408.2341/magit-status.elc b/elpa/magit-20200418.939/magit-status.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-status.elc rename to elpa/magit-20200418.939/magit-status.elc diff --git a/elpa/magit-20200408.2341/magit-submodule.el b/elpa/magit-20200418.939/magit-submodule.el similarity index 100% rename from elpa/magit-20200408.2341/magit-submodule.el rename to elpa/magit-20200418.939/magit-submodule.el diff --git a/elpa/magit-20200408.2341/magit-submodule.elc b/elpa/magit-20200418.939/magit-submodule.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-submodule.elc rename to elpa/magit-20200418.939/magit-submodule.elc diff --git a/elpa/magit-20200408.2341/magit-subtree.el b/elpa/magit-20200418.939/magit-subtree.el similarity index 100% rename from elpa/magit-20200408.2341/magit-subtree.el rename to elpa/magit-20200418.939/magit-subtree.el diff --git a/elpa/magit-20200408.2341/magit-subtree.elc b/elpa/magit-20200418.939/magit-subtree.elc similarity index 100% rename from elpa/magit-20200408.2341/magit-subtree.elc rename to elpa/magit-20200418.939/magit-subtree.elc diff --git a/elpa/magit-20200408.2341/magit-tag.el b/elpa/magit-20200418.939/magit-tag.el similarity index 88% rename from elpa/magit-20200408.2341/magit-tag.el rename to elpa/magit-20200418.939/magit-tag.el index c11dae8b..20ddf48e 100644 --- a/elpa/magit-20200408.2341/magit-tag.el +++ b/elpa/magit-20200418.939/magit-tag.el @@ -110,12 +110,27 @@ defaulting to the tag at point. (when remote-tags (magit-run-git-async "push" remote (--map (concat ":" it) remote-tags)))) +(defvar magit-tag-version-regexp-alist + '(("^[-._+ ]?alpha\\.?$" . -3) + ("^[-._+ ]?beta\\.?$" . -2) + ("^[-._+ ]?\\(pre\\|rc\\)\\.?$" . -1)) + "Value to use for `version-regexp-alist' when parsing and sorting versions. +The default value matches some common SemVer pre-release formats. +See also `magit-release-tag-regexp'.") + (defvar magit-release-tag-regexp "\\`\ \\(?1:\\(?:v\\(?:ersion\\)?\\|r\\(?:elease\\)?\\)?[-_]?\\)?\ -\\(?2:[0-9]+\\(?:\\.[0-9]+\\)*\\)\\'" +\\(?2:[0-9]+\\(?:\\.[0-9]+\\)*\ +\\(?:-[a-zA-Z0-9-]+\\(?:\\.[a-zA-Z0-9-]+\\)*\\)?\\)\\'" "Regexp used to parse release tag names. The first submatch must match the prefix, if any. -The second submatch must match the version string.") +The second submatch must match the version string. +The default value matches SemVer version numbers, including +pre-release versions. + +If this will match versions that are not dot separated numbers, you +also need to set `magit-tag-version-regexp-alist' to recognize them +and give them a sorting order.") ;;;###autoload (defun magit-tag-release (tag msg) @@ -179,7 +194,9 @@ a tag qualifies as a release tag." (let ((tag (substring line 0 (match-beginning 0))) (msg (substring line (match-end 0)))) (and (string-match magit-release-tag-regexp tag) - (let ((ver (match-string 2 tag))) + (let ((ver (match-string 2 tag)) + (version-regexp-alist + magit-tag-version-regexp-alist)) (list (list (version-to-list ver) ver tag msg))))))) ;; Cannot rely on "--sort=-version:refname" because diff --git a/elpa/magit-20200408.2341/magit-tag.elc b/elpa/magit-20200418.939/magit-tag.elc similarity index 84% rename from elpa/magit-20200408.2341/magit-tag.elc rename to elpa/magit-20200418.939/magit-tag.elc index 430ef41a6c1511cf7fb1c863819f29f320583b62..b64e6a31181b652c5087ca84a938bb884e61573b 100644 GIT binary patch delta 851 zcmaKr%Wl&^6owm!5cMkEAfT-{q?HmAZ26LFC6uzD0ybR)bwMYPX?$W^vOUpwl0t=) z6$>_O`~W-xpuP{Uz>YO1*R}{{+9$Cu{3N`f=MZ45 zO-=U0@jL>)GF(Uxr8za{&fJ~s=hpq~PoZ~MZXXz@+_-pdytRy$(X9~D_5peEPf~wE zfZH?3rQ#B8&2ldXTfg%8n$@abzP$H2-*K61Rd2B(bF5lrgE_WMiP~&+oa%9I9yv8y z>&NtQ@7|s_>l+j`m}^^<*nCJEJNG!3&mZa8?zZW!XR*Y6;|IuIZ-3coHJf@@*XWsu Map)nGRzkY=7Zw~3wEzGB delta 167 zcmbPl``&zms{o_PX4zQ@91Vq#{z`JhBA zOMqdFv4Ig&j8cq|fvE;VjFBNoz!*#$8JYMqLU=}|K-$C~NEmW3Llmnq0C^x`GmwC> yfjOfhBMXb$ ;; Keywords: wp, text -;; Package-Version: 20200414.328 +;; Package-Version: 20200417.607 ;; Version: 1.10.0-beta ;; Package-Requires: ((emacs "24.5")) ;; URL: https://gthub.com/rnkn/olivetti @@ -104,6 +104,11 @@ ;;; Variables +(eval-when-compile + (require 'lisp-mnt) + (defconst olivetti-version + (lm-version load-file-name))) + (defvar-local olivetti--visual-line-mode nil "Non-nil if `visual-line-mode' is active when `olivetti-mode' is turned on.") diff --git a/elpa/olivetti-20200414.328/olivetti.elc b/elpa/olivetti-20200417.607/olivetti.elc similarity index 100% rename from elpa/olivetti-20200414.328/olivetti.elc rename to elpa/olivetti-20200417.607/olivetti.elc diff --git a/elpa/package-lint-20200415.606/data/stdlib-changes b/elpa/package-lint-20200419.406/data/stdlib-changes similarity index 100% rename from elpa/package-lint-20200415.606/data/stdlib-changes rename to elpa/package-lint-20200419.406/data/stdlib-changes diff --git a/elpa/package-lint-20200415.606/package-lint-autoloads.el b/elpa/package-lint-20200419.406/package-lint-autoloads.el similarity index 100% rename from elpa/package-lint-20200415.606/package-lint-autoloads.el rename to elpa/package-lint-20200419.406/package-lint-autoloads.el diff --git a/elpa/package-lint-20200415.606/package-lint-pkg.el b/elpa/package-lint-20200419.406/package-lint-pkg.el similarity index 85% rename from elpa/package-lint-20200415.606/package-lint-pkg.el rename to elpa/package-lint-20200419.406/package-lint-pkg.el index 818facd1..cfac493f 100644 --- a/elpa/package-lint-20200415.606/package-lint-pkg.el +++ b/elpa/package-lint-20200419.406/package-lint-pkg.el @@ -1,4 +1,4 @@ -(define-package "package-lint" "20200415.606" "A linting library for elisp package authors" +(define-package "package-lint" "20200419.406" "A linting library for elisp package authors" '((cl-lib "0.5") (emacs "24.1") (let-alist "1.0.6")) diff --git a/elpa/package-lint-20200415.606/package-lint.el b/elpa/package-lint-20200419.406/package-lint.el similarity index 98% rename from elpa/package-lint-20200415.606/package-lint.el rename to elpa/package-lint-20200419.406/package-lint.el index 18219da1..3cad3a64 100644 --- a/elpa/package-lint-20200415.606/package-lint.el +++ b/elpa/package-lint-20200419.406/package-lint.el @@ -175,7 +175,6 @@ published in ELPA for use by older Emacsen.") (let ((desc (package-lint--check-package-el-can-parse))) (when desc (package-lint--check-package-summary desc) - ;; TODO: check provide form present even if this is not the main file (package-lint--check-provide-form desc) (package-lint--check-no-emacs-in-package-name desc))) (setq deps (package-lint--check-dependency-list)) @@ -196,7 +195,9 @@ published in ELPA for use by older Emacsen.") (if (eq (car-safe expr) 'define-package) (setq deps (package-desc-reqs (apply #'package-desc-from-define (cdr expr)))) (package-lint--error-at-bob 'error (format "Malformed package descriptor file \"%s\"" main-file)))) - ;; TODO: warn if there are Package-Requires headers here + (when (package-lint--goto-header "Package-Requires") + (package-lint--error-at-bol 'error "Package-Requires outside the main file have no effect.")) + (package-lint--check-provide-form-secondary-file) (condition-case err (with-temp-buffer (insert-file-contents (expand-file-name main-file)) @@ -786,6 +787,15 @@ DESC is a struct as returned by `package-buffer-info'." 'error (format "There is no (provide '%s) form." name))))) +(defun package-lint--check-provide-form-secondary-file () + "Check there is a provide form." + ;; We don't require that the provided feature have a name consistent + ;; with the overall package prefix, but this check may later be added. + (unless (package-lint--provided-feature) + (package-lint--error-at-bob + 'error + "There is no `provide' form."))) + (defun package-lint--check-no-emacs-in-package-name (desc) "Check that the package name doesn't contain \"emacs\". DESC is a struct as returned by `package-buffer-info'." diff --git a/elpa/package-lint-20200415.606/package-lint.elc b/elpa/package-lint-20200419.406/package-lint.elc similarity index 85% rename from elpa/package-lint-20200415.606/package-lint.elc rename to elpa/package-lint-20200419.406/package-lint.elc index f7976f37253d3d0fa5c2f2efa5e0b805fd183549..5d91f37a00974fcb6d16cb9dac223b95c415ad86 100644 GIT binary patch delta 1427 zcmZ8gU2IfE6yCXW7cI7llC3}r$#h$#UE9t4++V7-wG>g2{!nR=+u*vr+g)h8b^D`G zV;ez(!AfKj%TsS#vD8w1Gs2Ez$X}Dc z=`MrdhlX#l!3}kxaY)0Ka8=Ew%LsFWpS#+mVVj%kkJQZ?08CZ4UPaipZS_yO4G`N> zcd!>Rc1)%&86W7dCDbYRb`85OSKqfC(y(b+YH$0SNVhoSs-|NOVawp^Xy;j^+Z3v{ zbhRUF0QdNo_kr8us%7hWO?SXqb$Q!#9J`dO!5w*o1*Pi4o*p2ugi7>HBArpneoiG%pHvuo6!mFn6JgJax7uOv> zc_R!)GBvPF4VFJtCf^jXCx?k3O%07CO}I;$@+QARy30*Ru@c;UVBI^@=WrYtZLan{ z1_GI&wtVa0&)5MmC+6~6HD`iHYHU-!JhxHKEi}sC52ob&#wxY&#Mh|WHp>Z&@gPIZ zEqsh>gfPmtz-R>Td-8J_EwFO);clcG0=zi%R03nmX6n?Dtfrd=*o%%n3e!MsM?L=R zC`5*7sb3av0?Rm6e;;$;#s$oi{rs1K(~hi?S9FI7q5hPMFc*Q<&%E#)=%n0Lbti6x z$NdZ@@#IbEq<-eMPLa_D4>z^TAz;wtnZ*2G% D00xQc delta 1109 zcmZ8fU5Hgx6h8axeJW)TqHBfC#N>y?06886AJe9Irn)a8g8_F$xkH5;K{Y z#3ItlQ6aQbK)D)Q8^2hu%sbq;>9{X@(v)eEVB}-?#QYbS3@a zkM!hyl`J=2B{;Rx&ZZHRNp8TZ+&EXPtUQx~D?XauS^;P$%CN`s{ugpBZEg${r>6TM z%JyZ6q(fDpOCrlU@|n2?&2p_|<51`JF`&kQZUD-WW*Vc}h7NW1jt*qhfqGDRGvFyr z)sjgZ-8+YplJ5E+J-@*&7-uP?J82FjxNrh4nt+QF^41V5)sjhg=|sx1Np#N`CjTUx zx-O?BkZ?jTCgMNobX_sgptpoltsJXO>0)-4_EkOM>6kORt!g9yh%&UgSwDMR+?r%c zNv|byPv;und+1()wbp@qxOEaoW>y&o8;Z*vw?v2p&OUyLs}S(ZC)TChN`tp&-DF%! zIC`y0M2L7}_Jb)A4*!|+7vs(<9DVkAVywif{)}@_4o|yNf;;1J?{jlg?j7JSbKgn1 zF%p-}8)3pl4|uz_i_r+c9bJc63-}PKFIT5_)EpEWyB|Qapo4KubNae}q&XV!;YBA? z;iI?s>yp8Y0|3rnv6a+;Jy3rH&-GgBr~S9}ZA?f{KXGu?F|J5O+v+;wh9+%aV^i|$ zixV%M;aXYTwr(@kD1%q}>OyGm4bEA=GZQ8RjU$`xkOEr9@hv^6a6SV5J#d*i5q05} zeM~?AjT>L>63u(28Sj-s6?-_EEHL=3~DtVIVf&9IV1ZTL}KzUMa*EDB6fm9qKDRdfapPCzhEQoWg})0kxG9 dhmM@hxON^FAMYoILf@P?&xDTPi=nSu{{=x8C~g1% diff --git a/elpa/racket-mode-20200412.1611/dir b/elpa/racket-mode-20200417.1741/dir similarity index 100% rename from elpa/racket-mode-20200412.1611/dir rename to elpa/racket-mode-20200417.1741/dir diff --git a/elpa/racket-mode-20200412.1611/racket-bug-report.el b/elpa/racket-mode-20200417.1741/racket-bug-report.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-bug-report.el rename to elpa/racket-mode-20200417.1741/racket-bug-report.el diff --git a/elpa/racket-mode-20200412.1611/racket-bug-report.elc b/elpa/racket-mode-20200417.1741/racket-bug-report.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-bug-report.elc rename to elpa/racket-mode-20200417.1741/racket-bug-report.elc diff --git a/elpa/racket-mode-20200412.1611/racket-cmd.el b/elpa/racket-mode-20200417.1741/racket-cmd.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-cmd.el rename to elpa/racket-mode-20200417.1741/racket-cmd.el diff --git a/elpa/racket-mode-20200412.1611/racket-cmd.elc b/elpa/racket-mode-20200417.1741/racket-cmd.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-cmd.elc rename to elpa/racket-mode-20200417.1741/racket-cmd.elc diff --git a/elpa/racket-mode-20200412.1611/racket-collection.el b/elpa/racket-mode-20200417.1741/racket-collection.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-collection.el rename to elpa/racket-mode-20200417.1741/racket-collection.el diff --git a/elpa/racket-mode-20200412.1611/racket-collection.elc b/elpa/racket-mode-20200417.1741/racket-collection.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-collection.elc rename to elpa/racket-mode-20200417.1741/racket-collection.elc diff --git a/elpa/racket-mode-20200412.1611/racket-common.el b/elpa/racket-mode-20200417.1741/racket-common.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-common.el rename to elpa/racket-mode-20200417.1741/racket-common.el diff --git a/elpa/racket-mode-20200412.1611/racket-common.elc b/elpa/racket-mode-20200417.1741/racket-common.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-common.elc rename to elpa/racket-mode-20200417.1741/racket-common.elc diff --git a/elpa/racket-mode-20200412.1611/racket-complete.el b/elpa/racket-mode-20200417.1741/racket-complete.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-complete.el rename to elpa/racket-mode-20200417.1741/racket-complete.el diff --git a/elpa/racket-mode-20200412.1611/racket-complete.elc b/elpa/racket-mode-20200417.1741/racket-complete.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-complete.elc rename to elpa/racket-mode-20200417.1741/racket-complete.elc diff --git a/elpa/racket-mode-20200412.1611/racket-custom.el b/elpa/racket-mode-20200417.1741/racket-custom.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-custom.el rename to elpa/racket-mode-20200417.1741/racket-custom.el diff --git a/elpa/racket-mode-20200412.1611/racket-custom.elc b/elpa/racket-mode-20200417.1741/racket-custom.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-custom.elc rename to elpa/racket-mode-20200417.1741/racket-custom.elc diff --git a/elpa/racket-mode-20200412.1611/racket-debug.el b/elpa/racket-mode-20200417.1741/racket-debug.el similarity index 96% rename from elpa/racket-mode-20200412.1611/racket-debug.el rename to elpa/racket-mode-20200417.1741/racket-debug.el index 1474430b..01ee388c 100644 --- a/elpa/racket-mode-20200412.1611/racket-debug.el +++ b/elpa/racket-mode-20200417.1741/racket-debug.el @@ -109,8 +109,9 @@ file-local variable.") (buf (pop-to-buffer buf))) (goto-char pos) (pcase vals - (`(,_id before) (message "Break before expression")) - (`(,_id after ,s) (message "Break after expression: (values %s" (substring s 1)))) + (`(,_id before) (message "Break before expression")) + (`(,_id after (,_ . ,s)) (message "Break after expression: (values %s" + (substring s 1)))) (setq racket--debug-break-positions positions) (setq racket--debug-break-locals locals) (setq racket--debug-break-info vals) @@ -133,11 +134,12 @@ file-local variable.") (`(,id before) (pcase (read-from-minibuffer "Skip step, substituting values: " "()") ((or `nil "" "()") `(,id before)) - (str `(,id before ,str)))) - (`(,id after ,orig) + (str `(,id before ,str)))) + (`(,id after (t . ,orig)) (pcase (read-from-minibuffer "Step, replacing result values: " orig) - ((or `nil "" "()") `(,id after ,orig)) - (new `(,id after ,new)))))) + ((or `nil "" "()") `(,id after (t . ,orig))) + (new `(,id after (t . ,new))))) + (v v))) (defun racket-debug-step (&optional prefix) "Resume to next breakable position. With prefix, substitute values." @@ -291,7 +293,7 @@ How to debug: pos (+ pos span) 'after-string (propertize val 'face racket-debug-locals-face)))) (pcase racket--debug-break-info - (`(,_id after ,str) + (`(,_id after (,_ . ,str)) (let ((eol (line-end-position))) (racket--debug-make-overlay (1- eol) eol diff --git a/elpa/racket-mode-20200412.1611/racket-debug.elc b/elpa/racket-mode-20200417.1741/racket-debug.elc similarity index 75% rename from elpa/racket-mode-20200412.1611/racket-debug.elc rename to elpa/racket-mode-20200417.1741/racket-debug.elc index 9f82c36615f2312a5166ab0a59c0710c368018f7..4dfbc05742cd7112153d9bb6479c638a9cd2ec7c 100644 GIT binary patch delta 1105 zcmZuwO=}cE5S{MXuZX*ntl5|)!mgK$px9m2)15Vh%tqIv3SLJ9QSl)067Zy}C&6ob z5J7_A-IzHkdeDC%c-UVc{s0eFPtUruu!kOIURAw*RrTiE-4FMUSaXa*1Sv?FxX0xb zM4W=r9%93ASccUUE`zWLEI3(SzUx`F4p^mDuciC7^g)UOSw98)ym_r1V^B$||F6On zV*9hXeIxcXDN5WS4u^}tb2_E;t&G2YD#$@z{E+8-l%@z%0jt&R%~q5hw5~9YBKv&m zm~p*jhuw~yoUGed%RPgnN(7ChQI=wGb_K;{uHqNoHzm3~XURY_B>HHdo*lqSRU zTrL46U5vC_fzNWK#*tL_MoupsKS%B~xj^UwGu2ubX_N{u-&HAuSPI=QbxiYLIEgr3 zjMIb`<{LAI3)8Tl#JZiVJZ1;>dRta*_oTKj+g~|=9i9Hc71*WKk6cUpW%WBZ1N*cy z;e&y_v-URBAno6^_Z&@jc;=At7_+3iLm+IW3}89Um1)7C0zCe5-TwEeT$+0k-- zWxBMVVr8)(>YNj)W9LK>CH7I&eF$U)L_tUPX-}dRdBc#mkp}HP5(^-8z5FxrVHM;Yk<{#8&p=(mNK$a$x&%;~&!V`-1=g delta 852 zcmZuwO>5Lp6wP~?rlU9`)9H*I$B&GwiHg3@yrxw<6?ElBTnVomN3;d0h=|Z4^#=$p zt`reO3htF=sV)?MfJ@!ggyf=>C6i=e1w3wCZYvqoMpF|h zX@!Dsjm2}Sps|w6^T^?F78IP$DZWcnRYy!ArUMd1Fm4X>r_CioMV5a#xJ#y#PF50V z_1ds^U>bH>vCvyVeN><5>PH2cn-2YPuX&*q^h0Fus}&zR6A=8IUPL*eeG7Hv^b&4P z5a2WI+nXLn)OeDOifjF#YT47?cZRW8;G`_HCkg{-0%vh^u6jXJLjfl4P81D=-!mO} z*WA|=#C<|l$%S{}LUa(^JKTrQ?KL<%%j)s^+MSh{OBm0-r;Nd%^N9)uKRR!y%wW6w zk!l0i5A9K7U~%q6sIv^d&h1dH^UdBX5=m}~754J1f0bfy{^aPh{Un9K@cA{Zg2t#Z z*(Ro=%d=6;BUBlp=9P80vVTqsy2cO{9u^Gocrt=<(j^==l0M$IllYV{+^vAQW6>R2 zDJ5R2j(zR{xuoA3E>ptyq<6(igDGKPaZ#d+%t}P!zFecPQJA~JMkPx+_j5>veq1)F en=hQ)rBt!}=jn%Gm>QF>vX>+j^Yc&_NB#gB3(0-} diff --git a/elpa/racket-mode-20200412.1611/racket-describe.el b/elpa/racket-mode-20200417.1741/racket-describe.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-describe.el rename to elpa/racket-mode-20200417.1741/racket-describe.el diff --git a/elpa/racket-mode-20200412.1611/racket-describe.elc b/elpa/racket-mode-20200417.1741/racket-describe.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-describe.elc rename to elpa/racket-mode-20200417.1741/racket-describe.elc diff --git a/elpa/racket-mode-20200412.1611/racket-edit.el b/elpa/racket-mode-20200417.1741/racket-edit.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-edit.el rename to elpa/racket-mode-20200417.1741/racket-edit.el diff --git a/elpa/racket-mode-20200412.1611/racket-edit.elc b/elpa/racket-mode-20200417.1741/racket-edit.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-edit.elc rename to elpa/racket-mode-20200417.1741/racket-edit.elc diff --git a/elpa/racket-mode-20200412.1611/racket-eldoc.el b/elpa/racket-mode-20200417.1741/racket-eldoc.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-eldoc.el rename to elpa/racket-mode-20200417.1741/racket-eldoc.el diff --git a/elpa/racket-mode-20200412.1611/racket-eldoc.elc b/elpa/racket-mode-20200417.1741/racket-eldoc.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-eldoc.elc rename to elpa/racket-mode-20200417.1741/racket-eldoc.elc diff --git a/elpa/racket-mode-20200412.1611/racket-font-lock.el b/elpa/racket-mode-20200417.1741/racket-font-lock.el similarity index 90% rename from elpa/racket-mode-20200412.1611/racket-font-lock.el rename to elpa/racket-mode-20200417.1741/racket-font-lock.el index f8055304..b07e52fd 100644 --- a/elpa/racket-mode-20200412.1611/racket-font-lock.el +++ b/elpa/racket-mode-20200417.1741/racket-font-lock.el @@ -260,27 +260,31 @@ like \"#; #; 1 2\". For more examples see the issue 432 section of example/example.rkt." (while (re-search-forward (rx "#;") limit t) (if (racket--string-or-comment-p (match-beginning 0)) - (goto-char (match-end 0)) ;issues 388, 408 - (racket--region-set-face (match-beginning 0) (match-end 0) - 'font-lock-comment-delimiter-face t) - ;; Font-lock and count any additional successive prefixes - (goto-char (match-end 0)) - (forward-comment (buffer-size)) - (let ((num-prefixes 1)) - (while (looking-at (rx "#;")) - (cl-incf num-prefixes) - (racket--region-set-face (match-beginning 0) (match-end 0) - 'font-lock-comment-delimiter-face t) - (goto-char (match-end 0)) - (forward-comment (buffer-size))) - ;; Font-lock as many successive sexprs as prefixes - (dotimes (_ num-prefixes) - (let ((beg (point))) - (forward-sexp 1) - (racket--region-set-face beg (point) - 'font-lock-comment-face t) - (put-text-property beg (point) 'font-lock-multiline t) - (forward-comment (buffer-size))))))) + (goto-char (match-end 0)) ;issues #388, #408 + (let ((first-prefix-begin (match-beginning 0))) + (racket--region-set-face (match-beginning 0) (match-end 0) + 'font-lock-comment-delimiter-face t) + ;; Font-lock and count any additional successive prefixes + (goto-char (match-end 0)) + (forward-comment (buffer-size)) + (let ((num-prefixes 1)) + (while (looking-at (rx "#;")) + (cl-incf num-prefixes) + (racket--region-set-face (match-beginning 0) (match-end 0) + 'font-lock-comment-delimiter-face t) + (goto-char (match-end 0)) + (forward-comment (buffer-size))) + ;; Font-lock as many successive sexprs as prefixes + (dotimes (_ num-prefixes) + (let ((beg (point))) + (forward-sexp 1) + (racket--region-set-face beg (point) + 'font-lock-comment-face t) + (forward-comment (buffer-size))))) + ;; Cover everything from the beginning of the first prefix to + ;; the end of the last sexp with font-lock-multiline; #443. + (put-text-property first-prefix-begin (point) + 'font-lock-multiline t)))) nil) (defun racket--string-or-comment-p (pos) diff --git a/elpa/racket-mode-20200412.1611/racket-font-lock.elc b/elpa/racket-mode-20200417.1741/racket-font-lock.elc similarity index 98% rename from elpa/racket-mode-20200412.1611/racket-font-lock.elc rename to elpa/racket-mode-20200417.1741/racket-font-lock.elc index d5ceb858d1462dc214ddc50bcc802ed1d2dafea9..2ad023346e1b79f5b8f23ed1e9f057173ce915f6 100644 GIT binary patch delta 404 zcmX^9mFe+UrVS12>dj(|4a_-Wj13KxV~h-ps~LbyLm)PaF)}hy1PO_Ogg{)=q!=SZ z1E7!*15C(75-4X3Qw~!Hq)mX>Kn1KGMYFM?DNx2t0cbMNC}YEVbEz0(BOuGb9Bi34 zLrh+X5Kw}ALxJwo1)2gh!$?|&J0>k0ugx54-VPRwnWSJ`|MCWAYW|kEre#*> vCZ(ol=50Q)K8T&k++?!M_B+g$hQ^zJZx3cP=&e4a_)zgt>Bzk%4hJLyWPZ0T3I;7#W!;f`r6CLLjbbQj8H$ z&d9)s0VHGuQw5U-(#9ZzRKUtm^cWkO0A)=TfChq1HY++%#S$sz@Ba?yU s=A50Oj7p{knz5Q(8U;o9Wtl0d3hG6P$=RtTx@q}&CAvBJ$=RA*0I}z1#{d8T diff --git a/elpa/racket-mode-20200412.1611/racket-imenu.el b/elpa/racket-mode-20200417.1741/racket-imenu.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-imenu.el rename to elpa/racket-mode-20200417.1741/racket-imenu.el diff --git a/elpa/racket-mode-20200412.1611/racket-imenu.elc b/elpa/racket-mode-20200417.1741/racket-imenu.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-imenu.elc rename to elpa/racket-mode-20200417.1741/racket-imenu.elc diff --git a/elpa/racket-mode-20200412.1611/racket-indent.el b/elpa/racket-mode-20200417.1741/racket-indent.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-indent.el rename to elpa/racket-mode-20200417.1741/racket-indent.el diff --git a/elpa/racket-mode-20200412.1611/racket-indent.elc b/elpa/racket-mode-20200417.1741/racket-indent.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-indent.elc rename to elpa/racket-mode-20200417.1741/racket-indent.elc diff --git a/elpa/racket-mode-20200412.1611/racket-keywords-and-builtins.el b/elpa/racket-mode-20200417.1741/racket-keywords-and-builtins.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-keywords-and-builtins.el rename to elpa/racket-mode-20200417.1741/racket-keywords-and-builtins.el diff --git a/elpa/racket-mode-20200412.1611/racket-keywords-and-builtins.elc b/elpa/racket-mode-20200417.1741/racket-keywords-and-builtins.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-keywords-and-builtins.elc rename to elpa/racket-mode-20200417.1741/racket-keywords-and-builtins.elc diff --git a/elpa/racket-mode-20200412.1611/racket-logger.el b/elpa/racket-mode-20200417.1741/racket-logger.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-logger.el rename to elpa/racket-mode-20200417.1741/racket-logger.el diff --git a/elpa/racket-mode-20200412.1611/racket-logger.elc b/elpa/racket-mode-20200417.1741/racket-logger.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-logger.elc rename to elpa/racket-mode-20200417.1741/racket-logger.elc diff --git a/elpa/racket-mode-20200412.1611/racket-mode-autoloads.el b/elpa/racket-mode-20200417.1741/racket-mode-autoloads.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-mode-autoloads.el rename to elpa/racket-mode-20200417.1741/racket-mode-autoloads.el diff --git a/elpa/racket-mode-20200412.1611/racket-mode-pkg.el b/elpa/racket-mode-20200417.1741/racket-mode-pkg.el similarity index 79% rename from elpa/racket-mode-20200412.1611/racket-mode-pkg.el rename to elpa/racket-mode-20200417.1741/racket-mode-pkg.el index 88ab706f..34ceeb18 100644 --- a/elpa/racket-mode-20200412.1611/racket-mode-pkg.el +++ b/elpa/racket-mode-20200417.1741/racket-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "racket-mode" "20200412.1611" "Major mode for Racket language." +(define-package "racket-mode" "20200417.1741" "Major mode for Racket language." '((emacs "25.1") (faceup "0.0.2") (pos-tip "20191127.1028")) diff --git a/elpa/racket-mode-20200412.1611/racket-mode.el b/elpa/racket-mode-20200417.1741/racket-mode.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-mode.el rename to elpa/racket-mode-20200417.1741/racket-mode.el diff --git a/elpa/racket-mode-20200412.1611/racket-mode.elc b/elpa/racket-mode-20200417.1741/racket-mode.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-mode.elc rename to elpa/racket-mode-20200417.1741/racket-mode.elc diff --git a/elpa/racket-mode-20200412.1611/racket-mode.info b/elpa/racket-mode-20200417.1741/racket-mode.info similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-mode.info rename to elpa/racket-mode-20200417.1741/racket-mode.info diff --git a/elpa/racket-mode-20200412.1611/racket-parens.el b/elpa/racket-mode-20200417.1741/racket-parens.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-parens.el rename to elpa/racket-mode-20200417.1741/racket-parens.el diff --git a/elpa/racket-mode-20200412.1611/racket-parens.elc b/elpa/racket-mode-20200417.1741/racket-parens.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-parens.elc rename to elpa/racket-mode-20200417.1741/racket-parens.elc diff --git a/elpa/racket-mode-20200412.1611/racket-ppss.el b/elpa/racket-mode-20200417.1741/racket-ppss.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-ppss.el rename to elpa/racket-mode-20200417.1741/racket-ppss.el diff --git a/elpa/racket-mode-20200412.1611/racket-ppss.elc b/elpa/racket-mode-20200417.1741/racket-ppss.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-ppss.elc rename to elpa/racket-mode-20200417.1741/racket-ppss.elc diff --git a/elpa/racket-mode-20200412.1611/racket-profile.el b/elpa/racket-mode-20200417.1741/racket-profile.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-profile.el rename to elpa/racket-mode-20200417.1741/racket-profile.el diff --git a/elpa/racket-mode-20200412.1611/racket-profile.elc b/elpa/racket-mode-20200417.1741/racket-profile.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-profile.elc rename to elpa/racket-mode-20200417.1741/racket-profile.elc diff --git a/elpa/racket-mode-20200412.1611/racket-repl-buffer-name.el b/elpa/racket-mode-20200417.1741/racket-repl-buffer-name.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-repl-buffer-name.el rename to elpa/racket-mode-20200417.1741/racket-repl-buffer-name.el diff --git a/elpa/racket-mode-20200412.1611/racket-repl-buffer-name.elc b/elpa/racket-mode-20200417.1741/racket-repl-buffer-name.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-repl-buffer-name.elc rename to elpa/racket-mode-20200417.1741/racket-repl-buffer-name.elc diff --git a/elpa/racket-mode-20200412.1611/racket-repl.el b/elpa/racket-mode-20200417.1741/racket-repl.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-repl.el rename to elpa/racket-mode-20200417.1741/racket-repl.el diff --git a/elpa/racket-mode-20200412.1611/racket-repl.elc b/elpa/racket-mode-20200417.1741/racket-repl.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-repl.elc rename to elpa/racket-mode-20200417.1741/racket-repl.elc diff --git a/elpa/racket-mode-20200412.1611/racket-show.el b/elpa/racket-mode-20200417.1741/racket-show.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-show.el rename to elpa/racket-mode-20200417.1741/racket-show.el diff --git a/elpa/racket-mode-20200412.1611/racket-show.elc b/elpa/racket-mode-20200417.1741/racket-show.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-show.elc rename to elpa/racket-mode-20200417.1741/racket-show.elc diff --git a/elpa/racket-mode-20200412.1611/racket-smart-open.el b/elpa/racket-mode-20200417.1741/racket-smart-open.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-smart-open.el rename to elpa/racket-mode-20200417.1741/racket-smart-open.el diff --git a/elpa/racket-mode-20200412.1611/racket-smart-open.elc b/elpa/racket-mode-20200417.1741/racket-smart-open.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-smart-open.elc rename to elpa/racket-mode-20200417.1741/racket-smart-open.elc diff --git a/elpa/racket-mode-20200412.1611/racket-stepper.el b/elpa/racket-mode-20200417.1741/racket-stepper.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-stepper.el rename to elpa/racket-mode-20200417.1741/racket-stepper.el diff --git a/elpa/racket-mode-20200412.1611/racket-stepper.elc b/elpa/racket-mode-20200417.1741/racket-stepper.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-stepper.elc rename to elpa/racket-mode-20200417.1741/racket-stepper.elc diff --git a/elpa/racket-mode-20200412.1611/racket-unicode-input-method.el b/elpa/racket-mode-20200417.1741/racket-unicode-input-method.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-unicode-input-method.el rename to elpa/racket-mode-20200417.1741/racket-unicode-input-method.el diff --git a/elpa/racket-mode-20200412.1611/racket-unicode-input-method.elc b/elpa/racket-mode-20200417.1741/racket-unicode-input-method.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-unicode-input-method.elc rename to elpa/racket-mode-20200417.1741/racket-unicode-input-method.elc diff --git a/elpa/racket-mode-20200412.1611/racket-util.el b/elpa/racket-mode-20200417.1741/racket-util.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-util.el rename to elpa/racket-mode-20200417.1741/racket-util.el diff --git a/elpa/racket-mode-20200412.1611/racket-util.elc b/elpa/racket-mode-20200417.1741/racket-util.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-util.elc rename to elpa/racket-mode-20200417.1741/racket-util.elc diff --git a/elpa/racket-mode-20200412.1611/racket-visit.el b/elpa/racket-mode-20200417.1741/racket-visit.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-visit.el rename to elpa/racket-mode-20200417.1741/racket-visit.el diff --git a/elpa/racket-mode-20200412.1611/racket-visit.elc b/elpa/racket-mode-20200417.1741/racket-visit.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-visit.elc rename to elpa/racket-mode-20200417.1741/racket-visit.elc diff --git a/elpa/racket-mode-20200412.1611/racket-wsl.el b/elpa/racket-mode-20200417.1741/racket-wsl.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-wsl.el rename to elpa/racket-mode-20200417.1741/racket-wsl.el diff --git a/elpa/racket-mode-20200412.1611/racket-wsl.elc b/elpa/racket-mode-20200417.1741/racket-wsl.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-wsl.elc rename to elpa/racket-mode-20200417.1741/racket-wsl.elc diff --git a/elpa/racket-mode-20200412.1611/racket-xp-complete.el b/elpa/racket-mode-20200417.1741/racket-xp-complete.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-xp-complete.el rename to elpa/racket-mode-20200417.1741/racket-xp-complete.el diff --git a/elpa/racket-mode-20200412.1611/racket-xp-complete.elc b/elpa/racket-mode-20200417.1741/racket-xp-complete.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-xp-complete.elc rename to elpa/racket-mode-20200417.1741/racket-xp-complete.elc diff --git a/elpa/racket-mode-20200412.1611/racket-xp.el b/elpa/racket-mode-20200417.1741/racket-xp.el similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-xp.el rename to elpa/racket-mode-20200417.1741/racket-xp.el diff --git a/elpa/racket-mode-20200412.1611/racket-xp.elc b/elpa/racket-mode-20200417.1741/racket-xp.elc similarity index 100% rename from elpa/racket-mode-20200412.1611/racket-xp.elc rename to elpa/racket-mode-20200417.1741/racket-xp.elc diff --git a/elpa/racket-mode-20200412.1611/racket/command-server.rkt b/elpa/racket-mode-20200417.1741/racket/command-server.rkt similarity index 99% rename from elpa/racket-mode-20200412.1611/racket/command-server.rkt rename to elpa/racket-mode-20200417.1741/racket/command-server.rkt index 5cfb2b20..740282cd 100644 --- a/elpa/racket-mode-20200412.1611/racket/command-server.rkt +++ b/elpa/racket-mode-20200417.1741/racket/command-server.rkt @@ -8,6 +8,7 @@ "elisp.rkt" "mod.rkt" "repl.rkt" + "repl-session.rkt" "util.rkt") (lazy-require diff --git a/elpa/racket-mode-20200412.1611/racket/commands/check-syntax.rkt b/elpa/racket-mode-20200417.1741/racket/commands/check-syntax.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/commands/check-syntax.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/check-syntax.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/commands/coverage.rkt b/elpa/racket-mode-20200417.1741/racket/commands/coverage.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/commands/coverage.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/coverage.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/commands/describe.rkt b/elpa/racket-mode-20200417.1741/racket/commands/describe.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/commands/describe.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/describe.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/commands/find-module.rkt b/elpa/racket-mode-20200417.1741/racket/commands/find-module.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/commands/find-module.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/find-module.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/commands/help.rkt b/elpa/racket-mode-20200417.1741/racket/commands/help.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/commands/help.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/help.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/commands/macro.rkt b/elpa/racket-mode-20200417.1741/racket/commands/macro.rkt similarity index 99% rename from elpa/racket-mode-20200412.1611/racket/commands/macro.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/macro.rkt index a8583071..cd616f92 100644 --- a/elpa/racket-mode-20200412.1611/racket/commands/macro.rkt +++ b/elpa/racket-mode-20200417.1741/racket/commands/macro.rkt @@ -11,7 +11,7 @@ racket/pretty racket/system "../elisp.rkt" - "../repl.rkt" + "../repl-session.rkt" "../syntax.rkt" "../util.rkt") diff --git a/elpa/racket-mode-20200412.1611/racket/commands/module-names.rkt b/elpa/racket-mode-20200417.1741/racket/commands/module-names.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/commands/module-names.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/module-names.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/commands/profile.rkt b/elpa/racket-mode-20200417.1741/racket/commands/profile.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/commands/profile.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/profile.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/commands/requires.rkt b/elpa/racket-mode-20200417.1741/racket/commands/requires.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/commands/requires.rkt rename to elpa/racket-mode-20200417.1741/racket/commands/requires.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/debug-annotator.rkt b/elpa/racket-mode-20200417.1741/racket/debug-annotator.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/debug-annotator.rkt rename to elpa/racket-mode-20200417.1741/racket/debug-annotator.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/debug.rkt b/elpa/racket-mode-20200417.1741/racket/debug.rkt similarity index 87% rename from elpa/racket-mode-20200412.1611/racket/debug.rkt rename to elpa/racket-mode-20200417.1741/racket/debug.rkt index f1d834e7..4357122a 100644 --- a/elpa/racket-mode-20200412.1611/racket/debug.rkt +++ b/elpa/racket-mode-20200417.1741/racket/debug.rkt @@ -10,7 +10,9 @@ racket/set syntax/modread "debug-annotator.rkt" + "elisp.rkt" "interactions.rkt" + "repl-session.rkt" "util.rkt") (module+ test @@ -91,6 +93,8 @@ (define pos (case before/after [(before) (syntax-position stx)] [(after) (+ (syntax-position stx) (syntax-span stx) -1)])) + (define max-width 128) + (define limit-marker "⋯") (define locals (for*/list ([binding (in-list (mark-bindings top-mark))] [stx (in-value (first binding))] @@ -100,7 +104,9 @@ (syntax-position stx) (syntax-span stx) (syntax->datum stx) - (~v (get/set!))))) + (~v #:max-width max-width + #:limit-marker limit-marker + (get/set!))))) ;; Start a debug repl on its own thread, because below we're going to ;; block indefinitely with (channel-get on-resume-channel), waiting for ;; the Emacs front end to issue a debug-resume command. @@ -114,8 +120,14 @@ ;; If it is not possible to round-trip serialize/deserialize the ;; values, use the original values when stepping (don't attempt to ;; substitute user-supplied values). - (define cannot-serialize "'cannot-serialize") - (define serialized-vals (if (serializable? vals) (~s vals) cannot-serialize)) + (define (maybe-serialized-vals) + (let ([str (~s vals)]) + (if (and (serializable? vals) + (<= (string-length str) max-width)) + (cons #t str) + (cons #f (~s #:max-width max-width + #:limit-marker limit-marker + vals))))) (channel-put on-break-channel (list 'debug-break (cons src pos) @@ -124,7 +136,7 @@ (cons this-break-id (case before/after [(before) (list 'before)] - [(after) (list 'after serialized-vals)])))) + [(after) (list 'after (maybe-serialized-vals))])))) ;; Wait for debug-resume command to put to on-resume-channel. If ;; wrong break ID, ignore and wait again. (let wait () @@ -133,11 +145,14 @@ [(list break-when (list (== this-break-id) 'before)) (next-break (calc-next-break before/after break-when top-mark ccm)) #f] - [(list break-when (list (== this-break-id) (or 'before 'after) vals-str)) + [(list break-when (list (== this-break-id) 'before new-vals-str)) (next-break (calc-next-break before/after break-when top-mark ccm)) - (if (equal? serialized-vals cannot-serialize) - vals - (read-str/default vals-str vals))] + (read-str/default new-vals-str vals)] + [(list break-when (list (== this-break-id) 'after new-vals-pair)) + (next-break (calc-next-break before/after break-when top-mark ccm)) + (match new-vals-pair + [(cons #t new-vals-str) (read-str/default new-vals-str vals)] + [(cons '() _) vals])] [_ (wait)]) (kill-thread repl-thread) (newline)))) @@ -210,9 +225,19 @@ (define ((make-prompt-read src pos top-mark)) (define-values (_base name _dir) (split-path src)) (define stx (get-interaction (format "[~a:~a]" name pos))) - (with-locals stx (mark-bindings top-mark))) + (call-with-session-context (current-session-id) + with-locals stx (mark-bindings top-mark))) (define (with-locals stx bindings) + ;; Before or during module->namespace -- i.e. during a racket-run -- + ;; current-namespace won't (can't) yet be a namespace with module + ;; body bindings. Indeed it might be from make-base-empty-namespace, + ;; and not even include racket/base bindings such as #%app. In that + ;; case make them available. That way the debug REPL at least can + ;; handle expressions involving local bindings. + (unless (member '#%app (namespace-mapped-symbols)) + (log-racket-mode-debug "debug prompt-read namespace-require racket/base") + (namespace-require 'racket/base)) ;; Note that mark-bindings is ordered from inner to outer scopes -- ;; and can include outer variables shadowed by inner ones. So use ;; only the first occurence of each identifier symbol we encounter. @@ -274,7 +299,7 @@ (define locals/c (listof (list/c path-string? pos/c pos/c symbol? string?))) (define break-vals/c (cons/c break-id/c (or/c (list/c 'before) - (list/c 'after string?)))) + (list/c 'after (cons/c boolean? string?))))) (define on-break/c (list/c 'debug-break break-when/c breakable-positions/c @@ -285,7 +310,7 @@ (define resume-vals/c (cons/c break-id/c (or/c (list/c 'before) (list/c 'before string?) - (list/c 'after string?)))) + (list/c 'after (cons/c elisp-bool/c string?))))) (define on-resume/c (list/c (or/c break-when/c 'out 'over) resume-vals/c)) (define/contract on-resume-channel (channel/c on-resume/c) (make-channel)) diff --git a/elpa/racket-mode-20200412.1611/racket/elisp.rkt b/elpa/racket-mode-20200417.1741/racket/elisp.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/elisp.rkt rename to elpa/racket-mode-20200417.1741/racket/elisp.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/error.rkt b/elpa/racket-mode-20200417.1741/racket/error.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/error.rkt rename to elpa/racket-mode-20200417.1741/racket/error.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/example/example.rkt b/elpa/racket-mode-20200417.1741/racket/example/example.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/example/example.rkt rename to elpa/racket-mode-20200417.1741/racket/example/example.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/example/example.rkt.faceup b/elpa/racket-mode-20200417.1741/racket/example/example.rkt.faceup similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/example/example.rkt.faceup rename to elpa/racket-mode-20200417.1741/racket/example/example.rkt.faceup diff --git a/elpa/racket-mode-20200412.1611/racket/example/indent.rkt b/elpa/racket-mode-20200417.1741/racket/example/indent.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/example/indent.rkt rename to elpa/racket-mode-20200417.1741/racket/example/indent.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/example/indent.rkt.faceup b/elpa/racket-mode-20200417.1741/racket/example/indent.rkt.faceup similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/example/indent.rkt.faceup rename to elpa/racket-mode-20200417.1741/racket/example/indent.rkt.faceup diff --git a/elpa/racket-mode-20200412.1611/racket/find-module-path-completions.rkt b/elpa/racket-mode-20200417.1741/racket/find-module-path-completions.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/find-module-path-completions.rkt rename to elpa/racket-mode-20200417.1741/racket/find-module-path-completions.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/find.rkt b/elpa/racket-mode-20200417.1741/racket/find.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/find.rkt rename to elpa/racket-mode-20200417.1741/racket/find.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/fresh-line.rkt b/elpa/racket-mode-20200417.1741/racket/fresh-line.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/fresh-line.rkt rename to elpa/racket-mode-20200417.1741/racket/fresh-line.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/gui.rkt b/elpa/racket-mode-20200417.1741/racket/gui.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/gui.rkt rename to elpa/racket-mode-20200417.1741/racket/gui.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/identifier.rkt b/elpa/racket-mode-20200417.1741/racket/identifier.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/identifier.rkt rename to elpa/racket-mode-20200417.1741/racket/identifier.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/image.rkt b/elpa/racket-mode-20200417.1741/racket/image.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/image.rkt rename to elpa/racket-mode-20200417.1741/racket/image.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/imports.rkt b/elpa/racket-mode-20200417.1741/racket/imports.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/imports.rkt rename to elpa/racket-mode-20200417.1741/racket/imports.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/instrument.rkt b/elpa/racket-mode-20200417.1741/racket/instrument.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/instrument.rkt rename to elpa/racket-mode-20200417.1741/racket/instrument.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/interactions.rkt b/elpa/racket-mode-20200417.1741/racket/interactions.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/interactions.rkt rename to elpa/racket-mode-20200417.1741/racket/interactions.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/keywords.rkt b/elpa/racket-mode-20200417.1741/racket/keywords.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/keywords.rkt rename to elpa/racket-mode-20200417.1741/racket/keywords.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/logger.rkt b/elpa/racket-mode-20200417.1741/racket/logger.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/logger.rkt rename to elpa/racket-mode-20200417.1741/racket/logger.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/main.rkt b/elpa/racket-mode-20200417.1741/racket/main.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/main.rkt rename to elpa/racket-mode-20200417.1741/racket/main.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/mod.rkt b/elpa/racket-mode-20200417.1741/racket/mod.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/mod.rkt rename to elpa/racket-mode-20200417.1741/racket/mod.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/print.rkt b/elpa/racket-mode-20200417.1741/racket/print.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/print.rkt rename to elpa/racket-mode-20200417.1741/racket/print.rkt diff --git a/elpa/racket-mode-20200417.1741/racket/repl-session.rkt b/elpa/racket-mode-20200417.1741/racket/repl-session.rkt new file mode 100644 index 00000000..6e940f71 --- /dev/null +++ b/elpa/racket-mode-20200417.1741/racket/repl-session.rkt @@ -0,0 +1,86 @@ +#lang at-exp racket/base + +(require racket/format + racket/match + "interactions.rkt" + "util.rkt") + +(provide next-session-id! + call-with-session-context + current-session-id + current-repl-msg-chan + current-session-maybe-mod + current-session-submit-pred + (struct-out session) + get-session + set-session! + remove-session!) + +;;; REPL session "housekeeping" + +;; Session IDs are strings based on a number +(define next-session-number 0) + +(define (next-session-id!) + (format "repl-session-~a" + (begin0 next-session-number + (inc! next-session-number)))) + +;; Each REPL session has an entry in this hash-table. +(define sessions (make-hash)) ;string? => (or/c base-session? session?) + +;; Before module->namespace has returned, this is what we have in the +;; `sessions` hash-table. Most importantly, knowing the repl thread +;; allows us to break-thread it even while module->namespace is still +;; running; see the command break-repl-thread, below. +(struct session + (thread ;thread? the repl manager thread + repl-msg-chan ;channel? + interaction-chan ;channel? + maybe-mod ;(or/c #f mod?) + namespace ;namespace? + submit-pred) ;(or/c #f drracket:submit-predicate/c) + #:transparent) + +(define current-session-id (make-parameter #f)) +(define current-repl-msg-chan (make-parameter #f)) +;current-interaction-chan defined in "interactions.rkt" +(define current-session-maybe-mod (make-parameter #f)) +(define current-session-submit-pred (make-parameter #f)) + +;; A way to parameterize e.g. commands that need to work with a +;; specific REPL session. Called from e.g. a command-server thread. +(define (call-with-session-context sid proc . args) + (match (get-session sid) + [(? session? s) + (log-racket-mode-debug @~a{(call-with-session-context @~v[sid] @~v[proc] @~v[args]) => @~v[s]}) + (parameterize ([current-session-id sid] + [current-repl-msg-chan (session-repl-msg-chan s)] + [current-interaction-chan (session-interaction-chan s)] + [current-session-maybe-mod (session-maybe-mod s)] + [current-namespace (session-namespace s)] + [current-session-submit-pred (session-submit-pred s)]) + (apply proc args))] + [_ + (if (equal? sid '()) + (log-racket-mode-debug @~a{(call-with-session-context @~v[sid] @~v[proc] @~v[args]): no specific session}) + (log-racket-mode-warning @~a{(call-with-session-context @~v[sid] @~v[proc] @~v[args]): @~v[sid] not found in @~v[sessions]})) + (apply proc args)])) + +(define (get-session sid) + (hash-ref sessions sid #f)) + +(define (set-session! sid maybe-mod repl-submit-predicate) + (hash-set! sessions + sid + (session (current-thread) + (current-repl-msg-chan) + (current-interaction-chan) + maybe-mod + (current-namespace) + repl-submit-predicate)) + (log-racket-mode-debug @~a{(set-session! @~v[sid] @~v[maybe-mod] @~v[repl-submit-predicate]) => sessions: @~v[sessions]})) + +(define (remove-session! sid) + (hash-remove! sessions sid) + (log-racket-mode-debug @~a{(remove-session! @~v[sid]) => sessions: @~v[sessions]})) diff --git a/elpa/racket-mode-20200412.1611/racket/repl.rkt b/elpa/racket-mode-20200417.1741/racket/repl.rkt similarity index 80% rename from elpa/racket-mode-20200412.1611/racket/repl.rkt rename to elpa/racket-mode-20200417.1741/racket/repl.rkt index 5029ce49..952a0c6b 100644 --- a/elpa/racket-mode-20200412.1611/racket/repl.rkt +++ b/elpa/racket-mode-20200417.1741/racket/repl.rkt @@ -13,48 +13,13 @@ "interactions.rkt" "mod.rkt" "print.rkt" + "repl-session.rkt" (only-in "syntax.rkt" with-expanded-syntax-caching-evaluator) "util.rkt") (provide start-repl-session-server run - call-with-session-context - break-repl-thread - current-session-id - current-session-maybe-mod - current-session-submit-pred) - -;;; REPL session "housekeeping" - -;; Session IDs are strings based on a number -(define next-session-number 0) - -;; Each REPL session has an entry in this hash-table. -(define sessions (make-hash)) ;string? => (or/c base-session? session?) - -;; Before module->namespace has returned, this is what we have in the -;; `sessions` hash-table. Most importantly, knowing the repl thread -;; allows us to break-thread it even while module->namespace is still -;; running; see the command break-repl-thread, below. -(struct base-session - (thread ;thread? the repl manager thread - repl-msg-chan ;channel? - interaction-chan ;channel? - maybe-mod) ;(or/c #f mod?) - #:transparent) - -;; After module->namespace has returned, we can update the `sessions` -;; hash-table to include more information. -(struct session base-session - (ns ;namespace? - submit-pred) ;(or/c #f drracket:submit-predicate/c) - #:transparent) - -(define current-session-id (make-parameter #f)) -(define current-repl-msg-chan (make-parameter #f)) -;current-interaction-chan defined in "interactions.rkt" -(define current-session-maybe-mod (make-parameter #f)) -(define current-session-submit-pred (make-parameter #f)) + break-repl-thread) ;;; Messages to each repl manager thread @@ -105,42 +70,11 @@ (set) ;debug-files ready-thunk)) -;;; Functionality provided for commands - -;; A way to parameterize commands that need to work with a specific -;; REPL session. Called from a command-server thread. -(define (call-with-session-context sid proc . args) - (match (hash-ref sessions sid #f) - [(and (session _thd msg-ch int-ch maybe-mod ns submit-pred) s) - (log-racket-mode-debug "call-with-session-context: ~v => ~v" - sid s) - (parameterize ([current-session-id sid] - [current-repl-msg-chan msg-ch] - [current-interaction-chan int-ch] - [current-session-maybe-mod maybe-mod] - [current-namespace ns] - [current-session-submit-pred submit-pred]) - (apply proc args))] - [(and (base-session _thd msg-ch int-ch maybe-mod) s) - (log-racket-mode-debug "call-with-session-context: ~v => ~v" - sid s) - (parameterize ([current-session-id sid] - [current-repl-msg-chan msg-ch] - [current-interaction-chan int-ch] - [current-session-maybe-mod maybe-mod]) - (apply proc args))] - [_ - (if (equal? sid '()) - (log-racket-mode-debug "call-with-session-context: no specific session") - (log-racket-mode-warning "call-with-session-context: ~v not found in ~v" - sid sessions)) - (apply proc args)])) - ;; Command. Called from a command-server thread (define/contract (break-repl-thread sid kind) (-> any/c (or/c 'break 'hang-up 'terminate) any) - (match (hash-ref sessions sid #f) - [(struct* base-session ([thread t])) + (match (get-session sid) + [(struct* session ([thread t])) (log-racket-mode-debug "break-repl-thread: ~v ~v" sid kind) (break-thread t (case kind [(hang-up terminate) kind] [else #f]))] [_ (log-racket-mode-error "break-repl-thread: ~v not in `sessions`" sid)])) @@ -181,8 +115,7 @@ (log-racket-mode-info "(our-exit-handler ~v) ~v" code (current-session-id)) (when (current-session-id) ;might exit before session created - (hash-remove! sessions (current-session-id)) - (log-racket-mode-debug "sessions: ~v" sessions)) + (remove-session! (current-session-id))) (custodian-shutdown-all custodian)) (parameterize ([exit-handler our-exit-handler]) (define-values (in out) (tcp-accept listener)) @@ -204,9 +137,7 @@ (accept-a-connection))) (define (repl-manager-thread-thunk) - (define session-id (format "repl-session-~a" - (begin0 next-session-number - (inc! next-session-number)))) + (define session-id (next-session-id!)) (log-racket-mode-info "start ~v" session-id) (parameterize* ([error-display-handler our-error-display-handler] [current-session-id session-id] ;before make-get-interaction @@ -290,12 +221,7 @@ (set-output-handlers) ;; 2. Record as much info about our session as we can, before ;; possibly entering module->namespace. - (hash-set! sessions - (current-session-id) - (base-session (current-thread) - (current-repl-msg-chan) - (current-interaction-chan) - maybe-mod)) + (set-session! (current-session-id) maybe-mod #f) ;; 3. If module, require and enter its namespace, etc. (with-expanded-syntax-caching-evaluator maybe-mod (when (and maybe-mod mod-path) @@ -324,18 +250,12 @@ (module->namespace mod-path))) (maybe-warn-about-submodules mod-path context-level) (check-#%top-interaction))))) - ;; 4. Record full information about our session, now that - ;; current-namespace is definitely the appropriate value, - ;; and it is OK to call get-repl-submit-predicate. - (hash-set! sessions - (current-session-id) - (session (current-thread) - (current-repl-msg-chan) - (current-interaction-chan) - maybe-mod - (current-namespace) - (get-repl-submit-predicate maybe-mod))) - (log-racket-mode-debug "sessions: ~v" sessions) + ;; 4. Update information about our session -- now that + ;; current-namespace is possibly updated, and, it is OK to + ;; call get-repl-submit-predicate. + (set-session! (current-session-id) + maybe-mod + (get-repl-submit-predicate maybe-mod)) ;; 5. Now that the program has run, and `sessions` is updated, ;; call the ready-thunk. On REPL startup this lets us wait ;; sending the repl-session-id until `sessions` is updated. diff --git a/elpa/racket-mode-20200412.1611/racket/scribble.rkt b/elpa/racket-mode-20200417.1741/racket/scribble.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/scribble.rkt rename to elpa/racket-mode-20200417.1741/racket/scribble.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/syntax.rkt b/elpa/racket-mode-20200417.1741/racket/syntax.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/syntax.rkt rename to elpa/racket-mode-20200417.1741/racket/syntax.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/test/find-examples.rkt b/elpa/racket-mode-20200417.1741/racket/test/find-examples.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/test/find-examples.rkt rename to elpa/racket-mode-20200417.1741/racket/test/find-examples.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/test/find.rkt b/elpa/racket-mode-20200417.1741/racket/test/find.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/test/find.rkt rename to elpa/racket-mode-20200417.1741/racket/test/find.rkt diff --git a/elpa/racket-mode-20200412.1611/racket/util.rkt b/elpa/racket-mode-20200417.1741/racket/util.rkt similarity index 100% rename from elpa/racket-mode-20200412.1611/racket/util.rkt rename to elpa/racket-mode-20200417.1741/racket/util.rkt diff --git a/elpa/web-mode-20200406.759/web-mode-pkg.el b/elpa/web-mode-20200406.759/web-mode-pkg.el deleted file mode 100644 index ff9275ab..00000000 --- a/elpa/web-mode-20200406.759/web-mode-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "web-mode" "20200406.759" "major mode for editing web templates" '((emacs "23.1")) :commit "98e02ff65b2f4c5cb24694aafc8fa6588648d743" :keywords '("languages") :authors '(("François-Xavier Bois ")) :maintainer '("François-Xavier Bois") :url "http://web-mode.org") diff --git a/elpa/web-mode-20200406.759/web-mode-autoloads.el b/elpa/web-mode-20200418.2218/web-mode-autoloads.el similarity index 100% rename from elpa/web-mode-20200406.759/web-mode-autoloads.el rename to elpa/web-mode-20200418.2218/web-mode-autoloads.el diff --git a/elpa/web-mode-20200418.2218/web-mode-pkg.el b/elpa/web-mode-20200418.2218/web-mode-pkg.el new file mode 100644 index 00000000..3ab73ceb --- /dev/null +++ b/elpa/web-mode-20200418.2218/web-mode-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "web-mode" "20200418.2218" "major mode for editing web templates" '((emacs "23.1")) :commit "a47585dfc69243eb0aa7e35fff5c19ad30351356" :keywords '("languages") :authors '(("François-Xavier Bois ")) :maintainer '("François-Xavier Bois") :url "http://web-mode.org") diff --git a/elpa/web-mode-20200406.759/web-mode.el b/elpa/web-mode-20200418.2218/web-mode.el similarity index 99% rename from elpa/web-mode-20200406.759/web-mode.el rename to elpa/web-mode-20200418.2218/web-mode.el index fe4f799c..d9728b41 100644 --- a/elpa/web-mode-20200406.759/web-mode.el +++ b/elpa/web-mode-20200418.2218/web-mode.el @@ -3,8 +3,8 @@ ;; Copyright 2011-2020 François-Xavier Bois -;; Version: 16.0.29 -;; Package-Version: 20200406.759 +;; Version: 16.0.31 +;; Package-Version: 20200418.2218 ;; Author: François-Xavier Bois ;; Maintainer: François-Xavier Bois ;; Package-Requires: ((emacs "23.1")) @@ -25,7 +25,7 @@ ;;---- CONSTS ------------------------------------------------------------------ -(defconst web-mode-version "16.0.29" +(defconst web-mode-version "16.0.31" "Web Mode version.") ;;---- GROUPS ------------------------------------------------------------------ @@ -207,6 +207,11 @@ See web-mode-block-face." :type 'boolean :group 'web-mode) +(defcustom web-mode-enable-literal-interpolation t + "Enable template literal fontification. e.g. css` `." + :type 'boolean + :group 'web-mode) + (defcustom web-mode-enable-sql-detection nil "Enable fontification and indentation of sql queries in strings." :type 'boolean @@ -331,7 +336,14 @@ See web-mode-block-face." :group 'web-mode) (defcustom web-mode-script-template-types - '("text/x-handlebars" "text/x-jquery-tmpl" "text/x-jsrender" "text/html" "text/ng-template" "text/x-template" "text/mustache" "text/x-dust-template") + '("text/x-handlebars" + "text/x-jquery-tmpl" + "text/x-jsrender" + "text/html" + "text/ng-template" + "text/x-template" + "text/mustache" + "text/x-dust-template") "