summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsabetts <sabetts>2003-05-25 11:01:24 +0000
committersabetts <sabetts>2003-05-25 11:01:24 +0000
commit66bb699a0a4de0102f0c9b9edc785aa303858f35 (patch)
treea7366a0f3ec8e7e7459aab650b04fb828e56b56e
parente6f71abbce1ae8f8dc840b56aa4f3ccd36ebd735 (diff)
downloadratpoison-66bb699a0a4de0102f0c9b9edc785aa303858f35.zip
* src/actions.c (cmd_gmerge): show a message if the group
specified by the user could not be found.
-rw-r--r--ChangeLog3
-rw-r--r--NEWS3
-rw-r--r--src/actions.c6
-rw-r--r--src/actions.h10
4 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ce70955..f43f81c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2003-05-25 Shawn Betts <sabetts@sfu.ca>
+ * src/actions.c (cmd_gmerge): show a message if the group
+ specified by the user could not be found.
+
* src/window.c: do not include ctype.h
* src/ratpoison.h (str_comp): new prototype
diff --git a/NEWS b/NEWS
index 62068ff..08a0d2a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
ratpoison NEWS --- history of user-visible changes. -*- outline -*-
* Changes since 1.2.0-beta5
+** New commands gnewbg, gselect, groups, gmove, and gmerge
+These commands allow further manipulation of window groups.
+
** shell commands return status
If a command the user executed (with the exec command) returns with a
non-zero exit status, the command and exit status are reported in a
diff --git a/src/actions.c b/src/actions.c
index ab9e12e..5516dc5 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -3291,6 +3291,10 @@ cmd_gmerge (int interactive, char *data)
g = find_group (data);
- groups_merge (g, rp_current_group);
+ if (g)
+ groups_merge (g, rp_current_group);
+ else
+ message (" gmerge: Cannot find group ");
+
return NULL;
}
diff --git a/src/actions.h b/src/actions.h
index efc6e76..4629d5a 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -78,10 +78,15 @@ char *cmd_focusup (int interactive, char *data);
char *cmd_frestore (int interactively, char *data);
char *cmd_fselect (int interactive, char *data);
char *cmd_getenv (int interactive, char *data);
+char *cmd_gmerge (int interactive, char *data);
+char *cmd_gmove (int interactive, char *data);
char *cmd_gnew (int interactive, char *data);
+char *cmd_gnewbg (int interactive, char *data);
char *cmd_gnext (int interactive, char *data);
char *cmd_gprev (int interactive, char *data);
char *cmd_gravity (int interactive, char *data);
+char *cmd_groups (int interactive, char *data);
+char *cmd_gselect (int interactive, char *data);
char *cmd_h_split (int interactive, char *data);
char *cmd_help (int interactive, char *data);
char *cmd_info (int interactive, char *data);
@@ -127,11 +132,6 @@ char *cmd_verbexec (int interactive, char *data);
char *cmd_version (int interactive, char *data);
char *cmd_warp(int interactive, char *data);
char *cmd_windows (int interactive, char *data);
-char *cmd_gselect (int interactive, char *data);
-char *cmd_groups (int interactive, char *data);
-char *cmd_gmove (int interactive, char *data);
-char *cmd_gmerge (int interactive, char *data);
-char *cmd_gnewbg (int interactive, char *data);
void initialize_default_keybindings (void);
void free_keybindings ();