5 files changed, 41 insertions, 1 deletions
diff --git a/src/dged/buffer.c b/src/dged/buffer.c
index f2e7eb9..e40281f 100644
--- a/src/dged/buffer.c
+++ b/src/dged/buffer.c
@@ -434,6 +434,34 @@ void buffer_backward_delete_char(struct buffer_view *view) {
   }
 }
 
+void buffer_forward_delete_word(struct buffer_view *view) {
+  if (maybe_delete_region(view)) {
+    return;
+  }
+
+  struct buffer_location start = view->dot;
+  buffer_forward_word(view);
+  struct buffer_location end = view->dot;
+
+  buffer_goto(view, start.line, start.col);
+
+  delete_with_undo(view->buffer, start, end);
+}
+
+void buffer_backward_delete_word(struct buffer_view *view) {
+  if (maybe_delete_region(view)) {
+    return;
+  }
+
+  struct buffer_location end = view->dot;
+  buffer_backward_word(view);
+  struct buffer_location start = view->dot;
+
+  buffer_goto(view, start.line, start.col);
+
+  delete_with_undo(view->buffer, start, end);
+}
+
 void buffer_backward_char(struct buffer_view *view) { moveh(view, -1); }
 void buffer_forward_char(struct buffer_view *view) { moveh(view, 1); }
 
diff --git a/src/dged/buffer.h b/src/dged/buffer.h
index 05b85de..e33733b 100644
--- a/src/dged/buffer.h
+++ b/src/dged/buffer.h
@@ -177,7 +177,9 @@ bool buffer_is_backed(struct buffer *buffer);
 
 void buffer_kill_line(struct buffer_view *view);
 void buffer_forward_delete_char(struct buffer_view *view);
+void buffer_forward_delete_word(struct buffer_view *view);
 void buffer_backward_delete_char(struct buffer_view *view);
+void buffer_backward_delete_word(struct buffer_view *view);
 void buffer_backward_char(struct buffer_view *view);
 void buffer_backward_word(struct buffer_view *view);
 void buffer_forward_char(struct buffer_view *view);
diff --git a/src/main/bindings.c b/src/main/bindings.c
index ec608fd..0e01306 100644
--- a/src/main/bindings.c
+++ b/src/main/bindings.c
@@ -50,6 +50,8 @@ void set_default_buffer_bindings(struct keymap *keymap) {
       BINDING(Ctrl, 'K', "kill-line"),
       BINDING(DELETE, "delete-char"),
       BINDING(Ctrl, 'D', "delete-char"),
+      BINDING(Meta, 'd', "delete-word"),
+      BINDING(Meta, 'D', "backward-delete-word"),
       BINDING(BACKSPACE, "backward-delete-char"),
 
       BINDING(Ctrl, '@', "set-mark"),
diff --git a/src/main/cmds.c b/src/main/cmds.c
index 3b18869..48088b1 100644
--- a/src/main/cmds.c
+++ b/src/main/cmds.c
@@ -415,6 +415,8 @@ void register_global_commands(struct commands *commands,
 BUFFER_WRAPCMD_POS(buffer_kill_line);
 BUFFER_WRAPCMD_POS(buffer_forward_delete_char);
 BUFFER_WRAPCMD_POS(buffer_backward_delete_char);
+BUFFER_WRAPCMD_POS(buffer_forward_delete_word);
+BUFFER_WRAPCMD_POS(buffer_backward_delete_word);
 BUFFER_WRAPCMD_POS(buffer_backward_char);
 BUFFER_WRAPCMD_POS(buffer_backward_word);
 BUFFER_WRAPCMD_POS(buffer_forward_char);
@@ -465,6 +467,8 @@ void register_buffer_commands(struct commands *commands) {
 
   static struct command buffer_commands[] = {
       {.name = "kill-line", .fn = buffer_kill_line_cmd},
+      {.name = "delete-word", .fn = buffer_forward_delete_word_cmd},
+      {.name = "backward-delete-word", .fn = buffer_backward_delete_word_cmd},
       {.name = "delete-char", .fn = buffer_forward_delete_char_cmd},
       {.name = "backward-delete-char", .fn = buffer_backward_delete_char_cmd},
       {.name = "backward-char", .fn = buffer_backward_char_cmd},
diff --git a/src/main/main.c b/src/main/main.c
index 3858682..59a9a59 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -112,7 +112,11 @@ void update_file_watches(struct reactor *reactor) {
   }
 }
 
-void usage() { printf("TODO: print usage\n"); }
+void usage() {
+  printf("dged - a text editor for datagubbar/datagummor!\n");
+  printf("usage: dged [-l/--line line_number] [-e/--end] [-h/--help] "
+         "[filename]\n");
+}
 
 int main(int argc, char *argv[]) {