patch 7.4.1413
Problem: When calling ch_close() the close callback is invoked, even though
the docs say it isn't. (Christian J. Robinson)
Solution: Don't call the close callback.
diff --git a/src/channel.c b/src/channel.c
index 0d46c58..8044c4d 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -312,7 +312,7 @@
void
channel_free(channel_T *channel)
{
- channel_close(channel);
+ channel_close(channel, TRUE);
if (channel->ch_next != NULL)
channel->ch_next->ch_prev = channel->ch_prev;
if (channel->ch_prev == NULL)
@@ -1466,7 +1466,7 @@
* This does not trigger the close callback.
*/
void
-channel_close(channel_T *channel)
+channel_close(channel_T *channel, int invoke_close_cb)
{
ch_log(channel, "Closing channel");
@@ -1497,7 +1497,7 @@
}
#endif
- if (channel->ch_close_cb != NULL)
+ if (invoke_close_cb && channel->ch_close_cb != NULL)
{
typval_T argv[1];
typval_T rettv;
@@ -1757,7 +1757,7 @@
/* TODO: When reading from stdout is not possible, should we try to
* keep stdin and stderr open? Probably not, assume the other side
* has died. */
- channel_close(channel);
+ channel_close(channel, TRUE);
if (channel->ch_nb_close_cb != NULL)
(*channel->ch_nb_close_cb)();