summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-07 12:22:55 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-07 12:22:55 +0200
commita34293ae0a87a35eb422f145ef999295705f3731 (patch)
tree72fd3fbdc0c36dc5e0ee5348c7973b4d916927d5
parente4f25e4a8db2c8a8a71a4ba2a68540b3ab341e42 (diff)
downloadvim-git-a34293ae0a87a35eb422f145ef999295705f3731.tar.gz
patch 8.0.0694: building in shadow directory does not workv8.0.0694
Problem: Building in shadow directory does not work. Running Vim fails. Solution: Add the new libvterm directory. Add missing change in command list.
-rw-r--r--src/Makefile2
-rw-r--r--src/ex_cmds.h3
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 907fdb127..49a8ef40a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2810,7 +2810,7 @@ SHADOWDIR = shadow
shadow: runtime pixmaps
$(MKDIR_P) $(SHADOWDIR)
- cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../install-sh .
+ cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh .
mkdir $(SHADOWDIR)/auto
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
$(MKDIR_P) $(SHADOWDIR)/po
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 02d5690dc..cde015763 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -1483,6 +1483,9 @@ EX(CMD_tclfile, "tclfile", ex_tclfile,
EX(CMD_tearoff, "tearoff", ex_tearoff,
NEEDARG|EXTRA|TRLBAR|NOTRLCOM|CMDWIN,
ADDR_LINES),
+EX(CMD_terminal, "terminal", ex_terminal,
+ RANGE|NOTADR|EXTRA|TRLBAR|CMDWIN,
+ ADDR_OTHER),
EX(CMD_tfirst, "tfirst", ex_tag,
RANGE|NOTADR|BANG|TRLBAR|ZEROR,
ADDR_LINES),
diff --git a/src/version.c b/src/version.c
index 5051c9ecf..eb237f348 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 694,
+/**/
693,
/**/
692,