suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly prevent `crossterm` features being used when `feature = "term"` not enabled in `helix-view` (#12734)

pull/12735/head
John Kelly 2025-01-30 23:38:07 +00:00 committed by GitHub
parent d285a8a9e5
commit 6906164177
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helix-view/src/clipboard.rs
View File

@ -122,10 +122,11 @@ mod external {
Self::Tmux Self::Tmux
} else if binary_exists("pbcopy") && binary_exists("pbpaste") { } else if binary_exists("pbcopy") && binary_exists("pbpaste") {
Self::Pasteboard Self::Pasteboard
} else if cfg!(feature = "term") {
Self::Termcode
} else { } else {
Self::None #[cfg(feature = "term")]
return Self::Termcode;
#[cfg(not(feature = "term"))]
return Self::None;
} }
} }

1
helix-view/src/graphics.rs
View File

@ -342,6 +342,7 @@ impl FromStr for UnderlineStyle {
} }
} }
#[cfg(feature = "term")]
impl From<UnderlineStyle> for crossterm::style::Attribute { impl From<UnderlineStyle> for crossterm::style::Attribute {
fn from(style: UnderlineStyle) -> Self { fn from(style: UnderlineStyle) -> Self {
match style { match style {