summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-03 22:51:16 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-03 22:51:16 +0100
commitd7a08a23bf210147e846c74af570bd219e4903da (patch)
treeaeea2acbfc1b4c34a3df432349acb238559d2599
parented767a2073ef150971b0439a58e7ee582af6984e (diff)
downloadvim-git-d7a08a23bf210147e846c74af570bd219e4903da.tar.gz
patch 7.4.1043v7.4.1043
Problem: Another small thing. Solution: Now really update the Mac install text.
-rw-r--r--src/INSTALLmac.txt15
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 5 deletions
diff --git a/src/INSTALLmac.txt b/src/INSTALLmac.txt
index 81ad970fe..e957682a1 100644
--- a/src/INSTALLmac.txt
+++ b/src/INSTALLmac.txt
@@ -3,9 +3,13 @@ INSTALLmac.txt - Installation of Vim on Macintosh
This file contains instructions for compiling Vim. If you already have an
executable version of Vim, you don't need this.
-An alternate way of building that Benji Fisher uses can be found here:
+First, make sure you've installed Xcode or CommandLineToots. If not, open a
+terminal and do
+
+ $ make --version
+
+A window pops up instructing you to install the developer tools.
- http://macvim.swdev.org/OSX/#Developers
----------------------------------------------------------------------------
Summary
@@ -30,11 +34,12 @@ MacOS Classic is no longer supported. If you really want it use Vim 6.4.
You can compile vim with the standard Unix routine:
cd .../src
make
+ make test
+ sudo make install
- This will create a working Vim.app application bundle in the src
+ "make" will create a working Vim.app application bundle in the src
directory. You can move this bundle (the Vim.app directory) anywhere
- you want. Or use this command to move it to /Applications:
- make install
+ you want. Or use "make install" to move it to /Applications.
You need at least Xcode 1.5 to compile Vim 7.0.
diff --git a/src/version.c b/src/version.c
index 821b1bb0a..64ecb5fd9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1043,
+/**/
1042,
/**/
1041,