Merge branch 'jc/capabilities' into maint

diff --git a/test-line-buffer.c b/test-line-buffer.c
index 7ec9b13c9b2ceb84fb6dd0dd229e9f6cb8c1a635..ef1d7bae1441e07b6cb74e83a23d07b4720a8ebf 100644 (file)
--- a/test-line-buffer.c
+++ b/test-line-buffer.c
@@ -87,6 +87,5 @@ int main(int argc, char *argv[])
                die("input error");
        if (ferror(stdout))
                die("output error");
-       buffer_reset(&stdin_buf);
        return 0;
 }