summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--src/actions.c12
2 files changed, 19 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 5782de7..44729f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,19 @@
-2005-01-30 Shawn Betts <katia_dilkina@verizon.net>
+2005-02-04 Shawn Betts <sabetts@vcn.bc.ca>
+
+ * src/actions.c (set_winname): return the cmdret created.
+ (cmd_unalias): likewise
+ (cmd_nextscreen): likewise
+ (cmd_prevscreen): likewise
+ (cmd_gdelete): likewise
+
+2005-01-30 Shawn Betts <sabetts@vcn.bc.ca>
* src/actions.c (cmd_escape): when the escape key doesn't have a
modifier give the meta key a modifier.
(cmd_undefinekey): call XSync after ungrabbing and grabbing all
keys.
-2005-01-22 Shawn Betts <katia_dilkina@verizon.net>
+2005-01-22 Shawn Betts <sabetts@vcn.bc.ca>
* src/actions.h (argtype): add arg_RAW
@@ -20,15 +28,15 @@
nargs when the argtype is arg_RAW, too.
(cmd_set): set nargs when the argtype is arg_RAW, too.
-2005-01-20 Shawn Betts <katia_dilkina@verizon.net>
+2005-01-20 Shawn Betts <sabetts@vcn.bc.ca>
* src/actions.c (init_user_commands): fix unmanage command.
-2005-01-19 Shawn Betts <katia_dilkina@verizon.net>
+2005-01-19 Shawn Betts <sabetts@vcn.bc.ca>
* contrib/genrpbindings: add python bindings.
-2005-01-17 Shawn Betts <katia_dilkina@verizon.net>
+2005-01-17 Shawn Betts <sabetts@vcn.bc.ca>
* src/frame.c (frame_read): remove space in "(frame " string.
diff --git a/src/actions.c b/src/actions.c
index 9ed0aee..8c83e60 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -3542,7 +3542,7 @@ set_winname (struct cmdarg **args)
else if (!strncmp (name, "class", 5))
defaults.win_name = WIN_NAME_RES_CLASS;
else
- cmdret_new ("defwinname: invalid argument", RET_FAILURE);
+ return cmdret_new ("defwinname: invalid argument", RET_FAILURE);
return cmdret_new (NULL, RET_SUCCESS);
}
@@ -3880,7 +3880,7 @@ cmd_unalias (int interactive, struct cmdarg **args)
free (alias_list[alias_list_last].name);
}
else
- cmdret_new ("unalias: alias not found", RET_SUCCESS);
+ return cmdret_new ("unalias: alias not found", RET_SUCCESS);
return cmdret_new (NULL, RET_SUCCESS);
}
@@ -3892,7 +3892,7 @@ cmd_nextscreen (int interactive, struct cmdarg **args)
/* No need to go through the motions when we don't have to. */
if (num_screens <= 1)
- cmdret_new ("nextscreen: no other screen", RET_FAILURE);
+ return cmdret_new ("nextscreen: no other screen", RET_FAILURE);
new_screen = rp_current_screen + 1;
if (new_screen >= num_screens)
@@ -3910,7 +3910,7 @@ cmd_prevscreen (int interactive, struct cmdarg **args)
/* No need to go through the motions when we don't have to. */
if (num_screens <= 1)
- cmdret_new ("prevscreen: no other screen", RET_SUCCESS);
+ return cmdret_new ("prevscreen: no other screen", RET_SUCCESS);
new_screen = rp_current_screen - 1;
if (new_screen < 0)
@@ -4568,10 +4568,10 @@ cmd_gdelete (int interactive, struct cmdarg **args)
case GROUP_DELETE_GROUP_OK:
break;
case GROUP_DELETE_GROUP_NONEMPTY:
- cmdret_new ("gdelete: non-empty group", RET_FAILURE);
+ return cmdret_new ("gdelete: non-empty group", RET_FAILURE);
break;
default:
- cmdret_new ("gdelete: unknown return code (this shouldn't happen)", RET_FAILURE);
+ return cmdret_new ("gdelete: unknown return code (this shouldn't happen)", RET_FAILURE);
}
return cmdret_new (NULL, RET_SUCCESS);