Skip to content

Commit

Permalink
Merge branch 'vim'
Browse files Browse the repository at this point in the history
  • Loading branch information
b4winckler committed Apr 21, 2011
2 parents 76f08e5 + e509b66 commit f7f1116
Show file tree
Hide file tree
Showing 49 changed files with 3,010 additions and 1,547 deletions.
18 changes: 18 additions & 0 deletions .hgtags
Expand Up @@ -1478,3 +1478,21 @@ ffa17de19445569ea573550eef332323d83e70bd v7-0-016
fff7028d50c8a44a6285ab23b451d975764b8bd5 v7-2-296
62e8d93241cd15962f895da4788f21b514238b14 v7-3-142
632f43801ddb568f872599499fdcfd9522f8c13f v7-3-143
322a5c8d392bd47ceebd24cd21dacf70409fcc91 v7-3-144
329a9676040c3182f78e2014322125f8839b5cb6 v7-3-145
2bd574a2ef1c0ad487a0673a5867b09cd332d176 v7-3-146
55fe8407514f5387ad872a338d77f64a2ad4b5f5 v7-3-147
d67916de812ad684718c02e3ff93455ce577be81 v7-3-148
7f937a04cdbafd7d179b200f75e988408f8caf3c v7-3-149
6146c9859f6558d618e950fe702c11e41ca21105 v7-3-150
f169a51f7eadf9a07ed95161143e6209387a4f34 v7-3-151
0f7f66682a5563c76ab47e9976fd590d9423a013 v7-3-152
d0cae598360945a425859bf8acf22923c29501f4 v7-3-153
d72d709f0e18c309069e42d3d7865d68db9e89d7 v7-3-154
5747cd65d62b613d5060254849ed4bc1e1e5d714 v7-3-155
7fb8cdb9cb25e1409abe45bba959f5f27608d713 v7-3-156
9a98d8562637d4c90439125a14224a3403d8bee3 v7-3-157
b5f774f159274af375455f32d628881c027417d1 v7-3-158
415c55534d901aa4617bf584462faf0c7198e07e v7-3-159
c5e47b752f07a95534bbfa83f031a58af67054cb v7-3-160
25672ad7f377341ff1de9a0773d8cfcad1d37883 v7-3-161
1,270 changes: 738 additions & 532 deletions runtime/autoload/netrw.vim

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions runtime/compiler/g95.vim
@@ -0,0 +1,23 @@
" Compiler: G95
" Maintainer: H Xu <xuhdev@gmail.com>
" Version: 0.1.3
" Last Change: 2011 Apr 01
" Homepage: http://www.vim.org/scripts/script.php?script_id=3492
" https://bitbucket.org/xuhdev/compiler-g95.vim
" License: Same as Vim

if exists('current_compiler')
finish
endif
let current_compiler = 'g95'

if exists(":CompilerSet") != 2 " older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args>
endif

CompilerSet errorformat=
\%AIn\ file\ %f:%l,
\%-C%p1,
\%-Z%trror:\ %m,
\%-Z%tarning\ (%n):\ %m,
\%-C%.%#
22 changes: 22 additions & 0 deletions runtime/compiler/gfortran.vim
@@ -0,0 +1,22 @@
" Compiler: GNU Fortran Compiler
" Maintainer: H Xu <xuhdev@gmail.com>
" Version: 0.1.3
" Last Change: 19 March 2011
" Homepage: http://www.vim.org/scripts/script.php?script_id=3496
" https://bitbucket.org/xuhdev/compiler-gfortran.vim
" License: Same as Vim

if exists('current_compiler')
finish
endif
let current_compiler = 'gfortran'

if exists(":CompilerSet") != 2 " older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args>
endif

CompilerSet errorformat=
\%A%f:%l.%c:,
\%-Z%trror:\ %m,
\%-Z%tarning:\ %m,
\%-C%.%#
22 changes: 22 additions & 0 deletions runtime/compiler/ifort.vim
@@ -0,0 +1,22 @@
" Compiler: Intel Fortran Compiler
" Maintainer: H Xu <xuhdev@gmail.com>
" Version: 0.1.1
" Last Change: 19 March 2011
" Homepage: http://www.vim.org/scripts/script.php?script_id=3497
" https://bitbucket.org/xuhdev/compiler-ifort.vim
" License: Same as Vim

