summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS5
-rw-r--r--src/actions.c14
3 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a0f6d87..a37bd60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-18 Shawn Betts <sabetts@vcn.bc.ca>
+
+ * src/actions.c (cmd_v_split, cmd_h_split): swap names.
+ (user_commands): bind split to cmd_v_split.
+
2004-04-03 Shawn Betts <sabetts@vcn.bc.ca>
* src/main.c (init_defaults): init frame_selectors.
diff --git a/NEWS b/NEWS
index e0a9428..766fefe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
ratpoison NEWS --- history of user-visible changes. -*- outline -*-
* Changes since 1.3.0-rc2
+** hsplit and vsplit switched
+To be compatible with emacs these command names have been
+switched. The bindings are the same but custom scripts and aliases
+will have to make the switch.
+
** new command defframesels
Allow you to customize the keys used to select frames with fselect.
diff --git a/src/actions.c b/src/actions.c
index 23413fb..79e290e 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -67,7 +67,7 @@ static user_command user_commands[] =
{"rudeness", cmd_rudeness, arg_STRING},
{"select", cmd_select, arg_STRING},
{"source", cmd_source, arg_STRING},
- {"split", cmd_h_split, arg_STRING},
+ {"split", cmd_v_split, arg_STRING},
{"title", cmd_rename, arg_STRING},
{"version", cmd_version, arg_VOID},
{"vsplit", cmd_v_split, arg_STRING},
@@ -428,8 +428,8 @@ initialize_default_keybindings (void)
add_keybinding (XK_w, RP_CONTROL_MASK, "windows", map);
add_keybinding (XK_s, 0, "split", map);
add_keybinding (XK_s, RP_CONTROL_MASK, "split", map);
- add_keybinding (XK_S, 0, "vsplit", map);
- add_keybinding (XK_S, RP_CONTROL_MASK, "vsplit", map);
+ add_keybinding (XK_S, 0, "hsplit", map);
+ add_keybinding (XK_S, RP_CONTROL_MASK, "hsplit", map);
add_keybinding (XK_Tab, 0, "focus", map);
add_keybinding (XK_Tab, RP_META_MASK, "focuslast", map);
add_keybinding (XK_Q, 0, "only", map);
@@ -1591,7 +1591,7 @@ read_split (const char *str, int max)
}
char *
-cmd_h_split (int interactive, char *data)
+cmd_v_split (int interactive, char *data)
{
rp_frame *frame;
int pixels;
@@ -1607,13 +1607,13 @@ cmd_h_split (int interactive, char *data)
if (pixels > 0)
h_split_frame (frame, pixels);
else
- message (" hsplit: invalid argument ");
+ message (" vsplit: invalid argument ");
return NULL;
}
char *
-cmd_v_split (int interactive, char *data)
+cmd_h_split (int interactive, char *data)
{
rp_frame *frame;
int pixels;
@@ -1629,7 +1629,7 @@ cmd_v_split (int interactive, char *data)
if (pixels > 0)
v_split_frame (frame, pixels);
else
- message (" vsplit: invalid argument ");
+ message (" hsplit: invalid argument ");
return NULL;
}