ctrl+d should execute the selection if there is one

diff --git a/inc/edit.h b/inc/edit.h
index f5e2de8b49e12b2c59a73449f218c7b459859996..6a7327c1d55351e6c48a6411ba96931628076eee 100644 (file)
--- a/inc/edit.h
+++ b/inc/edit.h
@@ -175,6 +175,7 @@ void view_indent(View* view, int dir);
 size_t view_selsize(View* view);
 void view_selprev(View* view);
 void view_setcursor(View* view, size_t row, size_t col);
+void view_selext(View* view, size_t row, size_t col);
 void view_selextend(View* view, size_t row, size_t col);
 void view_selword(View* view, size_t row, size_t col);
 void view_select(View* view, size_t row, size_t col);

diff --git a/lib/view.c b/lib/view.c
index c51a1f5984c6edf00621a639e4b5976f3a12cb3e..36511ae45a3619973e66320467aaeb9f85a532bf 100644 (file)
--- a/lib/view.c
+++ b/lib/view.c
@@ -297,14 +297,6 @@ void view_selext(View* view, size_t row, size_t col) {
     }
 }
 
-static void selbigword(View* view, Sel* sel) {
-    Buf* buf = &(view->buffer);
-    size_t mbeg = sel->end, mend = sel->end;
-    for (; !risblank(buf_get(buf, mbeg-1)); mbeg--);
-    for (; !risblank(buf_get(buf, mend));   mend++);
-    sel->beg = mbeg, sel->end = mend-1;
-}
-
 static void selcontext(View* view, Sel* sel) {
     Buf* buf = &(view->buffer);
     size_t bol = buf_bol(buf, sel->end);
@@ -543,8 +535,10 @@ char* view_getstr(View* view, Sel* range) {
 
 char* view_getcmd(View* view) {
     Sel sel = view->selection;
-    buf_getword(&(view->buffer), riscmd, &sel);
-    sel.end++;
+    if (!num_selected(sel)) {
+        buf_getword(&(view->buffer), riscmd, &sel);
+        sel.end++;
+    }
     return view_getstr(view, &sel);
 }