From 8458eee0577bce8c479afa0897e7cacf99d3f7d5 Mon Sep 17 00:00:00 2001 From: Paul Ackersviller Date: Mon, 8 Oct 2007 15:44:35 +0000 Subject: Merge of users/10172: read-command reads a key sequence as in normal zle operation but sets REPLY to the result instead of executing it. --- Src/Zle/iwidgets.list | 12 ++++++++---- Src/Zle/zle_keymap.c | 13 +++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'Src/Zle') diff --git a/Src/Zle/iwidgets.list b/Src/Zle/iwidgets.list index bd321e8d4..6bab6995d 100644 --- a/Src/Zle/iwidgets.list +++ b/Src/Zle/iwidgets.list @@ -28,6 +28,7 @@ "clear-screen", clearscreen, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_LASTCOL | ZLE_NOTCOMMAND "complete-word", completeword, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_ISCOMP "copy-prev-word", copyprevword, ZLE_KEEPSUFFIX +"copy-prev-shell-word", copyprevshellword, ZLE_KEEPSUFFIX "copy-region-as-kill", copyregionaskill, ZLE_KEEPSUFFIX "delete-char", deletechar, ZLE_KEEPSUFFIX "delete-char-or-list", deletecharorlist, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_ISCOMP @@ -55,7 +56,7 @@ "expand-word", expandword, 0 "forward-char", forwardchar, 0 "forward-word", forwardword, 0 -"get-line", getline, 0 +"get-line", zgetline, 0 "gosmacs-transpose-chars", gosmacstransposechars, 0 "history-beginning-search-backward", historybeginningsearchbackward, 0 "history-beginning-search-forward", historybeginningsearchforward, 0 @@ -84,8 +85,11 @@ "quoted-insert", quotedinsert, ZLE_MENUCMP | ZLE_KEEPSUFFIX "quote-line", quoteline, 0 "quote-region", quoteregion, 0 +"read-command", readcommand, 0 +"recursive-edit", recursiveedit, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_LASTCOL "redisplay", redisplay, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_LASTCOL -"redo", redo, 0 +"redo", redo, ZLE_KEEPSUFFIX +"reset-prompt", resetprompt, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_LASTCOL "reverse-menu-complete", reversemenucomplete, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_ISCOMP "run-help", processcmd, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_LASTCOL "self-insert", selfinsert, ZLE_MENUCMP | ZLE_KEEPSUFFIX @@ -97,7 +101,7 @@ "transpose-chars", transposechars, 0 "transpose-words", transposewords, 0 "undefined-key", undefinedkey, 0 -"undo", undo, 0 +"undo", undo, ZLE_KEEPSUFFIX "universal-argument", universalargument, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_LASTCOL | ZLE_NOTCOMMAND "up-case-word", upcaseword, 0 "up-history", uphistory, 0 @@ -162,7 +166,7 @@ "vi-set-mark", visetmark, ZLE_MENUCMP | ZLE_KEEPSUFFIX | ZLE_LASTCOL "vi-substitute", visubstitute, 0 "vi-swap-case", viswapcase, 0 -"vi-undo-change", viundochange, 0 +"vi-undo-change", viundochange, ZLE_KEEPSUFFIX "vi-unindent", viunindent, 0 "vi-up-line-or-history", viuplineorhistory, ZLE_LINEMOVE "vi-yank", viyank, 0 diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c index 0077ee1a6..f9a467f6f 100644 --- a/Src/Zle/zle_keymap.c +++ b/Src/Zle/zle_keymap.c @@ -1392,3 +1392,16 @@ zlesetkeymap(int mode) return; linkkeymap(km, "main", 0); } + +/**/ +mod_export int +readcommand(UNUSED(char **args)) +{ + Thingy thingy = getkeycmd(); + + if (!thingy) + return 1; + + setsparam("REPLY", ztrdup(thingy->nam)); + return 0; +} -- cgit 1.4.1