diff --git a/CHANGES b/CHANGES index d88d4024..5e0db208 100644 --- a/CHANGES +++ b/CHANGES @@ -389,7 +389,7 @@ CHANGES FROM 3.2 TO 3.2a * Do not expand the filename given to -f so it can contain colons. * Fixes for problems with extended keys and modifiers, scroll region, - source-file, crosscompiling, format modifiers and other minor issues. + source-file, cross compiling, format modifiers and other minor issues. CHANGES FROM 3.1c TO 3.2 diff --git a/regress/conf/e2661d67d0d45a8647fb95de76ec8174.conf b/regress/conf/e2661d67d0d45a8647fb95de76ec8174.conf index 3cf1ae9d..0f0a0c3c 100644 --- a/regress/conf/e2661d67d0d45a8647fb95de76ec8174.conf +++ b/regress/conf/e2661d67d0d45a8647fb95de76ec8174.conf @@ -35,7 +35,7 @@ set-option -g default-command 'tmux pipe-pane -o "cat >>~/tmux_logs/output-`date # from http://stackoverflow.com/questions/17255031/how-to-copy-from-tmux-running-in-putty-to-windows-clipbard # # for some reason this is wrapping at 80 cols, using save- instead of show- helps -# -b for background is needed because xclip continues to run to service the clipboard paste reqeusts until the +# -b for background is needed because xclip continues to run to service the clipboard paste requests until the # clipboard buffer is replaced with some new contents #bind C-y run-shell -b "tmux save-buffer - | DISPLAY=$(<~/.xdisplay) xclip -selection clipboard -in && tmux display-message 'xclipped successfully'" bind C-y save-buffer ~/etc/clipboard.pipe @@ -75,4 +75,4 @@ set-window-option -g window-status-current-format "#{?pane_synchronized,#[bg=red set-option -g window-status-current-style bg=blue # Toggle input on a pane (from Thomas Sattler) -bind-key R if -F '#{pane_input_off}' "select-pane -e; select-pane -P fg=default" "select-pane -d; select-pane -P fg=yellow" \ No newline at end of file +bind-key R if -F '#{pane_input_off}' "select-pane -e; select-pane -P fg=default" "select-pane -d; select-pane -P fg=yellow" diff --git a/regress/format-strings.sh b/regress/format-strings.sh index 5c966375..e9bf8b0f 100644 --- a/regress/format-strings.sh +++ b/regress/format-strings.sh @@ -127,11 +127,11 @@ test_conditional_with_pane_in_mode "#{?pane_in_mode,{abc,xyz},bonus}" "{abc,bonu # invalid format: #{abc,xyz} is not a known variable name. #test_conditional_with_pane_in_mode "#{?pane_in_mode,#{abc,xyz},bonus}" "" "bonus" -# Parenthesis (...) do not captura a comma, and "xyz)" is a false condition +# Parenthesis (...) do not capture a comma, and "xyz)" is a false condition test_conditional_with_pane_in_mode "#{?pane_in_mode,(abc,xyz),bonus}" "(abc" "" test_conditional_with_pane_in_mode "#{?pane_in_mode,(abc#,xyz),bonus}" "(abc,xyz)" "bonus" -# Brackets [...] do not captura a comma, and "xyz]" is a false condition +# Brackets [...] do not capture a comma, and "xyz]" is a false condition test_conditional_with_pane_in_mode "#{?pane_in_mode,[abc,xyz],bonus}" "[abc" "" test_conditional_with_pane_in_mode "#{?pane_in_mode,[abc#,xyz],bonus}" "[abc,xyz]" "bonus"