circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,862 Commits
1 Branch
35 Tags
65 MiB
Commit Graph

130 Commits (d46870ede5e79c748cf8d06a00cdcc7310846844)

Author SHA1 Message Date
Thomas Adam d46870ede5 Merge branch 'obsd-master' 2022-06-20 12:01:09 +01:00
nicm a888ce9963 Do not display configuration file errors in a pane when in control mode, 
instead report them with a %config-error notification. GitHub issue 3193.
 2022-06-20 07:59:37 +00:00
nicm cd89000c1d Add a way for lines added to copy mode to be passed through the parser 
to handle escape sequences and use it for run-shell, GitHub issue 3156.
 2022-05-30 13:00:18 +00:00
Nicholas Marriott 58d1a206c6 Add a way for lines added to copy mode to be passed through the parser to 
handle escape sequences and use it for run-shell, GitHub issue 3156.
 2022-04-18 11:47:14 +01:00
Thomas Adam 921991c98d Merge branch 'obsd-master' into master 2021-08-21 20:01:22 +01:00
nicm 5241dae87d Stop caring about empty commands, just treat as a null command. 2021-08-21 17:25:32 +00:00
Thomas Adam 3cd63cc9e0 Merge branch 'obsd-master' into master 2021-04-07 16:01:21 +01:00
nicm 71fc9f3ee8 Add a current_file format for the config file being parsed. Originally 
suggested by kn@, also GitHub issue 2638.
 2021-04-07 12:50:12 +00:00
Thomas Adam 0cd5ed9e9b Merge branch 'obsd-master' into master 2021-02-22 10:01:22 +00:00
nicm 6876381276 Move config file path expansion much earlier, keep the list of paths 
around rather than freeing later, and add a config_files format variable
containing it. Suggested by kn@ a while back.
 2021-02-22 08:18:13 +00:00
nicm a29196ca6a Build list of paths and weed out duplicates before loading configs, and 
add TMUX_SOCK like TMUX_PATH for the socket directory.
 2020-05-16 14:26:33 +00:00
Nicholas Marriott 0d3fdae7b6 Build list of paths and weed out duplicates before loading configs. 2020-04-23 17:56:45 +01:00
Thomas Adam acc00cd13a Merge branch 'obsd-master' 2020-04-13 18:01:43 +01:00
nicm 3f86d6d460 When adding a list of commands to the queue, instead of automatically 
creating a new state for each group of commands, require the caller to
create one and use it for all the commands in the list. This means the
current target works even with list with multiple groups (which can
happen if they are defined with newlines).
 2020-04-13 15:55:51 +00:00
Thomas Adam b117c3b812 Merge branch 'obsd-master' 2020-04-13 10:30:00 +01:00
nicm c0602f357d Now that copy mode copies the pane content rather than keeping a 
reference to it, it isn't necessary that the pane in copy mode is the
same as the one copying from. Add a -s flag to copy-mode to specify a
different pane for the source content. This means it is possible to view
two places in a pane's history at the same time in different panes, or
copy from a pane's history into an editor or shell in the same pane.

From Anindya Mukherjee.
 2020-04-10 07:44:26 +00:00
Thomas Adam 745233d6a1 Merge branch 'obsd-master' 2019-12-19 10:01:26 +00:00
nicm 1764f66b7d When adding a list with multiple commands to the queue, the next item to 
insert after needs to be the last one added, not the first. Reported by
Jason Kim in GitHub issue 2023.
 2019-12-19 09:22:33 +00:00
Thomas Adam 7922f4ee7b Merge branch 'obsd-master' 2019-12-12 14:33:47 +00:00
nicm 5134666702 Change source-file to use new file code which allows it to read from 
stdin.
 2019-12-12 12:49:36 +00:00
Thomas Adam 5b2048fbb9 Merge branch 'obsd-master' 2019-12-10 16:01:25 +00:00
nicm 55eb3e4773 Make TMUX_CONF a list of files and expand leading $FOO or ~. 2019-12-10 14:22:15 +00:00
Thomas Adam 03945276f7 Merge branch 'obsd-master' 2019-06-20 09:02:26 +01:00
nicm ae541287d3 Expand command formats in %if and move the config file loading later (to 
when the first client has identified) so all the client formats are
available, fixes problems reported by Thomas Sattler.
 2019-06-20 06:51:36 +00:00
