Revision: 2640
http://tmux.svn.sourceforge.net/tmux/?rev=2640&view=rev
Author: tcunha
Date: 2011-11-25 13:33:04 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Sync OpenBSD patchset 981:
Move word-separators to be a session rather than window option, from Ben
Boeckel.
Modified Paths:
--------------
trunk/options-table.c
trunk/tmux.1
trunk/window-copy.c
Modified: trunk/options-table.c
===================================================================
--- trunk/options-table.c 2011-11-25 13:31:56 UTC (rev 2639)
+++ trunk/options-table.c 2011-11-25 13:33:04 UTC (rev 2640)
@@ -420,6 +420,11 @@
.default_num = 0
},
+ { .name = "word-separators",
+ .type = OPTIONS_TABLE_STRING,
+ .default_str = " -_@"
+ },
+
{ .name = NULL }
};
@@ -614,11 +619,6 @@
.default_str = "#I:#W#F"
},
- { .name = "word-separators",
- .type = OPTIONS_TABLE_STRING,
- .default_str = " -_@"
- },
-
{ .name = "xterm-keys",
.type = OPTIONS_TABLE_FLAG,
.default_num = 0
Modified: trunk/tmux.1
===================================================================
--- trunk/tmux.1 2011-11-25 13:31:56 UTC (rev 2639)
+++ trunk/tmux.1 2011-11-25 13:33:04 UTC (rev 2640)
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 5 2011 $
+.Dd $Mdocdate: November 15 2011 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -841,7 +841,7 @@
characters as word delimiters by default, but this can be adjusted by
setting the
.Em word-separators
-window option.
+session option.
Next word moves to the start of the next word, next word end to the end of the
next word and previous word to the start of the previous word.
The three next and previous space keys work similarly but use a space alone as
@@ -2292,6 +2292,12 @@
If
.Ic monitor-silence
is enabled, prints a message after the interval has expired on a given window.
+.It Ic word-separators Ar string
+Sets the session's conception of what characters are considered word
+separators, for the purposes of the next and previous word commands in
+copy mode.
+The default is
+.Ql \ -_@ .
.El
.It Xo Ic set-window-option
.Op Fl agu
@@ -2532,13 +2538,6 @@
The default is
.Ql #I:#W#F .
.Pp
-.It Ic word-separators Ar string
-Sets the window's conception of what characters are considered word
-separators, for the purposes of the next and previous word commands in
-copy mode.
-The default is
-.Ql \ -_@ .
-.Pp
.It Xo Ic xterm-keys
.Op Ic on | off
.Xc
Modified: trunk/window-copy.c
===================================================================
--- trunk/window-copy.c 2011-11-25 13:31:56 UTC (rev 2639)
+++ trunk/window-copy.c 2011-11-25 13:33:04 UTC (rev 2640)
@@ -548,13 +548,13 @@
break;
case MODEKEYCOPY_NEXTWORD:
word_separators =
- options_get_string(&wp->window->options, "word-separators");
+ options_get_string(&sess->options, "word-separators");
for (; np != 0; np--)
window_copy_cursor_next_word(wp, word_separators);
break;
case MODEKEYCOPY_NEXTWORDEND:
word_separators =
- options_get_string(&wp->window->options, "word-separators");
+ options_get_string(&sess->options, "word-separators");
for (; np != 0; np--)
window_copy_cursor_next_word_end(wp, word_separators);
break;
@@ -564,7 +564,7 @@
break;
case MODEKEYCOPY_PREVIOUSWORD:
word_separators =
- options_get_string(&wp->window->options, "word-separators");
+ options_get_string(&sess->options, "word-separators");
for (; np != 0; np--)
window_copy_cursor_previous_word(wp, word_separators);
break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
