From 7bc15ef01d331eec0fdbced852dc5311613d5a55 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 14 Apr 2017 12:13:02 -0700
Subject: loksh: Update to 6.1

---
 ...cremental-search-mode-R-make-commands-sta.patch | 37 ----------------------
 pkg/loksh/rev                                      |  2 +-
 pkg/loksh/src                                      |  2 +-
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch

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
index 2aee3b90..a2535653 160000
--- a/pkg/loksh/src
+++ b/pkg/loksh/src
@@ -1 +1 @@
-Subproject commit 2aee3b9058afb5a9fbacc2b9d9b7eb1b24288dc5
+Subproject commit a253565372e1651ddd3d6acc2ca4954ed319680f
-- 
cgit v1.2.3