aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKillTheMule <KillTheMule@users.noreply.github.com>2016-09-17 16:24:49 +0200
committerKillTheMule <KillTheMule@users.noreply.github.com>2016-09-17 16:47:21 +0200
commit89a7a4f02c35e414bc0bd33560738c9cf0abe33e (patch)
tree19cf356658e4896d235cfd002a1f5884d1d24646
parent0b3ec84840d9af7967b74d4204dbaaa03d003999 (diff)
downloadrneovim-89a7a4f02c35e414bc0bd33560738c9cf0abe33e.tar.gz
rneovim-89a7a4f02c35e414bc0bd33560738c9cf0abe33e.tar.bz2
rneovim-89a7a4f02c35e414bc0bd33560738c9cf0abe33e.zip
vim-patch:7.4.2284
Problem: Comment in scope header file is outdated. (KillTheMule) Solution: Point to the help instead. (closes vim/vim#1017) https://github.com/vim/vim/commit/f4145d8e990a72bdfea9db3110a7e42a0ff4240c
-rw-r--r--src/nvim/if_cscope_defs.h13
-rw-r--r--src/nvim/version.c1
2 files changed, 2 insertions, 12 deletions
diff --git a/src/nvim/if_cscope_defs.h b/src/nvim/if_cscope_defs.h
index 8cd74c74e6..f9d06eaea3 100644
--- a/src/nvim/if_cscope_defs.h
+++ b/src/nvim/if_cscope_defs.h
@@ -25,18 +25,7 @@
#define CSCOPE_DBFILE "cscope.out"
#define CSCOPE_PROMPT ">> "
-/*
- * s 0name Find this C symbol
- * g 1name Find this definition
- * d 2name Find functions called by this function
- * c 3name Find functions calling this function
- * t 4string find text string (cscope 12.9)
- * t 4name Find assignments to (cscope 13.3)
- * 5pattern change pattern -- NOT USED
- * e 6pattern Find this egrep pattern
- * f 7name Find this file
- * i 8name Find files #including this file
- */
+// See ":help cscope-find" for the possible queries.
typedef struct {
char * name;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 448f5908af..f28bffa91d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -75,6 +75,7 @@ static char *features[] = {
// clang-format off
static int included_patches[] = {
+ 2284,
2219,
// 2200,
// 2199,