From ea786e428a7f553af31231cb0b3ca860d81a9f02 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Tue, 4 Jun 2013 18:01:05 +0200
Subject: [PATCH] m_delete returns the value
---
lib/modules/Stdio.pmod/Readline.pike | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/modules/Stdio.pmod/Readline.pike b/lib/modules/Stdio.pmod/Readline.pike
index 9c7a9159b5..a2fd664eb8 100644
--- a/lib/modules/Stdio.pmod/Readline.pike
+++ b/lib/modules/Stdio.pmod/Readline.pike
@@ -620,17 +620,13 @@ class InputController
case 1:
if (mappingp(bindings[str[0]]))
{
- oldf = bindings[str[0]][str];
+ oldf = m_delete(bindings[str[0]], str);
if (f)
bindings[str[0]][str] = f;
- else
- m_delete(bindings[str[0]], str);
} else {
- oldf = bindings[str[0]];
+ oldf = m_delete(bindings, str[0]);
if (f)
bindings[str[0]] = f;
- else
- m_delete(bindings, str[0]);
}
break;
default:
--
GitLab