Revision: 2660
http://tmux.svn.sourceforge.net/tmux/?rev=2660&view=rev
Author: tcunha
Date: 2012-01-20 21:17:18 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Sync OpenBSD patchset 998:
Add space movement keys for vi mode in the status line from Ben Boeckel.
Modified Paths:
--------------
trunk/mode-key.c
trunk/status.c
trunk/tmux.h
Modified: trunk/mode-key.c
===================================================================
--- trunk/mode-key.c 2012-01-20 21:16:07 UTC (rev 2659)
+++ trunk/mode-key.c 2012-01-20 21:17:18 UTC (rev 2660)
@@ -54,9 +54,12 @@
{ MODEKEYEDIT_ENTER, "enter" },
{ MODEKEYEDIT_HISTORYDOWN, "history-down" },
{ MODEKEYEDIT_HISTORYUP, "history-up" },
+ { MODEKEYEDIT_NEXTSPACE, "next-space" },
+ { MODEKEYEDIT_NEXTSPACEEND, "next-space-end" },
{ MODEKEYEDIT_NEXTWORD, "next-word" },
{ MODEKEYEDIT_NEXTWORDEND, "next-word-end" },
{ MODEKEYEDIT_PASTE, "paste" },
+ { MODEKEYEDIT_PREVIOUSSPACE, "previous-space" },
{ MODEKEYEDIT_PREVIOUSWORD, "previous-word" },
{ MODEKEYEDIT_STARTOFLINE, "start-of-line" },
{ MODEKEYEDIT_SWITCHMODE, "switch-mode" },
@@ -148,7 +151,10 @@
{ '$', 1, MODEKEYEDIT_ENDOFLINE },
{ '0', 1, MODEKEYEDIT_STARTOFLINE },
+ { 'B', 1, MODEKEYEDIT_PREVIOUSSPACE },
{ 'D', 1, MODEKEYEDIT_DELETETOENDOFLINE },
+ { 'E', 1, MODEKEYEDIT_NEXTSPACEEND },
+ { 'W', 1, MODEKEYEDIT_NEXTSPACE },
{ 'X', 1, MODEKEYEDIT_BACKSPACE },
{ '\003' /* C-c */, 1, MODEKEYEDIT_CANCEL },
{ '\010' /* C-h */, 1, MODEKEYEDIT_BACKSPACE },
Modified: trunk/status.c
===================================================================
--- trunk/status.c 2012-01-20 21:16:07 UTC (rev 2659)
+++ trunk/status.c 2012-01-20 21:17:18 UTC (rev 2660)
@@ -978,7 +978,7 @@
struct paste_buffer *pb;
char *s, *first, *last, word[64], swapc;
const char *histstr;
- const char *wsep;
+ const char *wsep = NULL;
u_char ch;
size_t size, n, off, idx;
@@ -1124,8 +1124,12 @@
c->prompt_index = idx;
c->flags |= CLIENT_STATUS;
break;
+ case MODEKEYEDIT_NEXTSPACE:
+ wsep = " ";
+ /* FALLTHROUGH */
case MODEKEYEDIT_NEXTWORD:
- wsep = options_get_string(oo, "word-separators");
+ if (wsep == NULL)
+ wsep = options_get_string(oo, "word-separators");
/* Find a separator. */
while (c->prompt_index != size) {
@@ -1143,8 +1147,12 @@
c->flags |= CLIENT_STATUS;
break;
+ case MODEKEYEDIT_NEXTSPACEEND:
+ wsep = " ";
+ /* FALLTHROUGH */
case MODEKEYEDIT_NEXTWORDEND:
- wsep = options_get_string(oo, "word-separators");
+ if (wsep == NULL)
+ wsep = options_get_string(oo, "word-separators");
/* Find a word. */
while (c->prompt_index != size) {
@@ -1162,8 +1170,12 @@
c->flags |= CLIENT_STATUS;
break;
+ case MODEKEYEDIT_PREVIOUSSPACE:
+ wsep = " ";
+ /* FALLTHROUGH */
case MODEKEYEDIT_PREVIOUSWORD:
- wsep = options_get_string(oo, "word-separators");
+ if (wsep == NULL)
+ wsep = options_get_string(oo, "word-separators");
/* Find a non-separator. */
while (c->prompt_index != 0) {
Modified: trunk/tmux.h
===================================================================
--- trunk/tmux.h 2012-01-20 21:16:07 UTC (rev 2659)
+++ trunk/tmux.h 2012-01-20 21:17:18 UTC (rev 2660)
@@ -443,9 +443,12 @@
MODEKEYEDIT_ENTER,
MODEKEYEDIT_HISTORYDOWN,
MODEKEYEDIT_HISTORYUP,
+ MODEKEYEDIT_NEXTSPACE,
+ MODEKEYEDIT_NEXTSPACEEND,
MODEKEYEDIT_NEXTWORD,
MODEKEYEDIT_NEXTWORDEND,
MODEKEYEDIT_PASTE,
+ MODEKEYEDIT_PREVIOUSSPACE,
MODEKEYEDIT_PREVIOUSWORD,
MODEKEYEDIT_STARTOFLINE,
MODEKEYEDIT_SWITCHMODE,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
