[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge commit 'c58a4f3586473f7476510714698e60835fcb94ef'

Squashed '.vim/bundle/vim-markdown/' changes from da5a7ac9..8f6cb3a6

8f6cb3a6 Merge pull request #636 from KSR-Yasuda/bugfix/CodeFenceHandling
7026436c Merge pull request #660 from KSR-Yasuda/bugfix/ContainCodeInHeading
4a3ddd7d Contain `mkdCode` in `mkdHeadingContent`
a657e697 docs: Correct mappings zo/zO and add za/zA (#652)
46add6c3 feat: Add (optin) support for formatting tables without borders (#643)
66ed2e14 Fix jumping to anchor
4e9b4ded docs: fix a couple of small typos in code comments
6b13e98b Highlight strikethrough text in headings
18f3af70 Highlight footnotes in headings
241161e0 Highlight bold italic text in headings
4f87df57 Highlight bold text in headings
2b9e32ec Highlight italics in headings
a6a1bed7 Fix code fence handling
cc82d88e Expand relative path URL using host path separator
5d3d1b6c docs: Mention need to *not* use semver support in plugin managers (#619)
df4be862 Add syntax group that matches a list item checkbox `mkdListItemCheckbox` (#564)
2cb8d9d8 Merge pull request #607 from lggruspe/fix-setextoatx
3bbbaa32 Allow fenced code highlight in liquid (#609)
aa7d685a Fix handling of frontmatter option (#595)
7231fa4b Allow escaped pipe (bar) characters inside TableFormat
67571a1c Fix invalid range in SetexToAtx
b9c5c34a Add failing tests for SetexToAtx
926cb9a3 Add tests for HeaderDecrease and HeaderIncrease
c3f83ebb Remove outdated advice for Vim plugins (#600)
8a0b4341 Fix broken link (#599)
3a964396 Disable code block syntax highlighting when syntax=OFF (#580)
9068655b Fix fenced code block syntax highlighting (#534)
c031a3e6 Avoid trailing comments `-->` turning the comment into a heading (#517)
95e90840 Merge pull request #573 from StarryLeo/revert-commit-18ed14a
21c8a8b2 chore: Clue in linter about ftdetect augroups
f868afae Revert "refactor: Execute autocmd in group scope"
b4dc23e2 Merge pull request #571 from tomtomjhj/table-format
a0467941 Add tests
e82be74d Fix TableFormat for indented tables, version 2
d7038a62 Merge pull request #570 from preservim/add-ci
aca1aaa9 Revert "Fix TableFormat for indented tables (#569)"
9297be2b Merge remote-tracking branch 'origin/master' into add-ci
0eb5bd6d docs(readme): Add CI workflow badges
6d5c19bf test: Make fold test NeoVIM/VIM compatible
ded139ce refactor: Cleanup test script for use with NeoVIM/VIM
90ca3483 chore(ci): Add Vader workflow to run regression tests
60022432 refactor: Make variable scope explicit
18ed14af refactor: Execute autocmd in group scope
9cdd48bc refactor: Use full option names
0888ec7e refactor: Prefer single quoted strings
8f16759b refactor: Use robust operators
0cb62d8d chore(ci): Add Reviewdog workflow to lint PRs
c9236dc3 chore(ci): Add vint workflow to lint vimscript
347e230c chore(tooling): Add vimscript lint configuration
50d42082 Change shortcut: MoveToCurHeader: `]c` -> `]h` (#556)
6e71e44a Markdown_EditUrlUnderCursor falls back to builtin gf (#566)
6fe1a105 Fix TableFormat for indented tables (#569)
9156bba6 Update canonical URL (forwarding in effect from original URL)
3ba557dc Drop obsolete Travis config (Travis dropped most FOSS)
8e5d86f7 Merge pull request #498 from jrwrigh/master
9497be60 fix: Remove debugging echo message
909c0e51 Merge pull request #492 from jrwrigh/master
dfd92dd4 test: Add test for characters after code block lang
23a51468 Merge pull request #497 from AggroBoy/master
9513e82a tweak html tag matching for code blocks
139b6f66 Merge pull request #477 from cdelledonne/insert-toc
cd46012b Merge pull request #472 from kalafut/master
3bb8e9ae Merge pull request #486 from jbriales/master
cb8d46ad Fix tex syntax test for latest syntax
154b1f85 feat: Allow characters after code block language
c1793167 Merge pull request #451 from yous/fix-url
b0081772 Save current cursor position to jumplist before MoveToParentHeader
4528ec64 Add `:InsertToc` and `:InsertNToc` commands
8db8763e Add GetHeaderList() in ftplugin/markdown.vim
583dc6a5 Add 'mdx' to recognized file extensions
c34496a6 Fix mkdInlineURL not to highlight after closing brackets

git-subtree-dir: .vim/bundle/vim-markdown
git-subtree-split: 8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51

Merge commit '3e3c8f18c7e13b80a0657d48c3c4fa8f55d9eb68'

Squashed '.vim/bundle/password-store/' changes from dc759ab3..474a7dfc

474a7dfc cleanup: Remove unneeded autoload guard
e7bb4ab5 fix: fat-fingered cpoptions
33e96717 perf: remove uneeeded ftdetect guard
2aa305fa Adding a default CursorLone
fb41a021 Add a projectionist config
5e34e7aa Shuffling test files
6ed6635c Cleanup gunk in obfuscation
3ed78b66 Add empty test
b0df1566 Better support for cterm obfustaction
73599919 Remove stale, non-working syntax late loading
69938267 Fix Conceal & Reveal

git-subtree-dir: .vim/bundle/password-store
git-subtree-split: 474a7dfc1c49986ed92fa78925963080b673926a

integrate pathogen from bundle/subtree

Merge commit '55bf04470ecc026e71c037f0f35402fdeac66767' as '.vim/bundle/vim-pathogen'

Squashed '.vim/bundle/vim-pathogen/' content from commit ac4dd949

git-subtree-dir: .vim/bundle/vim-pathogen
git-subtree-split: ac4dd9494fa9008754e49dff85bff1b5746c89b4

remove unused colour scheme

remove table macros

add gnupg script/package

move lbdbq package to mail ftplugin

move ftplugin scripts from after to normal ftplugin

remove tex remnants

remove itsalltext

clean up broken plugins

enable matchit

enable editorconfig

Remove black and flake8

add thumbsup iab

add main shortcut

prevent black from splitting ipdb trace lines

add new mail identities

Merge commit '882d8795c6ff65c02f2657e596391748d1b6b7f5'

Fix merging implicit multiline strings that have inline comments (#3956)

* Fix test behaviour

* Add new test cases

* Skip merging strings that have inline comments

* Don't merge lines with multiline strings with inline comments

* Changelog entry

* Document implicit multiline string merging rules

* Fix PR number

Prepare release 23.10.0 (#3951)

Fix parser bug where "type" was misinterpreted as a keyword inside a match (#3950)

Fixes #3790

Slightly hacky, but I think this is correct and it should also improve performance somewhat.

Fix grammar for type alias support (#3949)

Fixes #3948

Treat raw strings like other docstrings (#3947)

Fixes #3944

Fix long lines with power operator(s) getting splitted before line length (#3942)

Fixes #3889

Migrate mypy config to pyproject.toml (#3936)

Co-authored-by: Charles Patel <charles.patel@apkudo.com>

CI Test: Deprecating 'Healthcheck.all()' from Hypothesis in fuzz.py (#3945)

Fix test that was not being run (#3939)

Standardise newlines after module-level docstrings (#3932)

Co-authored-by: jpy-git <josephyoung.jpy@gmail.com>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Report all stacktraces in verbose mode (#3938)

Previously these were swallowed (unlike the ones in black/__init__.py)

Fix cache versioning when BLACK_CACHE_DIR is set (#3937)

Use inline flags for test cases (#3931)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>

Drop support for parsing Python 2 (#3933)

Bump pypa/cibuildwheel from 2.16.1 to 2.16.2 (#3934)

Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.16.1 to 2.16.2.
- [Release notes](https://github.com/pypa/cibuildwheel/releases)
- [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md)
- [Commits](https://github.com/pypa/cibuildwheel/compare/v2.16.1...v2.16.2)

---
updated-dependencies:
- dependency-name: pypa/cibuildwheel
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Set Docker to use 3.11 for now (#3927)

Until we get new aiohttp wheels we need to build with 3.11.
You can see an example of a fail here:

Workaround for #3919 - Will leave it open until we can move to 3.21

Update output display to job summary (#3914)

* Update output display to job summary

* fix: handled exit-code of script

* added changelog message

Remove `$`, `>>>` and other prompt prefixes when code copied from the… (#3884)

Adding configurations for sphinx-copybutton in conf.py
https://sphinx-copybutton.readthedocs.io/en/latest/use.html#using-regexp-prompt-identifiers

exclude tests/data/.* from mypy (#3917)

Update link to VS Code formatting instructions (#3921)

Update link

respect magic trailing commas in return types (#3916)

[pre-commit.ci] pre-commit autoupdate (#3915)

updates:
- [github.com/pre-commit/mirrors-mypy: v1.5.0 → v1.5.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.5.0...v1.5.1)
- [github.com/pre-commit/mirrors-prettier: v3.0.1 → v3.0.3](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.1...v3.0.3)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

docs: use LSP for SublimeText 4 (#3913)

Bump pypa/cibuildwheel from 2.16.0 to 2.16.1 (#3911)

Fix up changelog (#3910)

Fix comments getting removed from inside parenthesized strings (#3909)

Since the id of the old leaf may be
the key to comments, the new leaf
must adopt the old comments

Try newer clang in diff-shades job (#3904)

add support for printing the diff of AST trees when running tests (#3902)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Bump pypa/cibuildwheel from 2.15.0 to 2.16.0 (#3901)

Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.15.0 to 2.16.0.
- [Release notes](https://github.com/pypa/cibuildwheel/releases)
- [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md)
- [Commits](https://github.com/pypa/cibuildwheel/compare/v2.15.0...v2.16.0)

---
updated-dependencies:
- dependency-name: pypa/cibuildwheel
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

added the py311 to target-version config (#3898)

fix indentation of line breaks in long type hints by adding parens (#3899)

* fix indentation of line breaks in long type hints by adding parentheses, and remove unnecessary parentheses

* add entry in CHANGES.md, make the style change only in preview mode

Remove outdated mentions of runtime support of Python 3.7 (#3896)

Remove mentions of runtime support of Python 3.7

Runtime support of Python 3.7 was removed in
b4dca26c7d93f930bbd5a7b552807370b60d4298 but a few mentions of it being
supported have remained until now.

Bump actions/checkout from 3 to 4 (#3893)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump docker/setup-qemu-action from 2 to 3 (#3890)

Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump docker/setup-buildx-action from 2 to 3 (#3892)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump docker/login-action from 2 to 3 (#3891)

Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump docker/build-push-action from 4 to 5 (#3894)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump sphinx from 7.2.5 to 7.2.6 in /docs (#3895)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 7.2.5 to 7.2.6.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v7.2.5...v7.2.6)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Document disabling E704 (#3888)

Linking #3887

mypyc build improvements (#3881)

Build in separate jobs. This makes it clearer if e.g. a single Python
version is failing. It also potentially gets you more parallelism.

Build everything on push to master.

Only build Linux 3.8 and 3.11 wheels on PRs.

Bump docutils from 0.19 to 0.20.1 in /docs (#3699)

Bumps [docutils](https://docutils.sourceforge.io/) from 0.19 to 0.20.1.

Bump sphinx from 7.2.3 to 7.2.5 in /docs (#3882)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 7.2.3 to 7.2.5.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v7.2.3...v7.2.5)

Fix broken url in editors.md (#3885)

* Fix broken url in editors.md

Update a link pointing to the Arch Linux repos.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Bump actions/checkout from 3 to 4 (#3883)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Prepare release 23.9.1 (#3878)

mypyc builds on PRs, skip mypyc wheels for 3.12 (#3870)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Pickle raw tuples in FileData cache (#3877)

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>

Re-export black.Mode (#3875)

Ignore aiohttp DeprecationWarning for 3.12 (#3876)

Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>

Upgrade to Furo 2023.9.10 to fix docs build (#3873)

Add mypyc test marks to new tests that patch (#3871)

This is enough for me to get a clean test run on Python 3.9 with mypyc.
I have not been able to repro the pickle failures on either Linux or
macOS.

Bump RTD Python version from 3.8 to 3.11 (#3868)

Recent ReadTheDocs builds have been failing as our documentation dependencies (notably Sphinx) require Python 3.9+.

Add classifier for 3.12 (#3866)

Upgrade mypy (#3864)

Prepare release 23.9.0 (#3863)

Blank line between nested and function def in stub files. (#3862)

The idea behind this change is that we stop looking into previous body to determine if there should be a blank before a function or class definition.

Input:

```python
import sys

if sys.version_info > (3, 7):
    class Nested1:
        assignment = 1
        def function_definition(self): ...
    def f1(self) -> str: ...
    class Nested2:
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...

if sys.version_info > (3, 7):
    def nested1():
        assignment = 1
        def function_definition(self): ...
    def f1(self) -> str: ...
    def nested2():
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...
```

Stable style
```python
import sys

if sys.version_info > (3, 7):
    class Nested1:
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...

    class Nested2:
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...

if sys.version_info > (3, 7):
    def nested1():
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...
    def nested2():
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...
```

In the stable formatting, we have a blank line sometimes, not depending on the previous statement on the same level, but on the last (potentially nested) statement in the previous body.

#2783/#3564 fixes this for classes in preview style:

```python
import sys

if sys.version_info > (3, 7):
    class Nested1:
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...

    class Nested2:
        def function_definition(self): ...
        assignment = 1

    def f2(self) -> str: ...

if sys.version_info > (3, 7):
    def nested1():
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...
    def nested2():
        def function_definition(self): ...
        assignment = 1
    def f2(self) -> str: ...
```

This PR additionally fixes this for function definitions:

```python
if sys.version_info > (3, 7):
    if sys.platform == "win32":
        assignment = 1
        def function_definition(self): ...

    def f1(self) -> str: ...
    if sys.platform != "win32":
        def function_definition(self): ...
        assignment = 1

    def f2(self) -> str: ...

if sys.version_info > (3, 8):
    if sys.platform == "win32":
        assignment = 1
        def function_definition(self): ...

    class F1: ...
    if sys.platform != "win32":
        def function_definition(self): ...
        assignment = 1

    class F2: ...
```

You can see the effect of this change on typeshed in https://github.com/konstin/typeshed/pull/1/files. As baseline, the preview mode changes without this PR are at https://github.com/konstin/typeshed/pull/2.

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Avoid removing whitespace for walrus operators within subscripts (#3823)

Co-authored-by: hauntsaninja <hauntsaninja@gmail.com>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

Add Black PyCharm 2023.2 integration instructions (#3839)

blackd: fix mishandling of single character input (#3558)

Apply ignore logic before symlink resolution (#3846)

This means, for instance, that a gitignored symlink cannot affect your
formatting. Fixes #3527, fixes #3826

Move coverage configurations to `pyproject.toml` (#3858)

Bump furo from 2023.7.26 to 2023.8.19 in /docs + sphinx to 7.2.3 (#3848)

* Bump furo from 2023.7.26 to 2023.8.19 in /docs

Bumps [furo](https://github.com/pradyunsg/furo) from 2023.7.26 to 2023.8.19.
- [Release notes](https://github.com/pradyunsg/furo/releases)
- [Changelog](https://github.com/pradyunsg/furo/blob/main/docs/changelog.md)
- [Commits](https://github.com/pradyunsg/furo/compare/2023.07.26...2023.08.19)

---
updated-dependencies:
- dependency-name: furo
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
* Move to sphinx 7.2.3 + fix intersphinx_mapping

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Cooper Ry Lees <me@cooperlees.com>

Fix download badge link (#3853)

Improve handling of root to get_sources (#3847)

This is a little more type safe and a little cleaner

Remove tox pin (#3844)

Improve caching by comparing file hashes as fallback for mtime and size (#3821)

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>

Pin tox to fix CI (#3843)

[pre-commit.ci] pre-commit autoupdate (#3837)

Make pre-commit do less (#3838)

Bump pypa/cibuildwheel from 2.14.1 to 2.15.0 (#3836)

Remove ENV_PATH on Black action completion (#3759)

[pre-commit.ci] pre-commit autoupdate (#3833)

updates:
- [github.com/pre-commit/mirrors-prettier: v3.0.0 → v3.0.1](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0...v3.0.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

More concise formatting for dummy implementations (#3796)

Document pre-commit mirror (#3828)

[pre-commit.ci] pre-commit autoupdate (#3825)

Bump furo from 2023.5.20 to 2023.7.26 in /docs (#3824)

Bumps [furo](https://github.com/pradyunsg/furo) from 2023.5.20 to 2023.7.26.
- [Release notes](https://github.com/pradyunsg/furo/releases)
- [Changelog](https://github.com/pradyunsg/furo/blob/main/docs/changelog.md)
- [Commits](https://github.com/pradyunsg/furo/compare/2023.05.20...2023.07.26)

---
updated-dependencies:
- dependency-name: furo
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Add Lyft to organizations using black (#3818)