Skip to content

Commit

Permalink
Updated runtime files.
Browse files Browse the repository at this point in the history
  • Loading branch information
brammool committed Dec 30, 2011
1 parent 1a79389 commit a99ae26
Show file tree
Hide file tree
Showing 35 changed files with 453 additions and 251 deletions.
7 changes: 6 additions & 1 deletion runtime/autoload/ccomplete.vim
@@ -1,8 +1,10 @@
" Vim completion script
" Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2010 Mar 23
" Last Change: 2011 Dec 30

let s:cpo_save = &cpo
set cpo&vim

" This function is used for the 'omnifunc' option.
function! ccomplete#Complete(findstart, base)
Expand Down Expand Up @@ -603,3 +605,6 @@ function! s:SearchMembers(matches, items, all)
endfor
return res
endfunc

let &cpo = s:cpo_save
unlet s:cpo_save
2 changes: 1 addition & 1 deletion runtime/compiler/gcc.vim
Expand Up @@ -9,7 +9,7 @@ endif
let current_compiler = "gcc"

let s:cpo_save = &cpo
set cpo-=C
set cpo&vim

CompilerSet errorformat=
\%*[^\"]\"%f\"%*\\D%l:%c:\ %m,
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/rst.vim
Expand Up @@ -9,7 +9,7 @@ endif
let current_compiler = "rst"

let s:cpo_save = &cpo
set cpo-=C
set cpo&vim

setlocal errorformat=
\%f:%l:\ (%tEBUG/0)\ %m,
Expand Down
7 changes: 4 additions & 3 deletions runtime/doc/eval.txt
@@ -1,4 +1,4 @@
*eval.txt* For Vim version 7.3. Last change: 2011 Dec 14
*eval.txt* For Vim version 7.3. Last change: 2011 Dec 19


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -3941,11 +3941,12 @@ line2byte({lnum}) *line2byte()*
Return the byte count from the start of the buffer for line
{lnum}. This includes the end-of-line character, depending on
the 'fileformat' option for the current buffer. The first
line returns 1.
line returns 1. 'encoding' matters, 'fileencoding' is ignored.
This can also be used to get the byte count for the line just
below the last line: >
line2byte(line("$") + 1)
< This is the file size plus one.
< This is the buffer size plus one. If 'fileencoding' is empty
it is the file size plus one.
When {lnum} is invalid, or the |+byte_offset| feature has been
disabled at compile time, -1 is returned.
Also see |byte2line()|, |go| and |:goto|.
Expand Down
4 changes: 2 additions & 2 deletions runtime/doc/options.txt
@@ -1,4 +1,4 @@
*options.txt* For Vim version 7.3. Last change: 2011 Dec 14
*options.txt* For Vim version 7.3. Last change: 2011 Dec 15


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -5059,7 +5059,7 @@ A jump table for the options with a short description can be found at |Q_op|.
respectively; see |CTRL-A| for more info on these commands.
alpha If included, single alphabetical characters will be
incremented or decremented. This is useful for a list with a
letter index a), b), etc. *octal-number*
letter index a), b), etc. *octal-nrformats*
octal If included, numbers that start with a zero will be considered
to be octal. Example: Using CTRL-A on "007" results in "010".
hex If included, numbers starting with "0x" or "0X" will be
Expand Down
11 changes: 4 additions & 7 deletions runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
*syntax.txt* For Vim version 7.3. Last change: 2011 Nov 26
*syntax.txt* For Vim version 7.3. Last change: 2011 Dec 30


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -1603,11 +1603,6 @@ which are used for the statement itself, special characters used in debug
strings, strings, boolean constants and types (this, super) respectively. I
have opted to chose another background for those statements.

