Skip to content

Remove the exclusion between '?' and internal command #1378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liangkarl wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −14
Open

Remove the exclusion between '?' and internal command #1378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions src/prompt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,24 +1124,23 @@ exec_run_request(struct view *view, struct run_request *req)
return REQ_NONE;
}

if (req->flags.internal) {
request = run_prompt_command(view, argv);
confirmed = !req->flags.confirm;

} else {
confirmed = !req->flags.confirm;

if (req->flags.confirm) {
char cmd[SIZEOF_STR], prompt[SIZEOF_STR];
const char *and_exit = req->flags.exit ? " and exit" : "";
if (req->flags.confirm) {
char cmd[SIZEOF_STR], prompt[SIZEOF_STR];
const char *and_exit = req->flags.exit ? " and exit" : "";

if (argv_to_string_quoted(argv, cmd, sizeof(cmd), " ") &&
string_format(prompt, "Run `%s`%s?", cmd, and_exit) &&
prompt_yesno(prompt)) {
confirmed = true;
}
if (argv_to_string_quoted(argv, cmd, sizeof(cmd), " ") &&
string_format(prompt, "Run `%s`%s?", cmd, and_exit) &&
prompt_yesno(prompt)) {
confirmed = true;
}
}

if (confirmed)
if (confirmed) {
if (req->flags.internal)
request = run_prompt_command(view, argv);
else
open_external_viewer(argv, repo.cdup, req->flags.silent,
!req->flags.exit, req->flags.echo, req->flags.quick, false, "");
}
Expand Down