From da40bc345523349efbbcd9d83a7a9f73fc5ba58d Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcuskammer@users.noreply.gitlab.com> Date: Thu, 27 Feb 2020 21:10:34 +0100 Subject: [PATCH] Upgrade packages --- elpa/archives/gnu/archive-contents | 12 +- elpa/archives/gnu/archive-contents.signed | 2 +- .../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 | 2 +- .../magit-log.elc | Bin 98527 -> 98534 bytes .../magit-margin.el | 0 .../magit-margin.elc | Bin .../magit-merge.el | 0 .../magit-merge.elc | Bin .../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 | 12 +- .../magit-refs.elc | Bin 40221 -> 40348 bytes .../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 | 8 + .../magit-sequence.elc | Bin 52237 -> 52797 bytes .../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 | 0 .../magit-tag.elc | Bin .../magit-transient.el | 0 .../magit-transient.elc | Bin .../magit-utils.el | 0 .../magit-utils.elc | Bin .../magit-wip.el | 8 + .../magit-wip.elc | Bin 27271 -> 27556 bytes .../magit-worktree.el | 0 .../magit-worktree.elc | Bin .../magit.el | 0 .../magit.elc | Bin .../magit.info | 80 +++--- .../magit.info-1 | 2 +- .../magit.info-2 | 9 + .../data/stdlib-changes | 0 .../package-lint-autoloads.el | 0 .../package-lint-pkg.el | 2 +- .../package-lint.el | 24 +- .../package-lint.elc | Bin 39874 -> 40496 bytes .../dir | 0 .../transient-autoloads.el | 0 .../transient-pkg.el | 2 +- .../transient.el | 19 +- .../transient.elc | Bin 127031 -> 127025 bytes .../transient.info | 84 +++--- elpa/web-mode-20191104.1859/web-mode-pkg.el | 2 - .../web-mode-autoloads.el | 0 elpa/web-mode-20200227.906/web-mode-pkg.el | 2 + .../web-mode.el | 254 ++++++++++++++---- .../web-mode.elc | Bin 323431 -> 326216 bytes 116 files changed, 370 insertions(+), 156 deletions(-) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/AUTHORS.md (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/LICENSE (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/dir (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/git-rebase.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/git-rebase.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-apply.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-apply.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-autoloads.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-autorevert.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-autorevert.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-bisect.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-bisect.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-blame.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-blame.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-bookmark.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-bookmark.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-branch.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-branch.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-clone.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-clone.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-commit.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-commit.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-core.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-core.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-diff.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-diff.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-ediff.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-ediff.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-extras.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-extras.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-fetch.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-fetch.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-files.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-files.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-git.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-git.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-gitignore.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-gitignore.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-imenu.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-imenu.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-log.el (99%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-log.elc (96%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-margin.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-margin.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-merge.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-merge.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-mode.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-mode.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-notes.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-notes.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-obsolete.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-obsolete.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-patch.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-patch.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-pkg.el (79%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-process.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-process.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-pull.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-pull.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-push.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-push.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-reflog.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-reflog.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-refs.el (98%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-refs.elc (92%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-remote.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-remote.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-repos.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-repos.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-reset.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-reset.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-section.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-section.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-sequence.el (99%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-sequence.elc (93%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-stash.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-stash.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-status.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-status.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-submodule.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-submodule.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-subtree.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-subtree.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-tag.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-tag.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-transient.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-transient.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-utils.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-utils.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-wip.el (98%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-wip.elc (96%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-worktree.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit-worktree.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit.el (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit.elc (100%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit.info (79%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit.info-1 (99%) rename elpa/{magit-20200224.2301 => magit-20200226.1310}/magit.info-2 (99%) rename elpa/{package-lint-20200224.2227 => package-lint-20200226.2001}/data/stdlib-changes (100%) rename elpa/{package-lint-20200224.2227 => package-lint-20200226.2001}/package-lint-autoloads.el (100%) rename elpa/{package-lint-20200224.2227 => package-lint-20200226.2001}/package-lint-pkg.el (85%) rename elpa/{package-lint-20200224.2227 => package-lint-20200226.2001}/package-lint.el (98%) rename elpa/{package-lint-20200224.2227 => package-lint-20200226.2001}/package-lint.elc (88%) rename elpa/{transient-20200219.2113 => transient-20200226.1612}/dir (100%) rename elpa/{transient-20200219.2113 => transient-20200226.1612}/transient-autoloads.el (100%) rename elpa/{transient-20200219.2113 => transient-20200226.1612}/transient-pkg.el (80%) rename elpa/{transient-20200219.2113 => transient-20200226.1612}/transient.el (99%) rename elpa/{transient-20200219.2113 => transient-20200226.1612}/transient.elc (89%) rename elpa/{transient-20200219.2113 => transient-20200226.1612}/transient.info (98%) delete mode 100644 elpa/web-mode-20191104.1859/web-mode-pkg.el rename elpa/{web-mode-20191104.1859 => web-mode-20200227.906}/web-mode-autoloads.el (100%) create mode 100644 elpa/web-mode-20200227.906/web-mode-pkg.el rename elpa/{web-mode-20191104.1859 => web-mode-20200227.906}/web-mode.el (98%) rename elpa/{web-mode-20191104.1859 => web-mode-20200227.906}/web-mode.elc (76%) diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents index efa2b2e3..9855a3b0 100644 --- a/elpa/archives/gnu/archive-contents +++ b/elpa/archives/gnu/archive-contents @@ -736,6 +736,14 @@ (:authors ("Thomas Fitzsimmons" . "fitzsim@fitzsim.org")) (:keywords "calendar"))]) + (expand-region . + [(0 11 0) + nil "Increase selected region by semantic units." tar + ((:url . "https://github.com/magnars/expand-region.el") + (:maintainer "Magnar Sveen" . "magnars@gmail.com") + (:authors + ("Magnar Sveen" . "magnars@gmail.com")) + (:keywords "marking" "region"))]) (exwm . [(0 23) ((xelb @@ -1517,7 +1525,7 @@ ("Phillip Lord" . "phillip.lord@russet.org.uk")) (:url . "http://elpa.gnu.org/packages/persist.html"))]) (phps-mode . - [(0 3 37) + [(0 3 38) ((emacs (26))) "Major mode for PHP with Semantic integration" tar @@ -2012,7 +2020,7 @@ ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:keywords "convenience"))]) (tramp . - [(2 4 3 1) + [(2 4 3 2) ((emacs (24 4))) "Transparent Remote Access, Multiple Protocol" tar diff --git a/elpa/archives/gnu/archive-contents.signed b/elpa/archives/gnu/archive-contents.signed index 50c9b437..057c882c 100644 --- a/elpa/archives/gnu/archive-contents.signed +++ b/elpa/archives/gnu/archive-contents.signed @@ -1 +1 @@ -Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2020-02-25T11:05:02+0100 using RSA \ No newline at end of file +Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2020-02-27T11:05:02+0100 using RSA \ No newline at end of file diff --git a/elpa/magit-20200224.2301/AUTHORS.md b/elpa/magit-20200226.1310/AUTHORS.md similarity index 100% rename from elpa/magit-20200224.2301/AUTHORS.md rename to elpa/magit-20200226.1310/AUTHORS.md diff --git a/elpa/magit-20200224.2301/LICENSE b/elpa/magit-20200226.1310/LICENSE similarity index 100% rename from elpa/magit-20200224.2301/LICENSE rename to elpa/magit-20200226.1310/LICENSE diff --git a/elpa/magit-20200224.2301/dir b/elpa/magit-20200226.1310/dir similarity index 100% rename from elpa/magit-20200224.2301/dir rename to elpa/magit-20200226.1310/dir diff --git a/elpa/magit-20200224.2301/git-rebase.el b/elpa/magit-20200226.1310/git-rebase.el similarity index 100% rename from elpa/magit-20200224.2301/git-rebase.el rename to elpa/magit-20200226.1310/git-rebase.el diff --git a/elpa/magit-20200224.2301/git-rebase.elc b/elpa/magit-20200226.1310/git-rebase.elc similarity index 100% rename from elpa/magit-20200224.2301/git-rebase.elc rename to elpa/magit-20200226.1310/git-rebase.elc diff --git a/elpa/magit-20200224.2301/magit-apply.el b/elpa/magit-20200226.1310/magit-apply.el similarity index 100% rename from elpa/magit-20200224.2301/magit-apply.el rename to elpa/magit-20200226.1310/magit-apply.el diff --git a/elpa/magit-20200224.2301/magit-apply.elc b/elpa/magit-20200226.1310/magit-apply.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-apply.elc rename to elpa/magit-20200226.1310/magit-apply.elc diff --git a/elpa/magit-20200224.2301/magit-autoloads.el b/elpa/magit-20200226.1310/magit-autoloads.el similarity index 100% rename from elpa/magit-20200224.2301/magit-autoloads.el rename to elpa/magit-20200226.1310/magit-autoloads.el diff --git a/elpa/magit-20200224.2301/magit-autorevert.el b/elpa/magit-20200226.1310/magit-autorevert.el similarity index 100% rename from elpa/magit-20200224.2301/magit-autorevert.el rename to elpa/magit-20200226.1310/magit-autorevert.el diff --git a/elpa/magit-20200224.2301/magit-autorevert.elc b/elpa/magit-20200226.1310/magit-autorevert.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-autorevert.elc rename to elpa/magit-20200226.1310/magit-autorevert.elc diff --git a/elpa/magit-20200224.2301/magit-bisect.el b/elpa/magit-20200226.1310/magit-bisect.el similarity index 100% rename from elpa/magit-20200224.2301/magit-bisect.el rename to elpa/magit-20200226.1310/magit-bisect.el diff --git a/elpa/magit-20200224.2301/magit-bisect.elc b/elpa/magit-20200226.1310/magit-bisect.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-bisect.elc rename to elpa/magit-20200226.1310/magit-bisect.elc diff --git a/elpa/magit-20200224.2301/magit-blame.el b/elpa/magit-20200226.1310/magit-blame.el similarity index 100% rename from elpa/magit-20200224.2301/magit-blame.el rename to elpa/magit-20200226.1310/magit-blame.el diff --git a/elpa/magit-20200224.2301/magit-blame.elc b/elpa/magit-20200226.1310/magit-blame.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-blame.elc rename to elpa/magit-20200226.1310/magit-blame.elc diff --git a/elpa/magit-20200224.2301/magit-bookmark.el b/elpa/magit-20200226.1310/magit-bookmark.el similarity index 100% rename from elpa/magit-20200224.2301/magit-bookmark.el rename to elpa/magit-20200226.1310/magit-bookmark.el diff --git a/elpa/magit-20200224.2301/magit-bookmark.elc b/elpa/magit-20200226.1310/magit-bookmark.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-bookmark.elc rename to elpa/magit-20200226.1310/magit-bookmark.elc diff --git a/elpa/magit-20200224.2301/magit-branch.el b/elpa/magit-20200226.1310/magit-branch.el similarity index 100% rename from elpa/magit-20200224.2301/magit-branch.el rename to elpa/magit-20200226.1310/magit-branch.el diff --git a/elpa/magit-20200224.2301/magit-branch.elc b/elpa/magit-20200226.1310/magit-branch.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-branch.elc rename to elpa/magit-20200226.1310/magit-branch.elc diff --git a/elpa/magit-20200224.2301/magit-clone.el b/elpa/magit-20200226.1310/magit-clone.el similarity index 100% rename from elpa/magit-20200224.2301/magit-clone.el rename to elpa/magit-20200226.1310/magit-clone.el diff --git a/elpa/magit-20200224.2301/magit-clone.elc b/elpa/magit-20200226.1310/magit-clone.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-clone.elc rename to elpa/magit-20200226.1310/magit-clone.elc diff --git a/elpa/magit-20200224.2301/magit-commit.el b/elpa/magit-20200226.1310/magit-commit.el similarity index 100% rename from elpa/magit-20200224.2301/magit-commit.el rename to elpa/magit-20200226.1310/magit-commit.el diff --git a/elpa/magit-20200224.2301/magit-commit.elc b/elpa/magit-20200226.1310/magit-commit.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-commit.elc rename to elpa/magit-20200226.1310/magit-commit.elc diff --git a/elpa/magit-20200224.2301/magit-core.el b/elpa/magit-20200226.1310/magit-core.el similarity index 100% rename from elpa/magit-20200224.2301/magit-core.el rename to elpa/magit-20200226.1310/magit-core.el diff --git a/elpa/magit-20200224.2301/magit-core.elc b/elpa/magit-20200226.1310/magit-core.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-core.elc rename to elpa/magit-20200226.1310/magit-core.elc diff --git a/elpa/magit-20200224.2301/magit-diff.el b/elpa/magit-20200226.1310/magit-diff.el similarity index 100% rename from elpa/magit-20200224.2301/magit-diff.el rename to elpa/magit-20200226.1310/magit-diff.el diff --git a/elpa/magit-20200224.2301/magit-diff.elc b/elpa/magit-20200226.1310/magit-diff.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-diff.elc rename to elpa/magit-20200226.1310/magit-diff.elc diff --git a/elpa/magit-20200224.2301/magit-ediff.el b/elpa/magit-20200226.1310/magit-ediff.el similarity index 100% rename from elpa/magit-20200224.2301/magit-ediff.el rename to elpa/magit-20200226.1310/magit-ediff.el diff --git a/elpa/magit-20200224.2301/magit-ediff.elc b/elpa/magit-20200226.1310/magit-ediff.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-ediff.elc rename to elpa/magit-20200226.1310/magit-ediff.elc diff --git a/elpa/magit-20200224.2301/magit-extras.el b/elpa/magit-20200226.1310/magit-extras.el similarity index 100% rename from elpa/magit-20200224.2301/magit-extras.el rename to elpa/magit-20200226.1310/magit-extras.el diff --git a/elpa/magit-20200224.2301/magit-extras.elc b/elpa/magit-20200226.1310/magit-extras.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-extras.elc rename to elpa/magit-20200226.1310/magit-extras.elc diff --git a/elpa/magit-20200224.2301/magit-fetch.el b/elpa/magit-20200226.1310/magit-fetch.el similarity index 100% rename from elpa/magit-20200224.2301/magit-fetch.el rename to elpa/magit-20200226.1310/magit-fetch.el diff --git a/elpa/magit-20200224.2301/magit-fetch.elc b/elpa/magit-20200226.1310/magit-fetch.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-fetch.elc rename to elpa/magit-20200226.1310/magit-fetch.elc diff --git a/elpa/magit-20200224.2301/magit-files.el b/elpa/magit-20200226.1310/magit-files.el similarity index 100% rename from elpa/magit-20200224.2301/magit-files.el rename to elpa/magit-20200226.1310/magit-files.el diff --git a/elpa/magit-20200224.2301/magit-files.elc b/elpa/magit-20200226.1310/magit-files.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-files.elc rename to elpa/magit-20200226.1310/magit-files.elc diff --git a/elpa/magit-20200224.2301/magit-git.el b/elpa/magit-20200226.1310/magit-git.el similarity index 100% rename from elpa/magit-20200224.2301/magit-git.el rename to elpa/magit-20200226.1310/magit-git.el diff --git a/elpa/magit-20200224.2301/magit-git.elc b/elpa/magit-20200226.1310/magit-git.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-git.elc rename to elpa/magit-20200226.1310/magit-git.elc diff --git a/elpa/magit-20200224.2301/magit-gitignore.el b/elpa/magit-20200226.1310/magit-gitignore.el similarity index 100% rename from elpa/magit-20200224.2301/magit-gitignore.el rename to elpa/magit-20200226.1310/magit-gitignore.el diff --git a/elpa/magit-20200224.2301/magit-gitignore.elc b/elpa/magit-20200226.1310/magit-gitignore.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-gitignore.elc rename to elpa/magit-20200226.1310/magit-gitignore.elc diff --git a/elpa/magit-20200224.2301/magit-imenu.el b/elpa/magit-20200226.1310/magit-imenu.el similarity index 100% rename from elpa/magit-20200224.2301/magit-imenu.el rename to elpa/magit-20200226.1310/magit-imenu.el diff --git a/elpa/magit-20200224.2301/magit-imenu.elc b/elpa/magit-20200226.1310/magit-imenu.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-imenu.elc rename to elpa/magit-20200226.1310/magit-imenu.elc diff --git a/elpa/magit-20200224.2301/magit-log.el b/elpa/magit-20200226.1310/magit-log.el similarity index 99% rename from elpa/magit-20200224.2301/magit-log.el rename to elpa/magit-20200226.1310/magit-log.el index b4a8c71f..54e9b1c3 100644 --- a/elpa/magit-20200224.2301/magit-log.el +++ b/elpa/magit-20200226.1310/magit-log.el @@ -450,7 +450,7 @@ the upstream isn't ahead of the current branch) show." ("r" "current" magit-reflog-current) ("O" "other" magit-reflog-other) ("H" "HEAD" magit-reflog-head)] - [:if-non-nil magit-wip-mode + [:if magit--any-wip-mode-enabled-p :description "Wiplog" ("i" "index" magit-wip-log-index) ("w" "worktree" magit-wip-log-worktree)]]) diff --git a/elpa/magit-20200224.2301/magit-log.elc b/elpa/magit-20200226.1310/magit-log.elc similarity index 96% rename from elpa/magit-20200224.2301/magit-log.elc rename to elpa/magit-20200226.1310/magit-log.elc index 7148eb26cf2d7a229741e1f4e523f8dc0148e33d..bb11fc8c2fc2ac5342f09dd9fa32d76c48f4c19e 100644 GIT binary patch delta 765 zcmXw1ZAep580I~9xw&a2`29ICYqyx(?cTe)n?g$XBg3Tx{Rs=xITpH2an6*aF`@7) z!Z>>pNo&c>~raf4$r4_SK$hbk|!0WV9kuz}ZC}@BEoU4*1#;sQ7;1HB#(k zusH#cD&W$dRNNWLAi)`{U= zCPo<<)iDJj)=jS8>`p`uiCD(R0f`PWKk-p51!sja@WgEOo+OTP_h+W zJ8J|zoi#ym0;8U><`3!ibS8cr6=WQHvLGqX{6Ih-4v*551$>P{_AuzuV zT(*>=Ef+GDH@o4X9w}mUSCkY%5pzc03*gm*L;F_=nOcJrD00X&PX!sVtNQw~E0WEZvdN|5XYHw_sd-?)J%_Y&i58A!Eckf5}pp{WRY)JG{N-a{cxNa)z2L<9% zPkyZCA+JWFL|ShZM?0V!l@Ungn^8zq51Az)kt9Z1oo$VJI&)^`Kl7V2=R?%=Hfp-l zU6EcCJ{K+u2Se_LH$c4`^Z2;Di~BR@5W^z zJBc?=0O$4c`iKgdxFhn+s4Bd>5T}V5xUOl%D6_=mt+jcD6Ot+%Z_FXXEooqo)qfs5 z++rhNS|z}N<{Vsh{*B3_{Z$k7LWo0>LdM!&Alw*9C*4sKLZV8pT)b=IJb$WWkwC{R zAX&vi7v)q&gPZ+r$MdP(ot&=%xV$nNoRKpu@OOw1UNtl-;|tDK^F@vW)XNaS(!ekQpVKe-i& z3fXw-a);_ht4|P!z{rjdh?5y<~G# zI&Fh}sYurFqe3@s+m%NTXTbpgL614$IZ`EBl?@KY!|SdbaOvAzV59?1;H^lKZ$8ck z7Sa-UbiM#)%m!IbZi-G8Loq|4p9Bb+IiJSsfo!nrK^3N~K9%RKd8MN0(ck$Yn;z02 z1F?nB>b>yLjJz7n-4A~DnP|8i`YoI&Z>pVsh%@giKM09vN+n!HNLA_RQCKjuW}PSC ypv9(0eD#0zcha9V;6$9DNz`=)IxWd1>!W3mLFdBIpTd;2t#HbMWLckW2gh$IT=}m6 diff --git a/elpa/magit-20200224.2301/magit-margin.el b/elpa/magit-20200226.1310/magit-margin.el similarity index 100% rename from elpa/magit-20200224.2301/magit-margin.el rename to elpa/magit-20200226.1310/magit-margin.el diff --git a/elpa/magit-20200224.2301/magit-margin.elc b/elpa/magit-20200226.1310/magit-margin.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-margin.elc rename to elpa/magit-20200226.1310/magit-margin.elc diff --git a/elpa/magit-20200224.2301/magit-merge.el b/elpa/magit-20200226.1310/magit-merge.el similarity index 100% rename from elpa/magit-20200224.2301/magit-merge.el rename to elpa/magit-20200226.1310/magit-merge.el diff --git a/elpa/magit-20200224.2301/magit-merge.elc b/elpa/magit-20200226.1310/magit-merge.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-merge.elc rename to elpa/magit-20200226.1310/magit-merge.elc diff --git a/elpa/magit-20200224.2301/magit-mode.el b/elpa/magit-20200226.1310/magit-mode.el similarity index 100% rename from elpa/magit-20200224.2301/magit-mode.el rename to elpa/magit-20200226.1310/magit-mode.el diff --git a/elpa/magit-20200224.2301/magit-mode.elc b/elpa/magit-20200226.1310/magit-mode.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-mode.elc rename to elpa/magit-20200226.1310/magit-mode.elc diff --git a/elpa/magit-20200224.2301/magit-notes.el b/elpa/magit-20200226.1310/magit-notes.el similarity index 100% rename from elpa/magit-20200224.2301/magit-notes.el rename to elpa/magit-20200226.1310/magit-notes.el diff --git a/elpa/magit-20200224.2301/magit-notes.elc b/elpa/magit-20200226.1310/magit-notes.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-notes.elc rename to elpa/magit-20200226.1310/magit-notes.elc diff --git a/elpa/magit-20200224.2301/magit-obsolete.el b/elpa/magit-20200226.1310/magit-obsolete.el similarity index 100% rename from elpa/magit-20200224.2301/magit-obsolete.el rename to elpa/magit-20200226.1310/magit-obsolete.el diff --git a/elpa/magit-20200224.2301/magit-obsolete.elc b/elpa/magit-20200226.1310/magit-obsolete.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-obsolete.elc rename to elpa/magit-20200226.1310/magit-obsolete.elc diff --git a/elpa/magit-20200224.2301/magit-patch.el b/elpa/magit-20200226.1310/magit-patch.el similarity index 100% rename from elpa/magit-20200224.2301/magit-patch.el rename to elpa/magit-20200226.1310/magit-patch.el diff --git a/elpa/magit-20200224.2301/magit-patch.elc b/elpa/magit-20200226.1310/magit-patch.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-patch.elc rename to elpa/magit-20200226.1310/magit-patch.elc diff --git a/elpa/magit-20200224.2301/magit-pkg.el b/elpa/magit-20200226.1310/magit-pkg.el similarity index 79% rename from elpa/magit-20200224.2301/magit-pkg.el rename to elpa/magit-20200226.1310/magit-pkg.el index 45b57c9d..ce34dcc6 100644 --- a/elpa/magit-20200224.2301/magit-pkg.el +++ b/elpa/magit-20200226.1310/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20200224.2301" "A Git porcelain inside Emacs." +(define-package "magit" "20200226.1310" "A Git porcelain inside Emacs." '((emacs "25.1") (async "20180527") (dash "20180910") diff --git a/elpa/magit-20200224.2301/magit-process.el b/elpa/magit-20200226.1310/magit-process.el similarity index 100% rename from elpa/magit-20200224.2301/magit-process.el rename to elpa/magit-20200226.1310/magit-process.el diff --git a/elpa/magit-20200224.2301/magit-process.elc b/elpa/magit-20200226.1310/magit-process.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-process.elc rename to elpa/magit-20200226.1310/magit-process.elc diff --git a/elpa/magit-20200224.2301/magit-pull.el b/elpa/magit-20200226.1310/magit-pull.el similarity index 100% rename from elpa/magit-20200224.2301/magit-pull.el rename to elpa/magit-20200226.1310/magit-pull.el diff --git a/elpa/magit-20200224.2301/magit-pull.elc b/elpa/magit-20200226.1310/magit-pull.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-pull.elc rename to elpa/magit-20200226.1310/magit-pull.elc diff --git a/elpa/magit-20200224.2301/magit-push.el b/elpa/magit-20200226.1310/magit-push.el similarity index 100% rename from elpa/magit-20200224.2301/magit-push.el rename to elpa/magit-20200226.1310/magit-push.el diff --git a/elpa/magit-20200224.2301/magit-push.elc b/elpa/magit-20200226.1310/magit-push.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-push.elc rename to elpa/magit-20200226.1310/magit-push.elc diff --git a/elpa/magit-20200224.2301/magit-reflog.el b/elpa/magit-20200226.1310/magit-reflog.el similarity index 100% rename from elpa/magit-20200224.2301/magit-reflog.el rename to elpa/magit-20200226.1310/magit-reflog.el diff --git a/elpa/magit-20200224.2301/magit-reflog.elc b/elpa/magit-20200226.1310/magit-reflog.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-reflog.elc rename to elpa/magit-20200226.1310/magit-reflog.elc diff --git a/elpa/magit-20200224.2301/magit-refs.el b/elpa/magit-20200226.1310/magit-refs.el similarity index 98% rename from elpa/magit-20200224.2301/magit-refs.el rename to elpa/magit-20200226.1310/magit-refs.el index 3c3b24db..34304a65 100644 --- a/elpa/magit-20200224.2301/magit-refs.el +++ b/elpa/magit-20200226.1310/magit-refs.el @@ -330,7 +330,8 @@ Type \\[magit-reset] to reset `HEAD' to the commit at point. (define-transient-command magit-show-refs (&optional transient) "List and compare references in a dedicated buffer." :man-page "git-branch" - :value 'magit-show-refs-arguments + :value (lambda () + (magit-show-refs-arguments magit-prefix-use-buffer-arguments)) ["Arguments" (magit-for-each-ref:--contains) ("=m" "Merged" "--merged=" magit-transient-read-revision) @@ -350,18 +351,19 @@ Type \\[magit-reset] to reset `HEAD' to the commit at point. (transient-setup 'magit-show-refs) (magit-refs-setup-buffer "HEAD" (magit-show-refs-arguments)))) -(defun magit-show-refs-arguments () +(defun magit-show-refs-arguments (&optional use-buffer-args) + (unless use-buffer-args + (setq use-buffer-args magit-direct-use-buffer-arguments)) (let (args) (cond ((eq current-transient-command 'magit-show-refs) (setq args (transient-args 'magit-show-refs))) ((eq major-mode 'magit-refs-mode) (setq args magit-buffer-arguments)) - ((and (memq magit-prefix-use-buffer-arguments '(always selected)) + ((and (memq use-buffer-args '(always selected)) (when-let ((buffer (magit-get-mode-buffer 'magit-refs-mode nil - (eq magit-prefix-use-buffer-arguments - 'selected)))) + (eq use-buffer-args 'selected)))) (setq args (buffer-local-value 'magit-buffer-arguments buffer)) t))) (t diff --git a/elpa/magit-20200224.2301/magit-refs.elc b/elpa/magit-20200226.1310/magit-refs.elc similarity index 92% rename from elpa/magit-20200224.2301/magit-refs.elc rename to elpa/magit-20200226.1310/magit-refs.elc index 63ddf833b05399ad2cce97b0e0498f095be955f7..dbea0e4de2a19a9a345add68db0f0749c3781d31 100644 GIT binary patch delta 500 zcmYk1&ubGw6vuaWV%%e2H+<*4-m0Dm8w8g! zPN;u6V?>v5!)&A_^SM6hu@(EI`tb-3=efW^P+sfcv)$gH-R-R2$BVaXmCK81TDw&- z2mF-j)dTabKC*+u29pXb8Kqz-jyitE6mua$j=-a4VamrHD0SXKYOXTEYEIV4I3>Rq zvXV3Up8`0gb2(WBlCpd+cPv1`XT!f?@}e^h0|5&6GB`mo4|@5}NYu`oM-e4Ln(ER|q&cnN&DEI|W3Wp{D delta 399 zcmYj~J4gdT5QcNRNsLCZ&_WS0CWT%h?CbXSz$8`)h)J|lb0PsBr0^9*Y{W-l@Kvpf zLPR^kO4v?83#*XER>aQUQVS9H1i@yQnQy*-DtF-g7Tl~QEdF!H%V`Hs1^e&bbR*O^9k)FB2Y;mQpG(EFyHv9nh Ch;)ts diff --git a/elpa/magit-20200224.2301/magit-remote.el b/elpa/magit-20200226.1310/magit-remote.el similarity index 100% rename from elpa/magit-20200224.2301/magit-remote.el rename to elpa/magit-20200226.1310/magit-remote.el diff --git a/elpa/magit-20200224.2301/magit-remote.elc b/elpa/magit-20200226.1310/magit-remote.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-remote.elc rename to elpa/magit-20200226.1310/magit-remote.elc diff --git a/elpa/magit-20200224.2301/magit-repos.el b/elpa/magit-20200226.1310/magit-repos.el similarity index 100% rename from elpa/magit-20200224.2301/magit-repos.el rename to elpa/magit-20200226.1310/magit-repos.el diff --git a/elpa/magit-20200224.2301/magit-repos.elc b/elpa/magit-20200226.1310/magit-repos.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-repos.elc rename to elpa/magit-20200226.1310/magit-repos.elc diff --git a/elpa/magit-20200224.2301/magit-reset.el b/elpa/magit-20200226.1310/magit-reset.el similarity index 100% rename from elpa/magit-20200224.2301/magit-reset.el rename to elpa/magit-20200226.1310/magit-reset.el diff --git a/elpa/magit-20200224.2301/magit-reset.elc b/elpa/magit-20200226.1310/magit-reset.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-reset.elc rename to elpa/magit-20200226.1310/magit-reset.elc diff --git a/elpa/magit-20200224.2301/magit-section.el b/elpa/magit-20200226.1310/magit-section.el similarity index 100% rename from elpa/magit-20200224.2301/magit-section.el rename to elpa/magit-20200226.1310/magit-section.el diff --git a/elpa/magit-20200224.2301/magit-section.elc b/elpa/magit-20200226.1310/magit-section.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-section.elc rename to elpa/magit-20200226.1310/magit-section.elc diff --git a/elpa/magit-20200224.2301/magit-sequence.el b/elpa/magit-20200226.1310/magit-sequence.el similarity index 99% rename from elpa/magit-20200224.2301/magit-sequence.el rename to elpa/magit-20200226.1310/magit-sequence.el index e5b82cb3..e7e8e24c 100644 --- a/elpa/magit-20200224.2301/magit-sequence.el +++ b/elpa/magit-20200226.1310/magit-sequence.el @@ -507,6 +507,7 @@ This discards all changes made since the sequence started." ("-A" "Autostash" "--autostash") ("-i" "Interactive" ("-i" "--interactive")) ("-h" "Disable hooks" "--no-verify") + (7 magit-rebase:--exec) (5 magit:--gpg-sign) (5 "-r" "Rebase merges" "--rebase-merges=" magit-rebase-merges-select-mode)] [:if-not magit-rebase-in-progress-p @@ -533,6 +534,13 @@ This discards all changes made since the sequence started." ("e" "Edit" magit-rebase-edit) ("a" "Abort" magit-rebase-abort)]) +(define-infix-argument magit-rebase:--exec () + :description "Run command after commits" + :class 'transient-option + :shortarg "-x" + :argument "--exec=" + :reader #'read-shell-command) + (defun magit-rebase-merges-select-mode (&rest _ignore) (magit-read-char-case nil t (?n "[n]o-rebase-cousins" "no-rebase-cousins") diff --git a/elpa/magit-20200224.2301/magit-sequence.elc b/elpa/magit-20200226.1310/magit-sequence.elc similarity index 93% rename from elpa/magit-20200224.2301/magit-sequence.elc rename to elpa/magit-20200226.1310/magit-sequence.elc index c667482cab3f17683d300432affac24f2c6c37a8..cb7b0835d98561b56c59da031edb637b66161d36 100644 GIT binary patch delta 470 zcmX|5OK1~O6y?1)nIuA#LIb53I)qXzG%)YIc{48s7rO9+LRVQR#%7#ONwuvpX*D4z z;wRuAyv255S0cFZ({h(Zg+l8>P|&ptUAQq7T!a5=nhrK8?B zq$ZNESzL~}S`HTBna|WVYWWE@ zJ;zfWz8i0!>4_OyXbF`d3-@|6P_Lx%Z{?OjT^nx9&QVuE-}xU*+j;oiC}8M5p##KUu&38t0ABa1@`swFlaze&)%#Qo1#siC;$&|XpS`spq_ iy1cl9YK`Ak`YCli?0WUnWO?aga_x)BxXt1F+rEFc=A**^ delta 347 zcmW-Zy-Pw-7>Bv%T)%>-K_kpQ2q6u@d+x_M-oYV)Xsg8`sK~;Iq9GenRBY%&h$wj@ z9g2d6YzgI^iV|tat)ac8e;^8K%x-SK2cGBmct#J)wCayR_jnlhV^Ie-<|ias6AFV? z!2{DZ2SnFg5MHR+n5qTm;BARPPrO7_1By8}HoR{9 zTCET}H<{69A3m)2+GHVA4K5SIaOCZWO45U&%>$VzI^1oY5XFS4)F)MS69U;7meZ4x ztQdkpH6B4<#wk(7OQIT& z;PYPG8m0lGh1dW7w~*?jIv1EeZ8@nh1!gWnPNE9Dxo$d%CNNojBC^g^2EMuhAGckY h#q$oLsn}Qd6T%pdHNNdM5>e1>zT2sy8!+%P_y;+9c1i#M diff --git a/elpa/magit-20200224.2301/magit-stash.el b/elpa/magit-20200226.1310/magit-stash.el similarity index 100% rename from elpa/magit-20200224.2301/magit-stash.el rename to elpa/magit-20200226.1310/magit-stash.el diff --git a/elpa/magit-20200224.2301/magit-stash.elc b/elpa/magit-20200226.1310/magit-stash.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-stash.elc rename to elpa/magit-20200226.1310/magit-stash.elc diff --git a/elpa/magit-20200224.2301/magit-status.el b/elpa/magit-20200226.1310/magit-status.el similarity index 100% rename from elpa/magit-20200224.2301/magit-status.el rename to elpa/magit-20200226.1310/magit-status.el diff --git a/elpa/magit-20200224.2301/magit-status.elc b/elpa/magit-20200226.1310/magit-status.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-status.elc rename to elpa/magit-20200226.1310/magit-status.elc diff --git a/elpa/magit-20200224.2301/magit-submodule.el b/elpa/magit-20200226.1310/magit-submodule.el similarity index 100% rename from elpa/magit-20200224.2301/magit-submodule.el rename to elpa/magit-20200226.1310/magit-submodule.el diff --git a/elpa/magit-20200224.2301/magit-submodule.elc b/elpa/magit-20200226.1310/magit-submodule.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-submodule.elc rename to elpa/magit-20200226.1310/magit-submodule.elc diff --git a/elpa/magit-20200224.2301/magit-subtree.el b/elpa/magit-20200226.1310/magit-subtree.el similarity index 100% rename from elpa/magit-20200224.2301/magit-subtree.el rename to elpa/magit-20200226.1310/magit-subtree.el diff --git a/elpa/magit-20200224.2301/magit-subtree.elc b/elpa/magit-20200226.1310/magit-subtree.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-subtree.elc rename to elpa/magit-20200226.1310/magit-subtree.elc diff --git a/elpa/magit-20200224.2301/magit-tag.el b/elpa/magit-20200226.1310/magit-tag.el similarity index 100% rename from elpa/magit-20200224.2301/magit-tag.el rename to elpa/magit-20200226.1310/magit-tag.el diff --git a/elpa/magit-20200224.2301/magit-tag.elc b/elpa/magit-20200226.1310/magit-tag.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-tag.elc rename to elpa/magit-20200226.1310/magit-tag.elc diff --git a/elpa/magit-20200224.2301/magit-transient.el b/elpa/magit-20200226.1310/magit-transient.el similarity index 100% rename from elpa/magit-20200224.2301/magit-transient.el rename to elpa/magit-20200226.1310/magit-transient.el diff --git a/elpa/magit-20200224.2301/magit-transient.elc b/elpa/magit-20200226.1310/magit-transient.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-transient.elc rename to elpa/magit-20200226.1310/magit-transient.elc diff --git a/elpa/magit-20200224.2301/magit-utils.el b/elpa/magit-20200226.1310/magit-utils.el similarity index 100% rename from elpa/magit-20200224.2301/magit-utils.el rename to elpa/magit-20200226.1310/magit-utils.el diff --git a/elpa/magit-20200224.2301/magit-utils.elc b/elpa/magit-20200226.1310/magit-utils.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-utils.elc rename to elpa/magit-20200226.1310/magit-utils.elc diff --git a/elpa/magit-20200224.2301/magit-wip.el b/elpa/magit-20200226.1310/magit-wip.el similarity index 98% rename from elpa/magit-20200224.2301/magit-wip.el rename to elpa/magit-20200226.1310/magit-wip.el index d9fb2ebc..b24f93cf 100644 --- a/elpa/magit-20200224.2301/magit-wip.el +++ b/elpa/magit-20200226.1310/magit-wip.el @@ -227,6 +227,14 @@ command which is about to be called are committed." (add-hook 'before-save-hook 'magit-wip-commit-initial-backup) (remove-hook 'before-save-hook 'magit-wip-commit-initial-backup))) +(defun magit--any-wip-mode-enabled-p () + "Return non-nil if any global wip mode is enabled." + (or magit-wip-mode + magit-wip-after-save-mode + magit-wip-after-apply-mode + magit-wip-before-change-mode + magit-wip-initial-backup-mode)) + (defvar-local magit-wip-buffer-backed-up nil) (put 'magit-wip-buffer-backed-up 'permanent-local t) diff --git a/elpa/magit-20200224.2301/magit-wip.elc b/elpa/magit-20200226.1310/magit-wip.elc similarity index 96% rename from elpa/magit-20200224.2301/magit-wip.elc rename to elpa/magit-20200226.1310/magit-wip.elc index 0ac840889250dd0d60c2128893071c82224be173..7a8b86fd7bc2d320d6c38882f2e8717564098864 100644 GIT binary patch delta 300 zcmZp_%DCh@;|4izGi3);LxrH!lG36)g}nSc-Mq{kh0HXC#Joy{^ql;p#2kh4%mRhn z{FGFM%wmPqyu_rO)D*qR6ZwQ~bb*R=fwHp^929LjLc?c z#+%Cms~MS%EDbh)35sB2HZ?Zb>>s(BnZ?-9)O>Pag5+lLSQSPV6C)F&$@X#8%qB*L zK-zTjr#LreQxo&e*73qXW6X^=2PSkfF`F2eP2QI*Gx=xIA!aip)6M&ma~YW}Obs{d arKU468=F{co{@fuiN)N|)NFEImLvdB6I!EH|$Wc+ALbY;Li6a!@rRvw?x>X2FmMHfAFe z)6F?itC`u1EX<8GV<#6%i*GiGQ(inHg=4NDyXZ zHMX#TDsE3KU}82jGMs!nMP{;C${}WB6NAmSQ*s%ZP0h?Ud#9x{F&a#s7$ma!c*X%H N7BdTT!^z#*k^p2NGNb?i diff --git a/elpa/magit-20200224.2301/magit-worktree.el b/elpa/magit-20200226.1310/magit-worktree.el similarity index 100% rename from elpa/magit-20200224.2301/magit-worktree.el rename to elpa/magit-20200226.1310/magit-worktree.el diff --git a/elpa/magit-20200224.2301/magit-worktree.elc b/elpa/magit-20200226.1310/magit-worktree.elc similarity index 100% rename from elpa/magit-20200224.2301/magit-worktree.elc rename to elpa/magit-20200226.1310/magit-worktree.elc diff --git a/elpa/magit-20200224.2301/magit.el b/elpa/magit-20200226.1310/magit.el similarity index 100% rename from elpa/magit-20200224.2301/magit.el rename to elpa/magit-20200226.1310/magit.el diff --git a/elpa/magit-20200224.2301/magit.elc b/elpa/magit-20200226.1310/magit.elc similarity index 100% rename from elpa/magit-20200224.2301/magit.elc rename to elpa/magit-20200226.1310/magit.elc diff --git a/elpa/magit-20200224.2301/magit.info b/elpa/magit-20200226.1310/magit.info similarity index 79% rename from elpa/magit-20200224.2301/magit.info rename to elpa/magit-20200226.1310/magit.info index 0b515dd9..8a8b2da5 100644 --- a/elpa/magit-20200224.2301/magit.info +++ b/elpa/magit-20200226.1310/magit.info @@ -144,46 +144,46 @@ Node: Per-Repository Configuration322787 Node: Essential Settings325042 Node: Safety325366 Node: Performance327127 -Node: Microsoft Windows Performance334188 -Node: MacOS Performance335379 -Ref: MacOS Performance-Footnote-1336084 -Node: Plumbing336166 -Node: Calling Git336995 -Node: Getting a Value from Git338520 -Node: Calling Git for Effect341606 -Node: Section Plumbing348126 -Node: Creating Sections348354 -Node: Section Selection352254 -Node: Matching Sections354053 -Node: Refreshing Buffers360026 -Node: Conventions363174 -Node: Theming Faces363366 -Node: FAQ371481 -Node: FAQ - How to ...?371923 -Node: How to show git's output?372283 -Node: How to install the gitman info manual?373037 -Node: How to show diffs for gpg-encrypted files?374007 -Node: How does branching and pushing work?374603 -Node: Can Magit be used as ediff-version-control-package?374966 -Node: FAQ - Issues and Errors376955 -Node: Magit is slow377887 -Node: I changed several thousand files at once and now Magit is unusable378101 -Node: I am having problems committing378830 -Node: I am using MS Windows and cannot push with Magit379311 -Node: I am using OS X and SOMETHING works in shell but not in Magit379928 -Node: Diffs contain control sequences380734 -Node: Expanding a file to show the diff causes it to disappear381847 -Node: Point is wrong in the COMMIT_EDITMSG buffer382398 -Node: The mode-line information isn't always up-to-date383444 -Node: A branch and tag sharing the same name breaks SOMETHING384526 -Node: My Git hooks work on the command-line but not inside Magit385414 -Node: git-commit-mode isn't used when committing from the command-line386260 -Node: Point ends up inside invisible text when jumping to a file-visiting buffer388527 -Node: Debugging Tools389325 -Node: Keystroke Index391504 -Node: Command Index425488 -Node: Function Index462513 -Node: Variable Index478865 +Node: Microsoft Windows Performance334765 +Node: MacOS Performance335956 +Ref: MacOS Performance-Footnote-1336661 +Node: Plumbing336743 +Node: Calling Git337572 +Node: Getting a Value from Git339097 +Node: Calling Git for Effect342183 +Node: Section Plumbing348703 +Node: Creating Sections348931 +Node: Section Selection352831 +Node: Matching Sections354630 +Node: Refreshing Buffers360603 +Node: Conventions363751 +Node: Theming Faces363943 +Node: FAQ372058 +Node: FAQ - How to ...?372500 +Node: How to show git's output?372860 +Node: How to install the gitman info manual?373614 +Node: How to show diffs for gpg-encrypted files?374584 +Node: How does branching and pushing work?375180 +Node: Can Magit be used as ediff-version-control-package?375543 +Node: FAQ - Issues and Errors377532 +Node: Magit is slow378464 +Node: I changed several thousand files at once and now Magit is unusable378678 +Node: I am having problems committing379407 +Node: I am using MS Windows and cannot push with Magit379888 +Node: I am using OS X and SOMETHING works in shell but not in Magit380505 +Node: Diffs contain control sequences381311 +Node: Expanding a file to show the diff causes it to disappear382424 +Node: Point is wrong in the COMMIT_EDITMSG buffer382975 +Node: The mode-line information isn't always up-to-date384021 +Node: A branch and tag sharing the same name breaks SOMETHING385103 +Node: My Git hooks work on the command-line but not inside Magit385991 +Node: git-commit-mode isn't used when committing from the command-line386837 +Node: Point ends up inside invisible text when jumping to a file-visiting buffer389104 +Node: Debugging Tools389902 +Node: Keystroke Index392081 +Node: Command Index426065 +Node: Function Index463090 +Node: Variable Index479442  End Tag Table diff --git a/elpa/magit-20200224.2301/magit.info-1 b/elpa/magit-20200226.1310/magit.info-1 similarity index 99% rename from elpa/magit-20200224.2301/magit.info-1 rename to elpa/magit-20200226.1310/magit.info-1 index f6f7de09..094bb214 100644 --- a/elpa/magit-20200224.2301/magit.info-1 +++ b/elpa/magit-20200226.1310/magit.info-1 @@ -31,7 +31,7 @@ to perform almost all of their daily version control tasks directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. -This manual is for Magit version 2.90.1 (v2.90.1-900-g14c70a5ac+1). +This manual is for Magit version 2.90.1 (v2.90.1-930-ge3b4ed55e+1). Copyright (C) 2015-2020 Jonas Bernoulli diff --git a/elpa/magit-20200224.2301/magit.info-2 b/elpa/magit-20200226.1310/magit.info-2 similarity index 99% rename from elpa/magit-20200224.2301/magit.info-2 rename to elpa/magit-20200226.1310/magit.info-2 index 326359e8..2c98504d 100644 --- a/elpa/magit-20200224.2301/magit.info-2 +++ b/elpa/magit-20200226.1310/magit.info-2 @@ -770,6 +770,15 @@ using ‘magit-revision-mode’ takes considerably more time than looking at the same commit in ‘magit-diff-mode’, then consider setting ‘magit-revision-insert-related-refs’ to ‘nil’. + When you are often confronted with diffs that contain deleted files, +then you might want to enable the ‘--irreversible-delete’ argument. If +you do that then diffs still show that a file was deleted but without +also showing the complete deleted content of the file. This argument is +not available by default, see *note (transient)Enabling and Disabling +Suffixes::. Once you have done that you should enable it and save that +setting, see *note (transient)Saving Values::. You should do this in +both the diff (‘d’) and the diff refresh (‘D’) transient popups. + Refs Buffer Performance ....................... diff --git a/elpa/package-lint-20200224.2227/data/stdlib-changes b/elpa/package-lint-20200226.2001/data/stdlib-changes similarity index 100% rename from elpa/package-lint-20200224.2227/data/stdlib-changes rename to elpa/package-lint-20200226.2001/data/stdlib-changes diff --git a/elpa/package-lint-20200224.2227/package-lint-autoloads.el b/elpa/package-lint-20200226.2001/package-lint-autoloads.el similarity index 100% rename from elpa/package-lint-20200224.2227/package-lint-autoloads.el rename to elpa/package-lint-20200226.2001/package-lint-autoloads.el diff --git a/elpa/package-lint-20200224.2227/package-lint-pkg.el b/elpa/package-lint-20200226.2001/package-lint-pkg.el similarity index 85% rename from elpa/package-lint-20200224.2227/package-lint-pkg.el rename to elpa/package-lint-20200226.2001/package-lint-pkg.el index 00686cdc..d5f2846b 100644 --- a/elpa/package-lint-20200224.2227/package-lint-pkg.el +++ b/elpa/package-lint-20200226.2001/package-lint-pkg.el @@ -1,4 +1,4 @@ -(define-package "package-lint" "20200224.2227" "A linting library for elisp package authors" +(define-package "package-lint" "20200226.2001" "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-20200224.2227/package-lint.el b/elpa/package-lint-20200226.2001/package-lint.el similarity index 98% rename from elpa/package-lint-20200224.2227/package-lint.el rename to elpa/package-lint-20200226.2001/package-lint.el index ceea5e91..71f630b8 100644 --- a/elpa/package-lint-20200224.2227/package-lint.el +++ b/elpa/package-lint-20200226.2001/package-lint.el @@ -120,7 +120,13 @@ published in ELPA for use by older Emacsen.") (removed-functions (let-alist (cdr version-data) .functions.removed))) (cons version (package-lint--match-symbols removed-functions)))) stdlib-changes) - "An alist of function/macro names and when they were removed from Emacs."))) + "An alist of function/macro names and when they were removed from Emacs.") + + (defun package-lint--added-or-removed-function-p (sym) + "Predicate that returns t if SYM is a function added/removed in any known emacs version." + (cl-some (lambda (x) (funcall (cdr x) sym)) + (append package-lint--functions-and-macros-added-alist + package-lint--functions-and-macros-removed-alist))))) (defconst package-lint--sane-prefixes (rx @@ -753,11 +759,17 @@ Valid definition names are: "Verify that symbol DEFINITIONS start with package PREFIX." (pcase-dolist (`(,name . ,position) definitions) (unless (package-lint--valid-definition-name-p name prefix position) - (package-lint--error-at-point - 'error - (format "\"%s\" doesn't start with package's prefix \"%s\"." - name prefix) - position)))) + (if (package-lint--added-or-removed-function-p (intern name)) + (package-lint--error-at-point + 'error + (format "Define compatibility functions with a prefix, e.g. \"%s--%s\", and use `defalias' where they exist." + prefix name) + position) + (package-lint--error-at-point + 'error + (format "\"%s\" doesn't start with package's prefix \"%s\"." + name prefix) + position))))) (defun package-lint--check-minor-mode (def) "Offer up concerns about the minor mode definition DEF." diff --git a/elpa/package-lint-20200224.2227/package-lint.elc b/elpa/package-lint-20200226.2001/package-lint.elc similarity index 88% rename from elpa/package-lint-20200224.2227/package-lint.elc rename to elpa/package-lint-20200226.2001/package-lint.elc index 82ba6cd1bce77a0319c5413f228356487b806462..653ea59e3263c65a847c04fa90991d81141a1570 100644 GIT binary patch delta 1260 zcmaJ=No*WN6s4E(l6ay>2_&%09+7AfZ&n~KENN_L2%*lyG!+d z{d&LNd!K!%UR+WyUTaKp&T^a^7(ADPKN^oF*&ZD?%Ov&lOQBsI7=qN%5+HlvX_s@lwXT*jBGB!wHQN!OBdyNG;m$D$@o0|s`c70oiKoZj`D z=Hh>>^()6Wzd3sCd+X@%?c^vn&DM9~i4cvUiRlzO(2Zc@kLFysbk2GCSF&1B_lUJNR@_Wy(4E(Vc&oXMA1=0ZEwd7 z-c#TBk3<_bCpzlIs8GbdcHrN6TW`n}u|WP%%*sznds6@BgdmLlS}3oUdI|^pVi5Wy zUny6;I2a8|K|K49EF&@<#N(*bY7NU~dWfGL%aUBGGsY$=CDh${@vrW?(w;6Ol znpe@OmH`Wo&7e4J2a=~zJe(n8Gjm&!O%xkEcg9h46hDJ6=C9z2TaH|O@>g^ehqF&T zuj(eXIkcWVhb;^j-hF0|qNCzDeEsaOs#}6H;4d6gkYi-~+>0h!iKAS;eCcvRcR1Q* q;k=Iy5?sLQYi}#<0=-1*1MaQXDpNthCtX!9KjDq}nG*7o-t;$-D|XNT delta 794 zcmXw%OGs5w6o%X9?2C^~BP|e(5-Yowu=hUunLP(4J;*F5Gb_sMaXw*O&RFkZngiuheTQ*pn!}-_V=l}k-28M!>C&9q?49Ljb z5`*#F91=?A;Ah^_EE;KJ{gT3wkVPCO3gaXc!ujH&FQLL`PVrl+jdt*%czZy#vl3R# z8za;xYoMg$HwhVvrKJS{wF{_=CFO=LrUVo2TgGTmjs3kep z+NtAO;_-ZVv#~J15F-D1)7cnz#xXctvyaT+&I$SNM~0_6{iT{YkX4(B-8O=PtsODS ztWt2L?gyr*IrP?VM80%NU2 zkZP@&-+kyNDfjOavwdDm_N-&*-r{tn zaG)=|#y2Ci&+Hx#1?Mo?-4jqL6^HJNm(yc5P}H-CP^D0;>a7c?vbePUmv<1VCC2pY zio%sNn6tU|B1VnjcJM|ME~4cElDF=Yk_a(u8h&x>kyLwff7AT3*1e6*dlO9+2a_$w H;@N)y9o6bo diff --git a/elpa/transient-20200219.2113/dir b/elpa/transient-20200226.1612/dir similarity index 100% rename from elpa/transient-20200219.2113/dir rename to elpa/transient-20200226.1612/dir diff --git a/elpa/transient-20200219.2113/transient-autoloads.el b/elpa/transient-20200226.1612/transient-autoloads.el similarity index 100% rename from elpa/transient-20200219.2113/transient-autoloads.el rename to elpa/transient-20200226.1612/transient-autoloads.el diff --git a/elpa/transient-20200219.2113/transient-pkg.el b/elpa/transient-20200226.1612/transient-pkg.el similarity index 80% rename from elpa/transient-20200219.2113/transient-pkg.el rename to elpa/transient-20200226.1612/transient-pkg.el index 15a51ed0..e506c580 100644 --- a/elpa/transient-20200219.2113/transient-pkg.el +++ b/elpa/transient-20200226.1612/transient-pkg.el @@ -1,4 +1,4 @@ -(define-package "transient" "20200219.2113" "Transient commands" +(define-package "transient" "20200226.1612" "Transient commands" '((emacs "25.1")) :keywords '("bindings") diff --git a/elpa/transient-20200219.2113/transient.el b/elpa/transient-20200226.1612/transient.el similarity index 99% rename from elpa/transient-20200219.2113/transient.el rename to elpa/transient-20200226.1612/transient.el index 54ff80d6..4c7367d2 100644 --- a/elpa/transient-20200219.2113/transient.el +++ b/elpa/transient-20200226.1612/transient.el @@ -1082,7 +1082,7 @@ variable instead.") (defvar transient--layout nil) (defvar transient--suffixes nil) -(defconst transient--stay t "Do not exist the transient.") +(defconst transient--stay t "Do not exit the transient.") (defconst transient--exit nil "Do exit the transient.") (defvar transient--exitp nil "Whether to exit the transient.") @@ -1994,10 +1994,13 @@ transient is active." (let ((keys (this-single-command-raw-keys))) (and (lookup-key transient--transient-map keys) (string-to-number - (transient--read-number-N - (format "Set level for `%s': " - (transient--suffix-command command)) - nil nil (not (eq command prefix)))))))))) + (let ((transient--active-infix + (transient-suffix-object))) + (transient--show) + (transient--read-number-N + (format "Set level for `%s': " + (transient--suffix-command command)) + nil nil (not (eq command prefix))))))))))) (cond ((not command) (setq transient--editp t) @@ -2647,8 +2650,10 @@ making `transient--original-buffer' current.") (let ((str (cl-call-next-method obj))) (when (eq obj transient--active-infix) (setq str (concat str "\n")) - (add-face-text-property 0 (length str) - 'transient-active-infix nil str)) + (add-face-text-property + (if (eq this-command 'transient-set-level) 3 0) + (length str) + 'transient-active-infix nil str)) str)) (cl-defmethod transient-format :around ((obj transient-suffix)) diff --git a/elpa/transient-20200219.2113/transient.elc b/elpa/transient-20200226.1612/transient.elc similarity index 89% rename from elpa/transient-20200219.2113/transient.elc rename to elpa/transient-20200226.1612/transient.elc index 1cd149c981e7df77fe88b3aba0a327abb31d6ae6..2b97687ac12b4ebdf2fdeff3b4b50bc5a315c99c 100644 GIT binary patch delta 2107 zcmYk7dvMjo6~{Td_mKzWfx$5f)87qJz0klueor(cwJ4zIz&J9Hxe+2 z$HMIp7mJ6*&ozBz_pLpMxBOx*)aQGa`Q7==`R=&kxgnC^Q4s2vkH8$2 zezs1LUtOd!2wvEAf=>1$mhH$^&1`c$uKM@Rh(Ft1OQ;_(^?JLbcI0QqckJyTM7rv= z_Ka<-l|wc07ehHh1i!2qc;O=;EV|tO-ESHQ6}}fwyr>BcyeR&`OBaC%H{SN!Q;-NE zDdSZKwgKT>oqYADG>C+H;NV~)j9eZ!yvDJEsYS1Et>!^_cifNE-a`vj?IA@ym#e`; zr)l5^@uP=tg`^ur5m$dWvLYe8Y*y_&)}UKvL0T;tUR)763pY504MjCRJVy-=*HyDH zYmX~jXQARF*QkrbP1Fmeaz<{azUQlrBdcj3ef9RpZ8XGVJEKbp7pgGYo?;O?t2Dnl zJGz~6*H!D^SWSh?)X_I$DrFS+zxgNJyQkWZT(?9x7Z6#%480+_c zNYP>O)njMTaen;ycq^b6Slss4N=R_=<+#p?PpgyC{qj_C;oQsE>1R9CKhDk8Pc=f7 zT66yMB#$J|>b9NGs5bs5sRsaR;wS$3S?XZ~$*;gFD6=?q65__{vEo>Sld%v_wb)*d zJtb+GMkcSbQe^G2QgScXG}Ribaaef-_pd-h;FPLrw8{lIOdzmQ@ahb`3mN7N8v=6o z+AWkC5)C-BK#GNr1@|I?R62tYGZfh%lTyqo&9@5YlX8kx;j%ab6YXlr#m5>f=fwv* z3w>SrLa}+%#&w;=yt?a>H}z{{@20L|b6>tU{_&*`k~CzV=_RmIqcGk4cP50D7z3UOn_)Y_#e!(p!Fd2lKa_Zt{cmPe|Ei3h&0w0o zhQl7p7}G~NJdK2fdcA-_ikGA7B4E+rRn*>o4QSa7bKlq=xZYnf!3ESGXhMH9+6 zvy|~_Qi8ynk6duf%3M0rv38v@Tga&7$P^Ed7?!HY5rnM-TNtqiMSZ zl9hIq9*x*?-aJpeIfKC`WpsP;@(5B!=?H{!ZsBYaAE zX@YO)x0bbebG{E%W?nzQtofO;SMhCGW?vQSc4@D`E&09?oyj~K zTUXmZpDe-}J;+&dmKr+SsCx#XW^!?TS07$sPfurIo&Me+%$W9dsP*NG&864Ik><%k z`0z^HqObd3fgfQ`^YDzNElQI+0DDrzb#>Jd*hhqC@JU)s$XCg$ZCBb{I||=Q0@urr z!!J>3E*ytv2ymm{f`1Y8Vql(l8+?kEkw3y#z;D~Ta2SXin&f+Mz#0ypf*O1jFin=< zf``sPg*pFcC=!t7zP~^lkRZ~}pMibA^vW@KhXkH(9)}YIZ|jS3m|@qOF#+Rg61q=* f45tak?wOC_JxJKMQVk7H(;xmFt}qjyz@6|vv}t^4 delta 2139 zcmcIl{c}~t8Rk8Eb8jw@1cH)@IOW^~3KyGXKh7s6D5I6(!vg-04$Mt4!l?;f@^vpx z1EUf8L#v_!JL67=v5GV*j8)_5bcdmlB41YM6lJUw1(KBMICW%VOIzDahrWAL=wHwu zcK7VF&%V3wyU+Wcp^=mxN$qL`KGf9ra`QSMInLOU9QSxxjyv4Uazao9{2Zrz86<8J zl9L3F;~vUe<(DtlLaR*eTlifDIYC9P4soX!zl8x<2|#n4iXKDYmSK^4bC`uzDR$KB zH++swU~_VHCGZIYy76=S8eyQmu%M&8(9uwAe>fl6h0d*!&Fx}TDB4kP-tLP^izS#f zx;N&9>pa#`a>nyGQXQ9~eNQCA)qt5Pz_|hvswG!x97(Y4a0dbrlKJ@BYLVS;_o4Dm%Rhlr5#;ZQtPSB0` zqswEE_VF>M*589}ULX5L{ORcJfIjp1>#;OIAbU^O#I;whRhU@E)5p(Zgo13FJTSg6 zuKY_m;2~7V%>LWeEdVp)rGNcra-ba5=iSitoGCc-XP`}F_Hy96Xuoe!&s&zLUy zumWWnxaz$CT2cLho*lwZ&`-vcUIZ^;@(8u|E;xcDPt9(I9hfhEsP;9(PNWM(Ti`MD z)>8*sU>k9KU(H_(&!jynvUXQzzD>>;zfGTA3>iWK$J5uAz(#Ap^}VdU;Nkva)Ucs@ zV`SGEX*+4`++3Zhv|fvm53pc~-7I9riecTP#@Ci*N zo}+fHhDKf63qzH}rw&S}R{v=LD(20tnT(B~Y_<6I}SuYkK$Z;BOYeC)7`U1Rg=;*B?Va z;JD}$I0lyM=Z&hcKY*v>tMCN;2Lfn})&Kwi diff --git a/elpa/transient-20200219.2113/transient.info b/elpa/transient-20200226.1612/transient.info similarity index 98% rename from elpa/transient-20200219.2113/transient.info rename to elpa/transient-20200226.1612/transient.info index fde56c44..ce283861 100644 --- a/elpa/transient-20200219.2113/transient.info +++ b/elpa/transient-20200226.1612/transient.info @@ -44,7 +44,7 @@ reading a new value in the minibuffer. Calling a suffix command usually causes the transient to be exited but suffix commands can also be configured to not exit the transient. -This manual is for Transient version 0.1.0 (v0.1.0-141-g5c0f901+1). +This manual is for Transient version 0.2.0. Copyright (C) 2018-2020 Jonas Bernoulli @@ -712,7 +712,7 @@ File: transient.info, Node: Other Options, Next: Modifying Existing Transients This function is called with one argument, the prefix object, and must return a key binding description, either the existing key - description it finds in the ‘key’ slot, or key description that + description it finds in the ‘key’ slot, or the key description that replaces the prefix key. It could be used to make other substitutions, but that is discouraged. @@ -2392,46 +2392,46 @@ Appendix E Variable Index  Tag Table: Node: Top751 -Node: Introduction3675 -Node: Usage9462 -Node: Invoking Transients9796 -Node: Aborting and Resuming Transients10828 -Node: Common Suffix Commands13487 -Node: Saving Values15241 -Ref: Saving Values-Footnote-116499 -Node: Using History16769 -Node: Getting Help for Suffix Commands18310 -Node: Enabling and Disabling Suffixes19703 -Node: Other Commands22993 -Node: Other Options23949 -Node: Modifying Existing Transients31069 -Node: Defining New Commands34473 -Node: Defining Transients34809 -Node: Binding Suffix and Infix Commands37241 -Node: Group Specifications38096 -Node: Suffix Specifications41429 -Node: Defining Suffix and Infix Commands44996 -Node: Using Infix Arguments48181 -Node: Transient State50401 -Node: Classes and Methods56274 -Node: Group Classes58488 -Node: Group Methods60405 -Node: Prefix Classes61050 -Node: Suffix Classes62142 -Node: Suffix Methods64386 -Node: Suffix Value Methods64707 -Node: Suffix Format Methods67467 -Node: Prefix Slots68919 -Node: Suffix Slots71396 -Node: Predicate Slots74247 -Node: Related Abstractions and Packages75495 -Node: Comparison With Prefix Keys and Prefix Arguments75782 -Node: Comparison With Other Packages86094 -Node: FAQ90285 -Node: Keystroke Index94019 -Node: Command Index95653 -Node: Function Index97440 -Node: Variable Index101597 +Node: Introduction3651 +Node: Usage9438 +Node: Invoking Transients9772 +Node: Aborting and Resuming Transients10804 +Node: Common Suffix Commands13463 +Node: Saving Values15217 +Ref: Saving Values-Footnote-116475 +Node: Using History16745 +Node: Getting Help for Suffix Commands18286 +Node: Enabling and Disabling Suffixes19679 +Node: Other Commands22969 +Node: Other Options23925 +Node: Modifying Existing Transients31049 +Node: Defining New Commands34453 +Node: Defining Transients34789 +Node: Binding Suffix and Infix Commands37221 +Node: Group Specifications38076 +Node: Suffix Specifications41409 +Node: Defining Suffix and Infix Commands44976 +Node: Using Infix Arguments48161 +Node: Transient State50381 +Node: Classes and Methods56254 +Node: Group Classes58468 +Node: Group Methods60385 +Node: Prefix Classes61030 +Node: Suffix Classes62122 +Node: Suffix Methods64366 +Node: Suffix Value Methods64687 +Node: Suffix Format Methods67447 +Node: Prefix Slots68899 +Node: Suffix Slots71376 +Node: Predicate Slots74227 +Node: Related Abstractions and Packages75475 +Node: Comparison With Prefix Keys and Prefix Arguments75762 +Node: Comparison With Other Packages86074 +Node: FAQ90265 +Node: Keystroke Index93999 +Node: Command Index95633 +Node: Function Index97420 +Node: Variable Index101577  End Tag Table diff --git a/elpa/web-mode-20191104.1859/web-mode-pkg.el b/elpa/web-mode-20191104.1859/web-mode-pkg.el deleted file mode 100644 index 0180f7eb..00000000 --- a/elpa/web-mode-20191104.1859/web-mode-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "web-mode" "20191104.1859" "major mode for editing web templates" '((emacs "23.1")) :commit "cd000fcfce97152f8b831b7eef4ea0d0b1eed11a" :keywords '("languages") :authors '(("François-Xavier Bois ")) :maintainer '("François-Xavier Bois") :url "http://web-mode.org") diff --git a/elpa/web-mode-20191104.1859/web-mode-autoloads.el b/elpa/web-mode-20200227.906/web-mode-autoloads.el similarity index 100% rename from elpa/web-mode-20191104.1859/web-mode-autoloads.el rename to elpa/web-mode-20200227.906/web-mode-autoloads.el diff --git a/elpa/web-mode-20200227.906/web-mode-pkg.el b/elpa/web-mode-20200227.906/web-mode-pkg.el new file mode 100644 index 00000000..821296e3 --- /dev/null +++ b/elpa/web-mode-20200227.906/web-mode-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "web-mode" "20200227.906" "major mode for editing web templates" '((emacs "23.1")) :commit "81df6b55765f587915e1f958352fc050af0aef2c" :keywords '("languages") :authors '(("François-Xavier Bois ")) :maintainer '("François-Xavier Bois") :url "http://web-mode.org") diff --git a/elpa/web-mode-20191104.1859/web-mode.el b/elpa/web-mode-20200227.906/web-mode.el similarity index 98% rename from elpa/web-mode-20191104.1859/web-mode.el rename to elpa/web-mode-20200227.906/web-mode.el index 80020f55..dbae2a3d 100644 --- a/elpa/web-mode-20191104.1859/web-mode.el +++ b/elpa/web-mode-20200227.906/web-mode.el @@ -1,10 +1,10 @@ ;;; web-mode.el --- major mode for editing web templates ;;; -*- coding: utf-8; lexical-binding: t; -*- -;; Copyright 2011-2019 François-Xavier Bois +;; Copyright 2011-2020 François-Xavier Bois -;; Version: 16.0.25 -;; Package-Version: 20191104.1859 +;; Version: 16.0.26 +;; Package-Version: 20200227.906 ;; 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.25" +(defconst web-mode-version "16.0.26" "Web Mode version.") ;;---- GROUPS ------------------------------------------------------------------ @@ -752,7 +752,7 @@ Must be used in conjunction with web-mode-enable-block-face." (defvar web-mode-comments-invisible nil) (defvar web-mode-content-type "") (defvar web-mode-engine nil) -(defvar web-mode-engine-attr-regexp nil) +;;(defvar web-mode-engine-attr-regexp nil) (defvar web-mode-engine-font-lock-keywords nil) (defvar web-mode-engine-token-regexp nil) (defvar web-mode-expand-initial-pos nil) @@ -787,7 +787,8 @@ Must be used in conjunction with web-mode-enable-block-face." "link" "meta" "param" "source" "track" "wbr")) (defvar web-mode-part-content-types - '("css" "javascript" "json" "jsx" "markdown" "pug" "ruby" "sql" "stylus")) + '("css" "javascript" "json" "jsx" "markdown" "pug" "ruby" + "sass" "sql" "stylus" "typescript")) (defvar web-mode-javascript-languages '("javascript" "jsx" "ejs")) @@ -846,6 +847,7 @@ Must be used in conjunction with web-mode-enable-block-face." ("ejs" . ()) ("elixir" . ("phoenix")) ("erb" . ("eruby" "erubis")) + ("expressionengine" . ("ee")) ("freemarker" . ()) ("go" . ("gtl" "hugo")) ("hero" . ()) @@ -888,6 +890,10 @@ Must be used in conjunction with web-mode-enable-block-face." ("vue" . "v-")) "Engine custom attributes") +(defvar web-mode-engine-attr-regexp + "^ng[-]\\|^th[:]\\|^v[-]\\|^[@:#(\[*]" + "Engine custom attributes") + (defvar web-mode-last-enabled-feature nil) (defvar web-mode-features @@ -904,7 +910,7 @@ Must be used in conjunction with web-mode-enable-block-face." (defvar web-mode-engine-file-regexps '(("angular" . "\\.component.html\\'") ("archibus" . "\\.axvw\\'") - ;;("artanis" . "\\.tpl\\'") // conflict with smarty, see below + ("artanis" . "\\.html\\.tpl\\'") ("asp" . "\\.asp\\'") ("aspx" . "\\.as[cp]x\\'") ("blade" . "\\.blade\\.php\\'") @@ -917,6 +923,7 @@ Must be used in conjunction with web-mode-enable-block-face." ("elixir" . "\\.l?eex\\'") ("ejs" . "\\.ejs\\'") ("erb" . "\\.\\(erb\\|rhtml\\|erb\\.html\\)\\'") + ("expressionengine" . "\\.ee\\'") ("freemarker" . "\\.ftl\\'") ("go" . "\\.go\\(html\\|tmpl\\)\\'") ("handlebars" . "\\.\\(hb\\.html\\|hbs\\)\\'") @@ -1262,6 +1269,7 @@ Must be used in conjunction with web-mode-enable-block-face." '("elixir" . "<%") '("ejs" . "<%") '("erb" . "<%\\|^%.") + '("expressionengine" . "{.") '("freemarker" . "<%\\|${\\|<+^]?" delim-close "/?}") ) @@ -3065,7 +3105,7 @@ another auto-completion with different ac-sources (e.g. ac-php)") ((string= sub2 "{!") (setq closing-string "!}")) (t - (setq closing-string '("{". "}") ;;closing-string "}" + (setq closing-string '("{". "}") delim-open "{[#/:?@><+^]?" delim-close "/?}") ) @@ -3620,7 +3660,8 @@ another auto-completion with different ac-sources (e.g. ac-php)") ;;(message "reg-beg(%S) reg-end(%S) delim-open(%S) delim-close(%S)" reg-beg reg-end delim-open delim-close) (when (member web-mode-engine '("artanis" "asp" "aspx" "cl-emb" "clip" "closure" "ctemplate" "django" "dust" - "elixir" "ejs" "erb" "freemarker" "go" "hero" "jsp" "lsp" "mako" "mason" "mojolicious" + "elixir" "ejs" "erb" "expressionengine" "freemarker" "go" "hero" "jsp" "lsp" + "mako" "mason" "mojolicious" "smarty" "template-toolkit" "web2py" "xoops" "svelte")) (save-excursion (when delim-open @@ -3875,7 +3916,7 @@ another auto-completion with different ac-sources (e.g. ac-php)") ) ;underscore ((string= web-mode-engine "angular") - ) ;angular + (setq regexp "#\\|\"\\|'")) ;angular ((string= web-mode-engine "vue") ) ;vue @@ -3912,6 +3953,14 @@ another auto-completion with different ac-sources (e.g. ac-php)") ) ) ;dust + ((string= web-mode-engine "expressionengine") + (cond + ((string= sub2 "{!") + (setq token-type 'comment)) + (t + (setq regexp "\"\\|'"))) + ) ;expressionengine + ((string= web-mode-engine "closure") (cond ((member sub2 '("/*" "//")) @@ -4224,6 +4273,18 @@ another auto-completion with different ac-sources (e.g. ac-php)") ) ) ;smarty + ((string= web-mode-engine "expressionengine") + (cond + ((and (eq (char-after (1+ reg-beg)) ?\/) + (web-mode-block-starts-with "\\(if\\)" reg-beg)) + (setq controls (append controls (list (cons 'close (match-string-no-properties 1)))))) + ((web-mode-block-starts-with "\\(if:else\\|if:ifelse\\)" reg-beg) + (setq controls (append controls (list (cons 'inside "if"))))) + ((web-mode-block-starts-with "\\(if\\)") + (setq controls (append controls (list (cons 'open (match-string-no-properties 1)))))) + ) + ) ;expressionengine + ((string= web-mode-engine "xoops") (cond ((and (eq (char-after (+ reg-beg 2)) ?\/) @@ -4568,7 +4629,7 @@ another auto-completion with different ac-sources (e.g. ac-php)") ) ;cond engine (put-text-property reg-beg (1+ reg-beg) 'block-controls controls) - ;; (message "(%S) controls=%S" reg-beg controls) + ;;(message "(%S) controls=%S" reg-beg controls) ))) @@ -4666,17 +4727,14 @@ another auto-completion with different ac-sources (e.g. ac-php)") ((and (null close-expr) (looking-at "[ ]\\(class\\|id\\|href\\|style\\)=\"[[:alnum:]_=:/?;#. -]*\">")) - ;;(message "scan-elements: %S %S" (point) (match-string-no-properties 0)) (let ((beg (1+ (point))) (end (+ (point) (length (match-string-no-properties 0))))) - ;;(message "beg=%S end=%S" beg end) (setq flags (logior flags 17) tend end) (put-text-property beg (1+ beg) 'tag-attr-beg 0) (put-text-property beg (1- end) 'tag-attr t) (put-text-property (- end 2) (1- end) 'tag-attr-end (length (match-string-no-properties 1))) ) ;let - ;;(message "tend=%S" tend) ) ((null close-expr) @@ -4684,8 +4742,10 @@ another auto-completion with different ac-sources (e.g. ac-php)") (when (> (logand flags 8) 0) (setq props (plist-put props 'tag-type 'void))) (setq tend (point))) + ((web-mode-dom-sf close-expr limit t) (setq tend (point))) + (t (setq tend (line-end-position))) @@ -4699,6 +4759,8 @@ another auto-completion with different ac-sources (e.g. ac-php)") (cond ((string-match-p " lang[ ]*=[ ]*[\"']stylus" style) (setq element-content-type "stylus")) + ((string-match-p " lang[ ]*=[ ]*[\"']sass" style) + (setq element-content-type "sass")) (t (setq element-content-type "css")) ) ;cond @@ -4720,6 +4782,8 @@ another auto-completion with different ac-sources (e.g. ac-php)") part-close-tag nil)) ((string-match-p " type[ ]*=[ ]*[\"']application/\\(ld\\+json\\|json\\)" script) (setq element-content-type "json")) + ((string-match-p " lang[ ]*=[ ]*[\"']\\(typescript\\|ts\\)" script) + (setq element-content-type "typescript")) (t (setq element-content-type "javascript")) ) ;cond @@ -4785,7 +4849,9 @@ another auto-completion with different ac-sources (e.g. ac-php)") (setq pos (point) char (char-after) - spaced (eq char ?\s)) + ;;spaced (eq char ?\s) + spaced (member char '(?\s ?\n)) + ) (when quoted (setq quoted (1+ quoted))) @@ -4850,7 +4916,8 @@ another auto-completion with different ac-sources (e.g. ac-php)") ) ((and (eq ?\= char) (member state '(2 3))) - (setq equal-offset (- pos name-beg)) + (setq equal-offset (- pos name-beg) + name-end (1- pos)) (setq state 4) (setq attr (buffer-substring-no-properties name-beg (1+ name-end))) (when (and web-mode-indentless-attributes (member (downcase attr) web-mode-indentless-attributes)) @@ -4966,21 +5033,20 @@ another auto-completion with different ac-sources (e.g. ac-php)") (setq state 2) ) + ;;((= state 2) ((= state 2) (setq name-end pos) - (when (and (= attr-flags 0) (member char '(?\- ?\:))) + (when (and nil (= attr-flags 0) (member char '(?\- ?\:))) (let (attr) (setq attr (buffer-substring-no-properties name-beg (1+ name-end))) (cond ((member attr '("http-equiv")) (setq attr-flags (1- attr-flags)) ) - ((and web-mode-engine-attr-regexp - (string-match-p web-mode-engine-attr-regexp attr)) - ;;(message "%S: %S" pos web-mode-engine-attr-regexp) - (setq attr-flags (logior attr-flags 2)) - ;;(setq attr-flags (1- attr-flags)) - ) + ;;((and web-mode-engine-attr-regexp + ;; (string-match-p web-mode-engine-attr-regexp attr)) + ;; (setq attr-flags (logior attr-flags 2)) + ;; ) ((and (eq char ?\-) (not (string= attr "http-"))) (setq attr-flags (logior attr-flags 1))) ) ;cond @@ -5006,12 +5072,27 @@ another auto-completion with different ac-sources (e.g. ac-php)") tag-flags)) (defun web-mode-attr-scan (state char name-beg name-end val-beg flags equal-offset) -;; (message "point(%S) state(%S) c(%c) name-beg(%S) name-end(%S) val-beg(%S) flags(%S) equal-offset(%S)" -;; (point) state char name-beg name-end val-beg flags equal-offset) - (if (null flags) (setq flags 0)) + (message "point(%S) state(%S) c(%c) name-beg(%S) name-end(%S) val-beg(%S) flags(%S) equal-offset(%S)" + (point) state char name-beg name-end val-beg flags equal-offset) + (when (null flags) (setq flags 0)) + (when (and name-beg name-end web-mode-engine-attr-regexp) + (let (name) + (setq name (buffer-substring-no-properties name-beg (1+ name-end))) + (message "%S" name) + (cond + ((string-match-p "^data[-]" name) + (setq flags (logior flags 1)) + ) + ((string-match-p web-mode-engine-attr-regexp name) + (setq flags (logior flags 2)) + ) + ) + ) ;name + ) + ;;(message "%S" name) (cond ((null name-beg) -;; (message "name-beg is null (%S)" (point)) + ;; (message "name-beg is null (%S)" (point)) 0) ((or (and (= state 8) (not (eq ?\" char))) (and (= state 7) (not (eq ?\' char)))) @@ -6399,12 +6480,16 @@ another auto-completion with different ac-sources (e.g. ac-php)") (web-mode-fontify-region reg-beg reg-end web-mode-sql-font-lock-keywords)) ((string= content-type "stylus") (web-mode-fontify-region reg-beg reg-end web-mode-stylus-font-lock-keywords)) + ((string= content-type "sass") + (web-mode-fontify-region reg-beg reg-end web-mode-sass-font-lock-keywords)) ((string= content-type "pug") (web-mode-fontify-region reg-beg reg-end web-mode-pug-font-lock-keywords)) ((string= content-type "markdown") (web-mode-fontify-region reg-beg reg-end web-mode-markdown-font-lock-keywords)) ((string= content-type "ruby") (web-mode-fontify-region reg-beg reg-end web-mode-erb-font-lock-keywords)) + ((string= content-type "typescript") + (web-mode-fontify-region reg-beg reg-end web-mode-javascript-font-lock-keywords)) ) ;cond (goto-char reg-beg) @@ -7513,7 +7598,7 @@ another auto-completion with different ac-sources (e.g. ac-php)") ) ;cond ) ;block-side - ((and part-language (member part-language '("css" "javascript" "json" "sql" "markdown" "pug" "ruby" "stylus"))) + ((and part-language (member part-language '("css" "javascript" "json" "sql" "markdown" "pug" "ruby" "sass" "stylus" "typescript"))) (setq reg-beg (or (web-mode-part-beginning-position pos) (point-min))) (goto-char reg-beg) (search-backward "<" nil t) @@ -7528,6 +7613,8 @@ another auto-completion with different ac-sources (e.g. ac-php)") (setq curr-indentation web-mode-code-indent-offset)) ((string= language "pug") (setq curr-indentation web-mode-code-indent-offset)) + ((string= language "sass") + (setq curr-indentation web-mode-code-indent-offset)) ((string= language "stylus") (setq curr-indentation web-mode-code-indent-offset)) ((string= language "ruby") @@ -7612,7 +7699,7 @@ another auto-completion with different ac-sources (e.g. ac-php)") ) ((member language '("javascript" "jsx" "ruby")) (setq reg-col (if web-mode-script-padding (+ reg-col web-mode-script-padding) 0))) - ((member language '("css" "sql" "markdown" "pug" "stylus")) + ((member language '("css" "sql" "markdown" "pug" "sass" "stylus")) (setq reg-col (if web-mode-style-padding (+ reg-col web-mode-style-padding) 0))) ((not (member language '("html" "xml" "razor"))) (setq reg-col @@ -7677,9 +7764,14 @@ another auto-completion with different ac-sources (e.g. ac-php)") (cond ((or (bobp) (= (line-number-at-pos pos) 1)) - (when debug (message "I100")) + (when debug (message "I100(%S) first line" pos)) (setq offset 0)) + ;; #1073 + ((get-text-property pos 'invisible) + (when debug (message "I110(%S) invible" pos)) + (setq offset nil)) + ((string= token "string") (when debug (message "I120(%S) string" pos)) (cond @@ -7853,18 +7945,24 @@ another auto-completion with different ac-sources (e.g. ac-php)") ) ;cond ) ((not (web-mode-tag-beginning)) - ) + (message "** error ** unable to jump to tag beg")) ((string-match-p "^/?>" curr-line) (setq offset (web-mode-column-at-pos (web-mode-tag-beginning-position pos))) ) (web-mode-attr-indent-offset (setq offset (+ (current-column) web-mode-attr-indent-offset))) ((looking-at-p (concat web-mode-start-tag-regexp "[ ]*\n")) - (setq offset (+ (current-column) (or web-mode-attr-indent-offset web-mode-code-indent-offset)))) + ;;(message "%S: %S" (point) (web-mode-inside-block-control pos)) + (setq offset (+ (current-column) (or web-mode-attr-indent-offset web-mode-code-indent-offset))) + ;; #1109 + (setq tmp (web-mode-inside-block-control pos)) + (when (and tmp (> tmp (point))) + (setq offset (+ offset (or web-mode-attr-indent-offset web-mode-code-indent-offset)))) + ) ((web-mode-attribute-next) (setq offset (current-column))) ) ;cond - ) + ) ;attr-indent ((or (member language '("html" "xml")) (and (member language '("jsx")) @@ -7923,6 +8021,10 @@ another auto-completion with different ac-sources (e.g. ac-php)") (when debug (message "I210(%S) ctemplate" pos)) (setq offset reg-col)) + ((string= language "expressionengine") + (when debug (message "I212(%S) expressionengine" pos)) + (setq offset (+ reg-col (or web-mode-attr-indent-offset web-mode-code-indent-offset)))) + ((member language '("mako" "web2py")) (when debug (message "I220(%S) mako" pos)) (setq offset (web-mode-python-indentation pos @@ -8026,6 +8128,13 @@ another auto-completion with different ac-sources (e.g. ac-php)") curr-indentation language reg-beg)))) + ((string= language "sass") + (when debug (message "I296(%S) sass" pos)) + (setq offset (car (web-mode-stylus-indentation pos + reg-col + curr-indentation + language + reg-beg)))) ((string= language "pug") (when debug (message "I298(%S) pug" pos)) @@ -8572,6 +8681,18 @@ another auto-completion with different ac-sources (e.g. ac-php)") ;;(message "%S %S %S %S" pos (point) initial-column language-offset) (cons (if (<= offset initial-column) initial-column offset) nil))) +(defun web-mode-sass-indentation (pos initial-column language-offset language &optional limit) + (let (offset) + (save-excursion + (goto-char pos) + (setq offset (current-column)) + (if (looking-at-p "[[:alnum:]-]+:") + (setq offset (+ initial-column language-offset)) + (setq offset initial-column)) + ) ;save-excursion + ;;(message "%S %S %S %S" pos (point) initial-column language-offset) + (cons (if (<= offset initial-column) initial-column offset) nil))) + (defun web-mode-pug-indentation (pos initial-column language-offset language &optional limit) nil ) @@ -9549,6 +9670,16 @@ another auto-completion with different ac-sources (e.g. ac-php)") (web-mode-fold-or-unfold)) )) +(defun web-mode-element-children-comment (&optional pos) + "Comment all the children of the current html element." + (interactive) + (unless pos (setq pos (point))) + (save-excursion + (dolist (child (reverse (web-mode-element-children pos))) + (goto-char child) + (web-mode-comment (point))) + )) + (defun web-mode-element-mute-blanks () "Mute blanks." (interactive) @@ -9671,6 +9802,24 @@ Pos should be in a tag." (deactivate-mark) )))) +(defun web-mode-lify-region () + "Transform current REGION in an html list (
  • line1
    • ...)" + (interactive) + (let (beg end) + (save-excursion + (when mark-active + (setq beg (region-beginning) + end (region-end)) + (setq lines (buffer-substring beg end)) + (kill-region beg end) + (setq lines (replace-regexp-in-string "^[ \t]*" "
  • " lines)) + (setq lines (replace-regexp-in-string "$" "
    • " lines)) + (web-mode-insert-and-indent lines) + ) ;when + ) ; save-excursion + ) ;let + ) + (defun web-mode-element-wrap (&optional tag-name) "Wrap current REGION with start and end tags. Prompt user if TAG-NAME isn't provided." @@ -10248,6 +10397,8 @@ Prompt user if TAG-NAME isn't provided." (setq content (concat "<%-- " sel " --%>"))) ((and (= web-mode-comment-style 2) (string= web-mode-engine "smarty")) (setq content (concat "{* " sel " *}"))) + ((and (= web-mode-comment-style 2) (string= web-mode-engine "expressionengine")) + (setq content (concat "{!-- " sel " --}"))) ((and (= web-mode-comment-style 2) (string= web-mode-engine "xoops")) (setq content (concat "<{* " sel " *}>"))) ((and (= web-mode-comment-style 2) (string= web-mode-engine "hero")) @@ -11551,17 +11702,18 @@ Prompt user if TAG-NAME isn't provided." (defun web-mode-closing-block (type) (cond - ((string= web-mode-engine "php") (concat "")) - ((string= web-mode-engine "django") (concat "{% end" type " %}")) - ((string= web-mode-engine "ctemplate") (concat "{{/" type "}}")) + ((string= web-mode-engine "php") (concat "")) + ((string= web-mode-engine "django") (concat "{% end" type " %}")) + ((string= web-mode-engine "ctemplate") (concat "{{/" type "}}")) ((string= web-mode-engine "blade") (if (string= type "section") (concat "@show") (concat "@end" type))) - ((string= web-mode-engine "dust") (concat "{/" type "}")) - ((string= web-mode-engine "mako") (concat "% end" type)) - ((string= web-mode-engine "closure") (concat "{/" type "}")) - ((string= web-mode-engine "smarty") (concat "{/" type "}")) - ((string= web-mode-engine "xoops") (concat "<{/" type "}>")) - ((string= web-mode-engine "svelte") (concat "{/" type "}")) + ((string= web-mode-engine "dust") (concat "{/" type "}")) + ((string= web-mode-engine "mako") (concat "% end" type)) + ((string= web-mode-engine "closure") (concat "{/" type "}")) + ((string= web-mode-engine "smarty") (concat "{/" type "}")) + ((string= web-mode-engine "expressionengine") (concat "{/" type "}")) + ((string= web-mode-engine "xoops") (concat "<{/" type "}>")) + ((string= web-mode-engine "svelte") (concat "{/" type "}")) ((string= web-mode-engine "underscore") "<% } %>") ((string= web-mode-engine "lsp") "<% ) %>") ((string= web-mode-engine "erb") "<% } %>") @@ -12136,6 +12288,7 @@ Prompt user if TAG-NAME isn't provided." (web-mode-block-match pos) (if (= pos (point)) nil (point)))) +;; type may be nil (defun web-mode-block-control-previous-position (type &optional pos) (unless pos (setq pos (point))) (let ((continue t) controls) @@ -12145,6 +12298,8 @@ Prompt user if TAG-NAME isn't provided." ((null pos) (setq continue nil pos nil)) + ((null type) + (setq continue nil)) ((and (setq controls (web-mode-block-controls-get pos)) (eq (car (car controls)) type)) (setq continue nil)) @@ -12152,6 +12307,13 @@ Prompt user if TAG-NAME isn't provided." ) ;while pos)) +(defun web-mode-inside-block-control (&optional pos) + (unless pos (setq pos (point))) + (setq pos (web-mode-block-control-previous-position nil pos)) + (if (and pos (member (car (car (web-mode-block-controls-get pos))) '(open inside))) + pos + nil)) + (defun web-mode-block-opening-paren-position (pos limit) (save-excursion (when (> limit pos) @@ -12636,11 +12798,11 @@ Prompt user if TAG-NAME isn't provided." (web-mode-looking-at ".[ \t\n]*" pos) (setq pos (+ pos (length (match-string-no-properties 0))) continue nil)) - ((web-mode-looking-at "\\(return\\|else\\)[ \n]" pos) + ((web-mode-looking-at "\\(return\\|else\\|const\\)[ \n]" pos) (setq pos (+ pos (length (match-string-no-properties 0))) continue nil)) (t - (setq pos (web-mode-rsb-position pos "[\]\[}{)(=?:;,&|>.]\\|\\(return\\|else\\)" reg-beg)) + (setq pos (web-mode-rsb-position pos "[\]\[}{)(=?:;,&|>.]\\|\\(return\\|else\\|const\\)" reg-beg)) (when (not pos) (message "javascript-calls-beginning-position ** search failure **") (setq pos reg-beg @@ -13645,7 +13807,7 @@ Prompt user if TAG-NAME isn't provided." (let (elt elts engines) (when (string= web-mode-engine "razor") (setq web-mode-enable-block-face t)) - (setq web-mode-engine-attr-regexp (cdr (assoc web-mode-engine web-mode-engine-attr-regexps))) + ;;(setq web-mode-engine-attr-regexp (cdr (assoc web-mode-engine web-mode-engine-attr-regexps))) (setq web-mode-engine-token-regexp (cdr (assoc web-mode-engine web-mode-engine-token-regexps))) ;;(message "%S %S %S" web-mode-engine web-mode-engine-attr-regexp web-mode-engine-token-regexp) diff --git a/elpa/web-mode-20191104.1859/web-mode.elc b/elpa/web-mode-20200227.906/web-mode.elc similarity index 76% rename from elpa/web-mode-20191104.1859/web-mode.elc rename to elpa/web-mode-20200227.906/web-mode.elc index 57fbb9bb599b9f1a23e6a02affa8ce74eed76474..e6c506b2b2579d9055d26c93f09285e9f0487859 100644 GIT binary patch delta 33293 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 delta 32015 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 Rp?!NTj2PB&;m_^4{~tzExWE7a