In order to help you write code that can be easily ported between Java and
C++, all C++ keywords can be marked as an error in a Java program. To
have this add this line in your .vimrc file: >
:let java_allow_cpp_keywords = 0
Javadoc is a program that takes special comments out of Java program files and
creates HTML pages. The standard configuration will highlight this HTML code
similarly to HTML files (see |html.vim|). You can even add Javascript
Expand Down Expand Up @@ -2775,7 +2770,9 @@ of specialized LaTeX commands, syntax, and fonts. If you're using such a
package you'll often wish that the distributed syntax/tex.vim would support
it. However, clearly this is impractical. So please consider using the
techniques in |mysyntaxfile-add| to extend or modify the highlighting provided
by syntax/tex.vim.
by syntax/tex.vim. Please consider uploading any extensions that you write,
which typically would go in $HOME/after/syntax/tex/[pkgname].vim, to
http://vim.sf.net/.

*tex-error*
Tex: Excessive Error Highlighting? ~
Expand Down
49 changes: 38 additions & 11 deletions runtime/doc/todo.txt
@@ -1,4 +1,4 @@
*todo.txt* For Vim version 7.3. Last change: 2011 Dec 14
*todo.txt* For Vim version 7.3. Last change: 2011 Dec 30


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -38,14 +38,31 @@ Go through more coverity reports.

Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)

Patch to fix crash with EXITFREE. (Dominique Pelle, 2011 Dec 20)

Patch to fix "Console prompts fail to reset the console pager".
Issue 14 on googlecode

Issue 33 on googlecode: feedkeys() leaks memory.

Patch for Mac using NULL pointer. (Bjorn Winckler, 2011 Dec 18)

Patch to support UTF-8 for Hangul. (Shawn Y.H. Kim, 2011 May 1)
Needs more work.

Issue 43: patch with new C keywords.

When setting 'undofile' while the file is already loaded, but unchanged, try
to read the undo file. Requires computing a checksum of the text. (Andy
Wokula)
Patch from Christian Brabandt, 2011 Dec 22. Dec 24 with test.

Patch for Vim moving to another window when resizing. (Yukihiro Nakadaira,
2011 Dec 18)

Compilation problem on z/OS, POUND is equal to '#', duplicate case.
(Stephen Bovy, 2011 Dec 16)

Once syntax and other runtime files have been fixed: add "set cp" to
check.vim. Use a function to run both with 'cp' and 'nocp'.

Expand Down Expand Up @@ -82,6 +99,10 @@ Patch to highlight cursor line number. (Howard Buchholz (lhb), 2011 Oct 18)

Patch for urxvt mouse support after shell command. (Issue 31)

When exiting with unsaved changes, selecting an existing file in the file
dialog, there is no dialog to ask whether the existing file should be
overwritten. (Felipe G. Nievinski, 2011 Dec 22)

7 Setting an option always sets "w_set_curswant", while this is only
required for a few options. Only do it for those options to avoid the
side effect.
Expand All @@ -91,6 +112,8 @@ Patch for option in 'cino' to specify more indent for continued conditions.
(Lech Lorens, 2011 Nov 27)
Isn't this already possible?

Patch for using objcpp file type for headers files. Issue 44.

Docs fix for v:register. (Ingo Karkat, 2011 Sep 26, 27)
v:register doesn't work exactly as expected. (David Fishburn, 2011 Sep 20)

Expand All @@ -104,6 +127,9 @@ Patch for: (Christian Brabandt, 2011 Aug 24, updated patch)

Patch to add "onselected" callback for completion. (Taro Muraoka, 2011 Sep 24)

Use a count before "v" and "V" to select that many characters or lines?
(Kikyous)

":tab drop buffer.c" always opens a new tab, also if buffer.c is already in an
open window. (Herb Sitz, 2011 Nov 17)

Expand Down Expand Up @@ -135,6 +161,8 @@ characters. Patch by Christian Brabandt, 2011 Oct 11)
Patch for 'transparency' option. (Sergiu Dotenco, 2011 Sep 17)
Only for MS-Windows. No documentation. Do we want this?

Patch to support cursor shape in Cygwin console. (Ben bgold, 2011 Dec 27)

