updated for version 7.1-273

diff --git a/src/Makefile b/src/Makefile
index 4ef0a0f56c577c7fb569e23851194cbe15251728..ae8878c1ec0d48256ce5f1ce711da9e1d94a8655 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -545,7 +545,7 @@ LINT_OPTIONS = -beprxzF
 # For unknown reasons adding "-lc" fixes a linking problem with GCC.  That's
 # probably a bug in the "-pg" implementation.
 # Need to recompile everything after changing this: "make clean" "make".
-#PROFILE_CFLAGS = -pg -g
+#PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING
 #PROFILE_LIBS = -pg
 #PROFILE_LIBS = -pg -lc
 

diff --git a/src/os_unix.c b/src/os_unix.c
index 07b1f8b0adbf920d08d64a2cbd99850ca6461770..1b0ec703ee642101a6c7c79bb648a022232d1982 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -269,8 +269,9 @@ static struct signalinfo
 #ifdef SIGVTALRM
     {SIGVTALRM,            "VTALRM",   TRUE},
 #endif
-#if defined(SIGPROF) && !defined(FEAT_MZSCHEME)
-    /* MzScheme uses SIGPROF for its own needs */
+#if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING)
+    /* MzScheme uses SIGPROF for its own needs; On Linux with profiling
+     * this makes Vim exit.  WE_ARE_PROFILING is defined in Makefile.  */
     {SIGPROF,      "PROF",     TRUE},
 #endif
 #ifdef SIGXCPU

diff --git a/src/version.c b/src/version.c
index 934af0d29fe6f17339d5dfb8ad93c6fdcf8c60a8..193e8a9909dfb01f42b86986550bfc2946186a9e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    273,
 /**/
     272,
 /**/