patch 7.4.2080

Problem:    When using PERROR() on some systems assert_fails() does not see
            the error.
Solution:   Make PERROR() always report the error.

diff --git a/src/message.c b/src/message.c
index 7aec2d613a5f08cfbdda1c1ce7cd381a7a4d3a9c..c49429d0eba4e7da57c59c27c040f3e01d2ce3d9 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -521,6 +521,21 @@ emsg_not_now(void)
     return FALSE;
 }
 
+#if !defined(HAVE_STRERROR) || defined(PROTO)
+/*
+ * Replacement for perror() that behaves more or less like emsg() was called.
+ * v:errmsg will be set and called_emsg will be set.
+ */
+    void
+do_perror(char *msg)
+{
+    perror(msg);
+    ++emsg_silent;
+    emsg((char_u *)msg);
+    --emsg_silent;
+}
+#endif
+
 /*
  * emsg() - display an error message
  *

diff --git a/src/proto/message.pro b/src/proto/message.pro
index 27a215de69be404094c20cb2f7eb7956fab7717b..5b7064009679262cc3a6d960d2f5c59faf0bdfd6 100644 (file)
--- a/src/proto/message.pro
+++ b/src/proto/message.pro
@@ -8,6 +8,7 @@ void trunc_string(char_u *s, char_u *buf, int room, int buflen);
 void reset_last_sourcing(void);
 void msg_source(int attr);
 int emsg_not_now(void);
+void do_perror(char *msg);
 int emsg(char_u *s);
 int emsg2(char_u *s, char_u *a1);
 void emsg_invreg(int name);

diff --git a/src/version.c b/src/version.c
index febea0a3d46b38b70183c99a65b00ad1684dd67d..742f78b2952e89c9d1e31f1d4a41d37fe4ce82e7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2080,
 /**/
     2079,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 488f2708438aead6bb9e63e737d50295778b9287..e2d4cc48fa1544a976c6c8c630f8af8e0c9abff6 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1652,7 +1652,7 @@ typedef UINT32_TYPEDEF UINT32_T;
 #ifdef HAVE_STRERROR
 # define PERROR(msg)               (void)emsg3((char_u *)"%s: %s", (char_u *)msg, (char_u *)strerror(errno))
 #else
-# define PERROR(msg)               perror(msg)
+# define PERROR(msg)               do_perror(msg)
 #endif
 
 typedef long   linenr_T;               /* line number type */