'cursorline' is displayed too short when there are concealed characters and
'list' is set. (Dennis Preiser)
Patch 7.3.116 was the wrong solution.
Expand Down Expand Up @@ -472,10 +500,6 @@ Patch to support :undo absolute jump to file save number. (Christian Brabandt,
Patch to use 'foldnextmax' also for "marker" foldmethod. (Arnaud Lacombe, 2011
Jan 7)

When setting 'undofile' while the file is already loaded, but unchanged, try
to read the undo file. Requires computing a checksum of the text. (Andy
Wokula)

Bug with 'incsearch' going to wrong line. (Wolfram Kresse, 2009 Aug 17)
Only with "vim -u NONE".

Expand Down Expand Up @@ -1055,6 +1079,15 @@ Latest version: 2011 May 18
http://nsis.sourceforge.net/Docs/Chapter4.html#4.12
Version from Guopeng Wen that does this (2010 Dec 27)

Windows installer should install 32-bit version of right-click handler also on
64-bit systems. (Brian Cunningham, 2011 Dec 28)

Windows installer could add a "open in new tab of existing Vim" menu entry.
Gvimext: patch to add "Edit with single Vim &tabbed" menu entry.
Just have two choices, always using one Vim and selecting between using an
argument list or opening each file in a separate tab.
(Erik Falor, 2008 May 21, 2008 Jun 26)

Windows installer: licence text should not use indent, causes bad word wrap.
(Benjamin Fritz, 2010 Aug 16)

Expand Down Expand Up @@ -1215,12 +1248,6 @@ When unloading a buffer in a BufHidden autocommand the hidden flag is reset?
Substituting an area with a line break with almost the same area does change
the Visual area. Can this be fixed? (James Vega, 2006 Sept 15)

Windows installer could add a "open in new tab of existing Vim" menu entry.
Gvimext: patch to add "Edit with single Vim &tabbed" menu entry.
Just have two choices, always using one Vim and selecting between using an
argument list or opening each file in a separate tab.
(Erik Falor, 2008 May 21, 2008 Jun 26)

GUI: When combining fg en bg make sure they are not equal.

Spell checking: Add a way to specify punctuation characters. Add the
Expand Down
8 changes: 7 additions & 1 deletion runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
*usr_41.txt* For Vim version 7.3. Last change: 2011 Jun 19
*usr_41.txt* For Vim version 7.3. Last change: 2011 Dec 15

VIM USER MANUAL - by Bram Moolenaar

Expand Down Expand Up @@ -670,6 +670,12 @@ Floating point computation: *float-functions*
cosh() hyperbolic cosine
tanh() hyperbolic tangent

Other computation: *bitwise-function*
and() bitwise AND
invert() bitwise invert
or() bitwise OR
xor() bitwise XOR

Variables: *var-functions*
type() type of a variable
islocked() check if a variable is locked
Expand Down
5 changes: 4 additions & 1 deletion runtime/doc/various.txt
@@ -1,4 +1,4 @@
*various.txt* For Vim version 7.3. Last change: 2011 Nov 28
*various.txt* For Vim version 7.3. Last change: 2011 Dec 29


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -136,6 +136,9 @@ g8 Print the hex values of the bytes used in the
then twice the value of the 'scroll' option is used,
otherwise the current window height minus 3 is used.

If there is a {count} the 'window' option is set to
its value.

:z can be used either alone or followed by any of
several punctuation marks. These have the following
effect:
Expand Down
6 changes: 5 additions & 1 deletion runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2011 Oct 26
" Last Change: 2011 Dec 28

" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
Expand Down Expand Up @@ -2533,6 +2533,10 @@ au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')


" Plain text files, needs to be far down to not override others. This avoids
" the "conf" type being used if there is a line starting with '#'.
au BufNewFile,BufRead *.txt,*.text setf text


" Use the filetype detect plugins. They may overrule any of the previously
" detected filetypes.
Expand Down
10 changes: 5 additions & 5 deletions runtime/ftplugin/fortran.vim
@@ -1,7 +1,7 @@
" Vim settings file
" Language: Fortran90 (and Fortran95, Fortran77, F and elf90)
" Version: 0.46
" Last Change: 2010 July 24
" Version: 0.47
" Last Change: 2011 December 28
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www.unb.ca/chem/ajit/>
" Usage: Do :help fortran-plugin from Vim
" Credits:
Expand All @@ -12,6 +12,9 @@ if exists("b:did_ftplugin")
finish
endif

let s:cposet=&cpoptions
set cpoptions&vim

" Don't do other file type settings for this buffer
let b:did_ftplugin = 1

Expand Down Expand Up @@ -78,9 +81,6 @@ setlocal fo+=tcql
setlocal include=^\\c#\\=\\s*include\\s\\+
setlocal suffixesadd+=.f95,.f90,.for,.f,.F,.f77,.ftn,.fpp

let s:cposet=&cpoptions
set cpoptions-=C

" Define patterns for the matchit plugin
if !exists("b:match_words")
let s:notend = '\%(\<end\s\+\)\@<!'
Expand Down
10 changes: 7 additions & 3 deletions runtime/ftplugin/kwt.vim
@@ -1,12 +1,13 @@
" Vim filetype plugin file
" Language: Kimwitu++
" Maintainer: Michael Piefel <piefel@informatik.hu-berlin.de>
" Last Change: 16 August 2001
" Maintainer: Michael Piefel <entwurf@piefel.de>
" Last Change: 10 December 2011

" Behaves almost like C++
runtime! ftplugin/cpp.vim ftplugin/cpp_*.vim ftplugin/cpp/*.vim

set cpo-=C
let s:cpo_save = &cpo
set cpo&vim

" Limit the browser to related files
if has("gui_win32") && !exists("b:browsefilter")
Expand All @@ -18,3 +19,6 @@ endif

" Set the errorformat for the Kimwitu++ compiler
set efm+=kc%.%#:\ error\ at\ %f:%l:\ %m

let &cpo = s:cpo_save
unlet s:cpo_save
8 changes: 7 additions & 1 deletion runtime/ftplugin/spec.vim
@@ -1,13 +1,16 @@
" Plugin to update the %changelog section of RPM spec files
" Filename: spec.vim
" Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com>
" Last Change: Wed, 10 Apr 2002 16:28:52 -0300
" Last Change: 2011 Dec 25 by Thilo Six

if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1

let s:cpo_save = &cpo
set cpo&vim

if !exists("no_plugin_maps") && !exists("no_spec_maps")
if !hasmapto("<Plug>SpecChangelog")
map <buffer> <LocalLeader>c <Plug>SpecChangelog
Expand Down Expand Up @@ -166,3 +169,6 @@ let b:match_words =
\ '^Name:^%description:^%clean:^%setup:^%build:^%install:^%files:' .
\ '^%package:^%preun:^%postun:^%changelog'

let &cpo = s:cpo_save
unlet s:cpo_save

10 changes: 5 additions & 5 deletions runtime/indent/fortran.vim
@@ -1,7 +1,7 @@
" Vim indent file
" Language: Fortran95 (and Fortran90, Fortran77, F and elf90)
" Version: 0.39
" Last Change: 2011 May 30
" Version: 0.40
" Last Change: 2011 Dec. 28
" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www.unb.ca/chem/ajit/>
" Usage: Do :help fortran-indent from Vim

Expand All @@ -11,6 +11,9 @@ if exists("b:did_indent")
endif
let b:did_indent = 1

let s:cposet=&cpoptions
set cpoptions&vim

setlocal indentkeys+==~end,=~case,=~if,=~else,=~do,=~where,=~elsewhere,=~select
setlocal indentkeys+==~endif,=~enddo,=~endwhere,=~endselect,=~elseif
setlocal indentkeys+==~type,=~interface,=~forall,=~associate,=~block,=~enum
Expand Down Expand Up @@ -67,9 +70,6 @@ else
endif
endif

let s:cposet=&cpoptions
set cpoptions-=C

function FortranGetIndent(lnum)
let ind = indent(a:lnum)
let prevline=getline(a:lnum)
Expand Down

0 comments on commit a99ae26

Please sign in to comment.