summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>2017-01-07 07:56:30 +0100
committerSébastien Helleu <flashcode@flashtux.org>2017-01-07 07:56:30 +0100
commitadd0be28d978cdc652ba114b1dc42179d10b7e6a (patch)
tree9213c2e153870c5946bd3fceb2c7353526c08266 /src
parent18833a8c93d201c2441361c0383f3e713768163a (diff)
downloadweechat-add0be28d978cdc652ba114b1dc42179d10b7e6a.zip
exec: update help descriptions for command /exec to keep compatibility between options
Related-Bug: #877
Diffstat (limited to 'src')
-rw-r--r--src/plugins/exec/exec-command.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/plugins/exec/exec-command.c b/src/plugins/exec/exec-command.c
index cbae927c9..bcb82e994 100644
--- a/src/plugins/exec/exec-command.c
+++ b/src/plugins/exec/exec-command.c
@@ -813,7 +813,8 @@ exec_command_init ()
"the command has some unsafe data, for example the content of a "
"message from another user) (default)\n"
" -bg: run process in background: do not display process output "
- "neither return code (not compatible with options -o/-n)\n"
+ "neither return code (not compatible with options "
+ "-o/-oc/-n/-nf/-pipe/-hsignal)\n"
" -nobg: catch process output and display return code (default)\n"
" -stdin: create a pipe for sending data to the process (with "
"/exec -in/-inclose)\n"
@@ -823,15 +824,15 @@ exec_command_init ()
"created)\n"
" -l: display locally output of command on buffer (default)\n"
" -o: send output of command to the buffer without executing "
- "commands (not compatible with option -bg)\n"
+ "commands (not compatible with options -bg/-pipe/-hsignal)\n"
" -oc: send output of command to the buffer and execute commands "
"(lines starting with \"/\" or another custom command char) "
- "(not compatible with option -bg)\n"
+ "(not compatible with options -bg/-pipe/-hsignal)\n"
" -n: display output of command in a new buffer (not compatible "
- "with option -bg)\n"
+ "with options -bg/-pipe/-hsignal)\n"
" -nf: display output of command in a new buffer with free "
"content (no word-wrap, no limit on number of lines) (not compatible "
- "with option -bg)\n"
+ "with options -bg/-pipe/-hsignal)\n"
" -cl: clear the new buffer before displaying output\n"
" -nocl: append to the new buffer without clear (default)\n"
" -sw: switch to the output buffer (default)\n"
@@ -854,9 +855,9 @@ exec_command_init ()
"line); if there are spaces in command/arguments, enclose them with "
"double quotes; variable $line is replaced by the line (by default "
"the line is added after the command, separated by a space) "
- "(not compatible with options -bg/-o/-n)\n"
+ "(not compatible with options -bg/-o/-oc/-n/-nf)\n"
"-hsignal: send the output as a hsignal (to be used for example in "
- "a trigger) (not compatible with options -bg/-o/-n)\n"
+ "a trigger) (not compatible with options -bg/-o/-oc/-n/-nf)\n"
" command: the command to execute; if beginning with \"url:\", the "
"shell is disabled and the content of URL is downloaded and sent as "
"output\n"