aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Reed <m.reed@mykolab.com>2015-04-06 19:27:45 -0400
committerMichael Reed <m.reed@mykolab.com>2015-04-10 16:38:11 -0400
commit95b7059d45a33dc5b7cc7410289e2d7f88c45993 (patch)
tree383285025350db8f68a2223f94fed95b0413d23a
parent5bc151c2a401aa2b91adc783b9155895c6a483d1 (diff)
downloadrneovim-95b7059d45a33dc5b7cc7410289e2d7f88c45993.tar.gz
rneovim-95b7059d45a33dc5b7cc7410289e2d7f88c45993.tar.bz2
rneovim-95b7059d45a33dc5b7cc7410289e2d7f88c45993.zip
Remove unused 'if_[language].txt': Review
-rw-r--r--runtime/doc/insert.txt2
-rw-r--r--runtime/doc/nvim_python.txt2
-rw-r--r--runtime/doc/syntax.txt12
-rw-r--r--runtime/syntax/vim.vim7
-rw-r--r--src/nvim/globals.h3
5 files changed, 5 insertions, 21 deletions
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 0b9f958afc..e008fa12fe 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1421,7 +1421,7 @@ automatically switch to HTML/CSS/JavaScript completion. Note: contrary to
original HTML files completion of tags (and only tags) isn't context aware.
-RUBY {Nvim} *ft-ruby-omni*
+RUBY *ft-ruby-omni* {Nvim}
NOTE: Completion for ruby code is not currently provided by Nvim.
diff --git a/runtime/doc/nvim_python.txt b/runtime/doc/nvim_python.txt
index 531036d567..bafcf047dd 100644
--- a/runtime/doc/nvim_python.txt
+++ b/runtime/doc/nvim_python.txt
@@ -35,7 +35,7 @@ Most Python plugins created for Vim 7.3 should work after these steps.
*g:python_host_prog*
-To point Nvim to a specific Python interpreter, set `g:python_host_prog`:
+To point Nvim to a specific Python interpreter, set |g:python_host_prog|:
>
let g:python_host_prog='/path/to/python'
<
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 67e8c177f3..6415b4203f 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -3221,16 +3221,10 @@ The g:vimsyn_embed option allows users to select what, if any, types of
embedded script highlighting they wish to have. >
g:vimsyn_embed == 0 : don't embed any scripts
- g:vimsyn_embed =~ 'm' : support embedded mzscheme
- g:vimsyn_embed =~ 'p' : support embedded perl
g:vimsyn_embed =~ 'P' : support embedded python
- g:vimsyn_embed =~ 'r' : support embedded ruby
- g:vimsyn_embed =~ 't' : support embedded tcl
<
By default, g:vimsyn_embed is a string supporting interpreters that your vim
-itself supports. Concatenate multiple characters to support multiple types
-of embedded interpreters; ie. g:vimsyn_embed= "mp" supports embedded mzscheme
-and embedded perl.
+itself supports.
*g:vimsyn_folding*
Some folding is now supported with syntax/vim.vim: >
@@ -3238,11 +3232,7 @@ Some folding is now supported with syntax/vim.vim: >
g:vimsyn_folding == 0 or doesn't exist: no syntax-based folding
g:vimsyn_folding =~ 'a' : augroups
g:vimsyn_folding =~ 'f' : fold functions
- g:vimsyn_folding =~ 'm' : fold mzscheme script
- g:vimsyn_folding =~ 'p' : fold perl script
g:vimsyn_folding =~ 'P' : fold python script
- g:vimsyn_folding =~ 'r' : fold ruby script
- g:vimsyn_folding =~ 't' : fold tcl script
<
*g:vimsyn_noerror*
Not all error highlighting that syntax/vim.vim does may be correct; VimL is a
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 5f853a1c6d..0842e53492 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -550,14 +550,9 @@ syn region vimGlobal matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' e
" Allows users to specify the type of embedded script highlighting
" they want: (perl/python/ruby/tcl support)
" g:vimsyn_embed == 0 : don't embed any scripts
-" g:vimsyn_embed ~= 'l' : embed lua (but only if vim supports it)
-" g:vimsyn_embed ~= 'm' : embed mzscheme (but only if vim supports it)
-" g:vimsyn_embed ~= 'p' : embed perl (but only if vim supports it)
" g:vimsyn_embed ~= 'P' : embed python (but only if vim supports it)
-" g:vimsyn_embed ~= 'r' : embed ruby (but only if vim supports it)
-" g:vimsyn_embed ~= 't' : embed tcl (but only if vim supports it)
if !exists("g:vimsyn_embed")
- let g:vimsyn_embed= "lmpPr"
+ let g:vimsyn_embed= "P"
endif
" [-- lua --] {{{3
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index b80da7579b..158125c878 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -1124,8 +1124,7 @@ EXTERN char_u e_nesting[] INIT(= N_("E22: Scripts nested too deep"));
EXTERN char_u e_noalt[] INIT(= N_("E23: No alternate file"));
EXTERN char_u e_noabbr[] INIT(= N_("E24: No such abbreviation"));
EXTERN char_u e_nobang[] INIT(= N_("E477: No ! allowed"));
-EXTERN char_u e_nogvim[] INIT(= N_(
- "E25: Nvim does not have built-in GUI"));
+EXTERN char_u e_nogvim[] INIT(= N_("E25: Nvim does not have a built-in GUI"));
EXTERN char_u e_nogroup[] INIT(= N_("E28: No such highlight group name: %s"));
EXTERN char_u e_noinstext[] INIT(= N_("E29: No inserted text yet"));
EXTERN char_u e_nolastcmd[] INIT(= N_("E30: No previous command line"));