if exists('current_compiler')
finish
endif
let current_compiler = 'ifort'

if exists(":CompilerSet") != 2 " older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args>
endif

CompilerSet errorformat=
\%A%f(%l):\ %trror\ \#%n:\ %m,
\%A%f(%l):\ %tarning\ \#%n:\ %m,
\%-Z%p^,
\%-G%.%#
26 changes: 13 additions & 13 deletions runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
*cmdline.txt* For Vim version 7.3. Last change: 2011 Feb 10
*cmdline.txt* For Vim version 7.3. Last change: 2011 Mar 27


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -83,28 +83,28 @@ CTRL-V Insert next non-digit literally. Up to three digits form the
CTRL-Q Same as CTRL-V. But with some terminals it is used for
control flow, it doesn't work then.

*c_<Left>*
*c_<Left>* *c_Left*
<Left> cursor left
*c_<Right>*
*c_<Right>* *c_Right*
<Right> cursor right
*c_<S-Left>*
<S-Left> or <C-Left> *c_<C-Left>*
cursor one WORD left
*c_<S-Right>*
<S-Right> or <C-Right> *c_<C-Right>*
cursor one WORD right
CTRL-B or <Home> *c_CTRL-B* *c_<Home>*
CTRL-B or <Home> *c_CTRL-B* *c_<Home>* *c_Home*
cursor to beginning of command-line
CTRL-E or <End> *c_CTRL-E* *c_<End>*
CTRL-E or <End> *c_CTRL-E* *c_<End>* *c_End*
cursor to end of command-line

*c_<LeftMouse>*
<LeftMouse> Move the cursor to the position of the mouse click.

CTRL-H *c_<BS>* *c_CTRL-H*
CTRL-H *c_<BS>* *c_CTRL-H* *c_BS*
<BS> Delete the character in front of the cursor (see |:fixdel| if
your <BS> key does not do what you want).
*c_<Del>*
*c_<Del>* *c_Del*
<Del> Delete the character under the cursor (at end of line:
character before the cursor) (see |:fixdel| if your <Del>
key does not do what you want).
Expand All @@ -118,7 +118,7 @@ CTRL-U Remove all characters between the cursor position and
preferred behavior, add the following to your .vimrc: >
:cnoremap <C-U> <C-E><C-U>
<
*c_<Insert>*
*c_<Insert>* *c_Insert*
<Insert> Toggle between insert and overstrike. {not in Vi}

{char1} <BS> {char2} or *c_digraph*
Expand Down Expand Up @@ -224,9 +224,9 @@ CTRL-Y When there is a modeless selection, copy the selection into
the clipboard. |modeless-selection|
If there is no selection CTRL-Y is inserted as a character.

CTRL-J *c_CTRL-J* *c_<NL>* *c_<CR>*
CTRL-J *c_CTRL-J* *c_<NL>* *c_<CR>* *c_CR*
<CR> or <NL> start entered command
*c_<Esc>*
*c_<Esc>* *c_Esc*
<Esc> When typed and 'x' not present in 'cpoptions', quit
Command-line mode without executing. In macros or when 'x'
present in 'cpoptions', start entered command.
Expand All @@ -235,12 +235,12 @@ CTRL-J *c_CTRL-J* *c_<NL>* *c_<CR>*
*c_CTRL-C*
CTRL-C quit command-line without executing

*c_<Up>*
*c_<Up>* *c_Up*
<Up> recall older command-line from history, whose beginning
matches the current command-line (see below).
{not available when compiled without the |+cmdline_hist|
feature}
*c_<Down>*
*c_<Down>* *c_Down*
<Down> recall more recent command-line from history, whose beginning
matches the current command-line (see below).
{not available when compiled without the |+cmdline_hist|
Expand Down Expand Up @@ -865,7 +865,7 @@ These modifiers can be given, in this order:
After this, the previous modifiers can be used again. For
example ":p", to make a full path after the substitution.
:gs?pat?sub?
Substitute all occurrences of "path" with "sub". Otherwise
Substitute all occurrences of "pat" with "sub". Otherwise
this works like ":s".

Examples, when the file name is "src/version.c", current dir
Expand Down

0 comments on commit f7f1116

Please sign in to comment.