Merge branch 'sb/diff-cleanup' into maint

diff --git a/imap-send.c b/imap-send.c
index db0fafee995874824f91cb8378399fcf720d705c..0f5f4760e90de236757924683478c7f25cdb653f 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -511,7 +511,7 @@ static int nfsnprintf(char *buf, int blen, const char *fmt, ...)
 
        va_start(va, fmt);
        if (blen <= 0 || (unsigned)(ret = vsnprintf(buf, blen, fmt, va)) >= (unsigned)blen)
-               die("Fatal: buffer too small. Please report a bug.");
+               die("BUG: buffer too small. Please report a bug.");
        va_end(va);
        return ret;
 }