From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 30 Dec 2015 16:56:05 +0000 (+0100)
Subject: patch 7.4.1004
X-Git-Tag: v7.4.1004
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08b7bae91adb79d30d4c923fd758e2f7cecd33ef;p=vim

patch 7.4.1004
Problem:    Using Makefile when auto/config.mk does not exists results in
            warnings.
Solution:   Use default values for essential variables.
---

diff --git a/src/Makefile b/src/Makefile
index 522678cd6..e3b8c9fcc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -281,6 +281,12 @@ CC=
 #GUI_LIB_LOC = -L/usr/X11R6/lib
 # }}}
 
+# Defaults used when auto/config.mk does not exist.
+srcdir = .
+VIMNAME = vim
+EXNAME = ex
+VIEWNAME = view
+
 ######################## auto/config.mk ######################## {{{1
 # At this position auto/config.mk is included. When starting from the
 # toplevel Makefile it is almost empty. After running auto/configure it
diff --git a/src/version.c b/src/version.c
index dc25a8254..07ac05fa8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1004,
 /**/
     1003,
 /**/