]> git.neil.brown.name Git - edlib.git/commitdiff
popup: capture "Return" rather than "Replace".
authorNeilBrown <neil@brown.name>
Mon, 23 Nov 2015 05:57:04 +0000 (16:57 +1100)
committerNeilBrown <neil@brown.name>
Mon, 23 Nov 2015 05:57:04 +0000 (16:57 +1100)
I don't recall why I did this, maybe it was back when the Return
would have looked like emacs-Return or vi-Return.

anyway, this makes more sense now.

Signed-off-by: NeilBrown <neil@brown.name>
lib-popup.c

index 714b6d6841add2f41eebbdeb9620687dd8adc51b..48498535af8f440a35147c86c10c1a27bb91b20a 100644 (file)
@@ -79,10 +79,8 @@ DEF_CMD(popup_handle)
                pane_close(ppi->popup);
                return 1;
        }
-       if (strcmp(ci->key, "popup:Replace") == 0) {
+       if (strcmp(ci->key, "popup:Return") == 0) {
                struct cmd_info ci2 = {0};
-               if (ci->str == NULL || ci->str[0] != '\n')
-                       return 0;
 
                pane_focus(ppi->target);
                ci2.focus = ppi->target;
@@ -108,8 +106,8 @@ DEF_CMD(popup_quote)
 {
        struct cmd_info ci2 = *ci;
 
-       if (strcmp(ci->key, "Replace") == 0)
-               ci2.key = "popup:Replace";
+       if (strcmp(ci->key, "Return") == 0)
+               ci2.key = "popup:Return";
        else
                ci2.key = "popup:Abort";
        return key_handle_focus(&ci2);
@@ -173,7 +171,7 @@ DEF_CMD(popup_attach)
        ci2.key = "local-set-key";
        ci2.focus = p;
        ci2.str = "popup:quote";
-       ci2.str2 = "Replace";
+       ci2.str2 = "Return";
        key_handle_focus(&ci2);
        ci2.str2 = "Abort";
        key_handle_focus(&ci2);