# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1451494804 -3600
# Node ID d45f2dbdac8dbbe6220df792567ad69171d7cba4
# Parent  f4bed3aff7501496cd52fce8061bfaf949b71ec3
commit https://github.com/vim/vim/commit/08b7bae91adb79d30d4c923fd758e2f7cecd33ef
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Dec 30 17:56:05 2015 +0100

    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
--- 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
--- 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 */
 /**/
+    1004,
+/**/
     1003,
 /**/
     1002,