diff options
| author | Michael Forney <mforney@mforney.org> | 2017-04-14 12:13:02 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-04-14 12:13:02 -0700 |
| commit | 7bc15ef01d331eec0fdbced852dc5311613d5a55 (patch) | |
| tree | e17ce9d933724335117f9c198b9d74350b452b8e /pkg | |
| parent | c4866bddef25baeb9e4d94e694fe51523956126d (diff) | |
loksh: Update to 6.1
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch | 37 | ||||
| -rw-r--r-- | pkg/loksh/rev | 2 | ||||
| m--------- | pkg/loksh/src | 0 |
3 files changed, 1 insertions, 38 deletions
diff --git a/pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch b/pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch deleted file mode 100644 index 44f96f35..00000000 --- a/pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 34a09675724c2d4f13f21b4f5663c098fe955090 Mon Sep 17 00:00:00 2001 -From: schwarze <schwarze@openbsd.org> -Date: Tue, 9 Aug 2016 11:04:46 +0000 -Subject: [PATCH] In emacs incremental search mode (^R), make commands starting - with the escape key (^[) work as documented. Long-standing bug, this time - reported by Dave minus Cohen dot com. OK natano@ halex@ - ---- - emacs.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/emacs.c b/emacs.c -index 51d1ab0..2f82b5b 100644 ---- a/emacs.c -+++ b/emacs.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: emacs.c,v 1.65 2016/01/26 17:39:31 mmcc Exp $ */ -+/* $OpenBSD: emacs.c,v 1.66 2016/08/09 11:04:46 schwarze Exp $ */ - - /* - * Emacs-like command line editing and history -@@ -893,9 +893,10 @@ x_search_hist(int c) - if ((c = x_e_getc()) < 0) - return KSTD; - f = kb_find_hist_func(c); -- if (c == CTRL('[')) -+ if (c == CTRL('[')) { -+ x_e_ungetc(c); - break; -- else if (f == x_search_hist) -+ } else if (f == x_search_hist) - offset = x_search(pat, 0, offset); - else if (f == x_del_back) { - if (p == pat) { --- -2.10.1 - diff --git a/pkg/loksh/rev b/pkg/loksh/rev index b8626c4c..7ed6ff82 100644 --- a/pkg/loksh/rev +++ b/pkg/loksh/rev @@ -1 +1 @@ -4 +5 diff --git a/pkg/loksh/src b/pkg/loksh/src -Subproject 2aee3b9058afb5a9fbacc2b9d9b7eb1b24288dc +Subproject a253565372e1651ddd3d6acc2ca4954ed319680 |