Fix autoloading logic - #78
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a subtle bug here. The
el-patch--deftype-stub-setupwas checking ifel-patch-deftypewas already defined, before overwriting it with a stub. Good, but that check was wrong, becauseel-patch-deftypewas always already defined, so it never did anything. In the case ofel-patchnot having been loaded yet,el-patch-deftypewas defined as an autoload. This was misinterpreted as it having been fully defined, and hence not needing to be overwritten as a stub, leading to the autoloaded invocations ofel-patch-deftypelater in the file causing the whole file to actually be loaded.I found out about this, while investigating radian-software/straight.el#1295. This patch doesn't address that problem, but the behavior of
el-patchalways being loaded during autoloads activation was definitely wrong, so I fixed that.The new behavior has the stub check specifically if
el-patch-deftypeis defined as an autoload. If so, it overwrites the autoload stub with its own non-autoload stub. Then there is a new teardown function evaluated later in autoloads, which restores the original autoload definition if it was overwritten.Also, I autoloaded
el-patch-variant, which is read by the macroexpansion ofel-patch--definitionand thus needed at runtime. Havingel-patchalways loaded during autoloads activation was masking that bug.