circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix line numbers - commands are added after the line ends so they need to 

get line - 1.
pull/1758/head
nicm 2019-05-23 18:39:00 +00:00
parent 6c260af56d
commit f3e01ecc42
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cfg.c
View File

@ -126,6 +126,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags,
memset(&pi, 0, sizeof pi);
pi.flags = flags;
pi.file = path;
pi.line = 1;
pr = cmd_parse_from_file(f, &pi);
fclose(f);

4
cmd-parse.y
View File

@ -356,7 +356,7 @@ command : assignment TOKEN
$$ = xcalloc(1, sizeof *$$);
$$->name = $2;
$$->line = ps->input->line;
$$->line = ps->input->line - 1;
}
| assignment TOKEN arguments
@ -365,7 +365,7 @@ command : assignment TOKEN
$$ = xcalloc(1, sizeof *$$);
$$->name = $2;
$$->line = ps->input->line;
$$->line = ps->input->line - 1;
$$->argc = $3.argc;
$$->argv = $3.argv;