Skip to content

chore(terminal): remove duplicate build-failed defun#2206

Merged
theangelperalta merged 1 commit into
lem-project:mainfrom
theangelperalta:fix/terminal-dup-build-failed
Jun 3, 2026
Merged

chore(terminal): remove duplicate build-failed defun#2206
theangelperalta merged 1 commit into
lem-project:mainfrom
theangelperalta:fix/terminal-dup-build-failed

Conversation

@theangelperalta
Copy link
Copy Markdown
Collaborator

Summary

scripts/build-terminal.lisp on main has two identical build-failed
definitions. Removing the duplicate.

Cause

#2204 and #2205 were a stack but merged in reverse order: #2205 (which
contained #2204's commits) squash-merged first, then #2204 squash-merged on
top. Because #2205 had inserted static-p/vterm-flags just above
build-failed, git's 3-way merge for #2204 re-applied the build-failed
block rather than detecting it as already present — producing the duplicate.

Impact

Functionally harmless (both copies are byte-identical), but SBCL emits a
redefinition warning when loading the script. This restores a single
definition.

Verified: make terminal-lib still builds; grep -c 'defun build-failed'
is now 1.

PRs lem-project#2204 and lem-project#2205 merged in the reverse of their stacking order (lem-project#2205,
which contained lem-project#2204's commits, merged first; lem-project#2204 merged second). Because
lem-project#2205 had added static-p/vterm-flags just above build-failed, the squash of
lem-project#2204 re-applied the build-failed block instead of recognizing it as already
present, leaving two identical definitions in build-terminal.lisp.

Remove the duplicate. No behavior change (the copies were identical); this
just silences the SBCL redefinition warning.
@theangelperalta theangelperalta merged commit ec6a67c into lem-project:main Jun 3, 2026
12 checks passed
@theangelperalta theangelperalta deleted the fix/terminal-dup-build-failed branch June 3, 2026 01:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant