diff options
| -rw-r--r-- | cmd.c | 4 | ||||
| -rw-r--r-- | tmux.1 | 29 |
2 files changed, 18 insertions, 15 deletions
@@ -662,7 +662,7 @@ char * cmd_template_replace(const char *template, const char *s, int idx) { char ch, *buf; - const char *ptr, *cp; + const char *ptr, *cp, quote[] = "\"\\$"; int replaced, quoted; size_t len; @@ -691,7 +691,7 @@ cmd_template_replace(const char *template, const char *s, int idx) buf = xrealloc(buf, len + (strlen(s) * 2) + 1); for (cp = s; *cp != '\0'; cp++) { - if (quoted && (*cp == '"' || *cp == '$')) + if (quoted && strchr(quote, *cp) != NULL) buf[len++] = '\\'; buf[len++] = *cp; } @@ -176,14 +176,16 @@ is specified, the default socket directory is not used and any .Fl L flag is ignored. .It Fl u +When starting, .Nm -attempts to guess if the terminal is likely to support UTF-8 by checking the -first of the +looks for the .Ev LC_ALL , .Ev LC_CTYPE and .Ev LANG -environment variables to be set for the string "UTF-8". +environment variables: if the first found contains +.Ql UTF-8 , +then the terminal is assumed to support UTF-8. This is not always correct: the .Fl u flag explicitly informs @@ -944,8 +946,7 @@ lines. The argument to .Em %if is expanded as a format and if it evaluates to false -.Ns ( Ql 0 -or empty), subsequent lines are ignored until +(zero or empty), subsequent lines are ignored until .Em %endif . For example: .Bd -literal -offset indent @@ -1188,11 +1189,11 @@ flag) or vertically. Panes may be resized with the .Ic resize-pane command (bound to -.Ql C-up , -.Ql C-down -.Ql C-left +.Ql C-Up , +.Ql C-Down +.Ql C-Left and -.Ql C-right +.Ql C-Right by default), the current pane may be changed with the .Ic select-pane command and the @@ -1729,12 +1730,14 @@ option to change this behaviour. The .Ev TERM environment variable must be set to -.Dq screen +.Ql screen +or +.Ql tmux for all programs running .Em inside .Nm . New windows will automatically have -.Dq TERM=screen +.Ql TERM=screen added to their environment, but care must be taken not to reset this in shell start-up files. .Pp @@ -2227,8 +2230,8 @@ Each argument is the name of the key (such as .Ql C-a or -.Ql npage -) to send; if the string is not recognised as a key, it is sent as a series of +.Ql NPage ) +to send; if the string is not recognised as a key, it is sent as a series of characters. The .Fl l |