Thomas Adam ee9bc355f5 Merge branch 'obsd-master' 2019-06-18 13:02:28 +01:00
nicm 9272fe36e2 Add a cmdq_continue function rather than twiddling the flag directly. 2019-06-18 11:08:42 +00:00
Thomas Adam c91680822d Merge branch 'obsd-master' 2019-06-05 23:02:26 +01:00
nicm 8f40796f05 Add a -v flag to source-file to show the commands and line numbers. 2019-06-05 20:00:53 +00:00
Thomas Adam 19a3a9ee20 Merge branch 'obsd-master' 2019-05-23 21:02:30 +01:00
nicm f3e01ecc42 Fix line numbers - commands are added after the line ends so they need to 
get line - 1.
 2019-05-23 18:39:00 +00:00
Thomas Adam 75aeb733f2 Merge branch 'obsd-master' 2019-05-23 13:02:27 +01:00
nicm 723010ba72 Replace the split parser code (cfg.c and cmd-string.c) with a single 
parser using yacc(1). This is a major change but is clearer and simpler
and allows some edge cases to be made more consistent, as well as
tidying up how aliases are handled. It will also allow some further
improvements later.

Entirely the same parser is now used for parsing the configuration file
and for string commands. This means that constructs previously only
available in .tmux.conf, such as %if, can now be used in string commands
(for example, those given to if-shell - not commands invoked from the
shell, they are still parsed by the shell itself).

The only syntax change I am aware of is that #{} outside quotes or a
comment is now considered a format and not a comment, so #{ is now a
syntax error (notably, if it is at the start of a line).

This also adds two new sections to the man page documenting the syntax
and outlining how parsing and command execution works.

Thanks to everyone who sent me test configs (they still all parse
without errors - but this doesn't mean they still work as intended!).

Thanks to Avi Halachmi for testing and man page improvements, also to
jmc@ for reviewing the man page changes.
 2019-05-23 11:13:30 +00:00
Thomas Adam 98ee93bde3 Merge branch 'obsd-master' 2019-05-20 15:02:40 +01:00
nicm 87d82170a6 Fix ordering of source-file with multiple files and add flags to load_cfg. 2019-05-20 13:23:32 +00:00
Thomas Adam d4177e954c Merge branch 'obsd-master' 2019-05-03 23:02:28 +01:00
nicm 45ae9a8e35 Fix order of insertion in load_cfg. 2019-05-03 21:21:00 +00:00
Thomas Adam 3c1f0cfc34 Merge branch 'obsd-master' 2019-04-18 14:08:13 +01:00
nicm 3f189945d8 Pass target client and session to load_cfg from source-file so formats 
work. Reported by Thomas Sattler.
 2019-04-18 11:07:28 +00:00
Thomas Adam cb039b986e Merge branch 'obsd-master' 2019-04-03 09:02:41 +01:00
nicm f6c54f3f03 Do not load /etc/tmux.conf if given -f. 2019-04-03 06:43:19 +00:00
Thomas Adam 3ec05e9405 Merge branch 'obsd-master' 2019-03-12 12:02:42 +00:00
nicm 3f6bfbaf2b Allow multiple modes to be open in a pane. A stack of open modes is kept 
and the previous restored when the top is exited. If a mode that is
already on the stack is entered, the existing instance is moved to the
top as the active mode rather than being opened new.
 2019-03-12 11:16:49 +00:00
Thomas Adam bc72cf2f52 Merge branch 'obsd-master' 2019-03-08 12:02:39 +00:00
nicm de730f68a4 Make the mode used to view command output (a variant of copy mode) use 
its own mode definition struct with a different init function rather
than calling special setup functions.
 2019-03-08 10:34:20 +00:00
Thomas Adam a1009e7bd3 Merge branch 'obsd-master' 2019-03-07 20:02:41 +00:00
nicm 3c24bc5617 Tidy changing the mode into window_copy_init_for_output. 2019-03-07 19:34:22 +00:00
Thomas Adam fa8294436c Merge branch 'obsd-master' 2019-02-16 14:02:37 +00:00
nicm 82f0c859a2 Use starting client cwd in config file, GitHub issue 1606. 2019-02-16 11:42:08 +00:00
Thomas Adam 84ddc72744 Merge branch 'obsd-master' 2018-01-17 11:26:10 +00:00
nicm 481703d669 Some unused code, GitHub issue 1219. 2018-01-15 15:27:03 +00:00