neovim: update to 0.1.7.
This commit is contained in:
parent
f52fd368dd
commit
d4922fa987
2 changed files with 3 additions and 74 deletions
srcpkgs/neovim
|
@ -1,71 +0,0 @@
|
||||||
From 177272f1f76565205c5c381bdf7dd020d7c5a5a8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: James McCoy <jamessan@jamessan.com>
|
|
||||||
Date: Sun, 20 Nov 2016 08:42:38 -0700
|
|
||||||
Subject: [PATCH] vim-patch:8.0.0056
|
|
||||||
|
|
||||||
Problem: When setting 'filetype' there is no check for a valid name.
|
|
||||||
Solution: Only allow valid characters in 'filetype', 'syntax' and 'keymap'.
|
|
||||||
|
|
||||||
https://github.com/vim/vim/commit/d0b5138ba4bccff8a744c99836041ef6322ed39a
|
|
||||||
---
|
|
||||||
src/nvim/option.c | 33 ++++++++++++++++++++++++++++-----
|
|
||||||
1 file changed, 28 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git src/nvim/option.c src/nvim/option.c
|
|
||||||
index 5f338ea..24444ee 100644
|
|
||||||
--- src/nvim/option.c
|
|
||||||
+++ src/nvim/option.c
|
|
||||||
@@ -2389,6 +2389,18 @@ static char *set_string_option(const int opt_idx, const char *const value,
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/// Return true if "val" is a valid 'filetype' name.
|
|
||||||
+/// Also used for 'syntax' and 'keymap'.
|
|
||||||
+static bool valid_filetype(char_u *val)
|
|
||||||
+{
|
|
||||||
+ for (char_u *s = val; *s != NUL; s++) {
|
|
||||||
+ if (!ASCII_ISALNUM(*s) && vim_strchr((char_u *)".-_", *s) == NULL) {
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return true;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Handle string options that need some action to perform when changed.
|
|
||||||
* Returns NULL for success, or an error message for an error.
|
|
||||||
@@ -2620,8 +2632,12 @@ did_set_string_option (
|
|
||||||
xfree(p_penc);
|
|
||||||
p_penc = p;
|
|
||||||
} else if (varp == &curbuf->b_p_keymap) {
|
|
||||||
- /* load or unload key mapping tables */
|
|
||||||
- errmsg = keymap_init();
|
|
||||||
+ if (!valid_filetype(*varp)) {
|
|
||||||
+ errmsg = e_invarg;
|
|
||||||
+ } else {
|
|
||||||
+ // load or unload key mapping tables
|
|
||||||
+ errmsg = keymap_init();
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (errmsg == NULL) {
|
|
||||||
if (*curbuf->b_p_keymap != NUL) {
|
|
||||||
@@ -3110,9 +3126,16 @@ did_set_string_option (
|
|
||||||
else if (gvarp == &p_cino) {
|
|
||||||
/* TODO: recognize errors */
|
|
||||||
parse_cino(curbuf);
|
|
||||||
- }
|
|
||||||
- /* Options that are a list of flags. */
|
|
||||||
- else {
|
|
||||||
+ } else if (gvarp == &p_ft) {
|
|
||||||
+ if (!valid_filetype(*varp)) {
|
|
||||||
+ errmsg = e_invarg;
|
|
||||||
+ }
|
|
||||||
+ } else if (gvarp == &p_syn) {
|
|
||||||
+ if (!valid_filetype(*varp)) {
|
|
||||||
+ errmsg = e_invarg;
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ // Options that are a list of flags.
|
|
||||||
p = NULL;
|
|
||||||
if (varp == &p_ww)
|
|
||||||
p = (char_u *)WW_ALL;
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'neovim'
|
# Template file for 'neovim'
|
||||||
pkgname=neovim
|
pkgname=neovim
|
||||||
version=0.1.6
|
version=0.1.7
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DENABLE_JEMALLOC=0"
|
configure_args="-DENABLE_JEMALLOC=0"
|
||||||
hostmakedepends="gperf lua51-lpeg lua51-mpack lua51-BitOp"
|
hostmakedepends="gperf lua51-lpeg lua51-mpack lua51-BitOp"
|
||||||
|
@ -11,7 +11,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
|
||||||
license="Apache-2.0, GPL-2"
|
license="Apache-2.0, GPL-2"
|
||||||
homepage="http://neovim.io"
|
homepage="http://neovim.io"
|
||||||
distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
|
distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
|
||||||
checksum=a9fe7aadd38ef015f82ec340f6b6c0629d02c9ca4d85352db0934ae511d2f02a
|
checksum=d8f885d019b1ad608f36ae23b8f1b15b7e33585e16f7514666ab6c9809bb4b7e
|
||||||
|
|
||||||
# XXX: neovim needs host bin to generate helptags at build time.
|
# XXX: neovim needs host bin to generate helptags at build time.
|
||||||
nocross=yes
|
nocross=yes
|
||||||
|
|
Loading…
Reference in a new issue