h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-24 22:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete cur_term() wrapper

Browse Source
This commit is contained in:
Johannes Altmanninger
2023-12-02 16:26:52 +01:00
parent 05b024c675
commit 29ec464767
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fish-rust/src/compat.c
View File

@@ -12,8 +12,6 @@
size_t C_MB_CUR_MAX() { return MB_CUR_MAX; }
int has_cur_term() { return cur_term != NULL; }
uint64_t C_ST_LOCAL() {
#if defined(ST_LOCAL)
return ST_LOCAL;

5
fish-rust/src/compat.rs
View File

@@ -8,10 +8,6 @@ pub fn MB_CUR_MAX() -> usize {
unsafe { C_MB_CUR_MAX() }
}
pub fn cur_term() -> bool {
unsafe { has_cur_term() }
}
#[allow(non_snake_case)]
pub fn ST_LOCAL() -> u64 {
unsafe { C_ST_LOCAL() }
@@ -35,7 +31,6 @@ pub fn _CS_PATH() -> i32 {
extern "C" {
fn C_MB_CUR_MAX() -> usize;
fn has_cur_term() -> bool;
fn C_ST_LOCAL() -> u64;
fn C_MNT_LOCAL() -> u64;
fn C_CS_PATH() -> i32;

4
fish-rust/src/proc.rs
View File

@@ -6,7 +6,7 @@
use crate::common::{
charptr2wcstring, escape, fputws, redirect_tty_output, scoped_push_replacer, timef, Timepoint,
};
use crate::compat::cur_term;
use crate::curses::term;
use crate::env::Statuses;
use crate::event::{self, Event};
use crate::flog::{FLOG, FLOGF};
@@ -1709,7 +1709,7 @@ fn process_clean_after_marking(parser: &Parser, allow_interactive: bool) -> bool
// This may be invoked in an exit handler, after the TERM has been torn down
// Don't try to print in that case (#3222)
let interactive = allow_interactive && cur_term();
let interactive = allow_interactive && term().is_some();
// Remove all disowned jobs.
remove_disowned_jobs(&mut parser.jobs_mut());