From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 12 Mar 2008 12:17:28 +0000 (+0000)
Subject: updated for version 7.1-273
X-Git-Tag: v7.1.273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02f07e0c23bfbadd1952c874d98be057bf194394;p=vim

updated for version 7.1-273
---

diff --git a/src/Makefile b/src/Makefile
index 4ef0a0f56..ae8878c1e 100644
--- 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 07b1f8b0a..1b0ec703e 100644
--- 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 934af0d29..193e8a990 100644
--- 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,
 /**/