Fix merge conflicts in network-stream-tests.el

[gnu-emacs] / src / lisp.h

diff --git a/src/lisp.h b/src/lisp.h
index 8aa286159d7d6c0dd3f3434c08bd51068bd86361..18d986441f0bdcec7d3a50d2135089417fb18da6 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3906,6 +3906,8 @@ extern Lisp_Object unbind_to (ptrdiff_t, Lisp_Object);
 extern _Noreturn void error (const char *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2);
 extern _Noreturn void verror (const char *, va_list)
   ATTRIBUTE_FORMAT_PRINTF (1, 0);
+extern Lisp_Object vformat_string (const char *, va_list)
+  ATTRIBUTE_FORMAT_PRINTF (1, 0);
 extern void un_autoload (Lisp_Object);
 extern Lisp_Object call_debugger (Lisp_Object arg);
 extern void *near_C_stack_top (void);