IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2928 from fmoralesc/update-example-nvimrc

Browse Source 
[RFC] Update vimrc_example file and remove gvimrc_example file

Reviewed-by: Michael Reed <m.reed@mykolab.com>
Reviewed-by: Justin M. Keyes <justinkz@gmail.com>
This commit is contained in:
Michael Reed 2015-06-29 20:44:41 -04:00
commit fa13cc61ce
3 changed files with 16 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/diff.txt
View File

@ -163,7 +163,7 @@ in diff mode in one window and "normal" in another window. It is also
possible to view the changes you have made to a buffer since the file was possible to view the changes you have made to a buffer since the file was
loaded. Since Vim doesn't allow having two buffers for the same file, you loaded. Since Vim doesn't allow having two buffers for the same file, you
need another buffer. This command is useful: > need another buffer. This command is useful: >
command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ command DiffOrig vert new | set buftype=nofile | read ++edit # | 0d_
\ | diffthis | wincmd p | diffthis \ | diffthis | wincmd p | diffthis
(this is in |vimrc_example.vim|). Use ":DiffOrig" to see the differences (this is in |vimrc_example.vim|). Use ":DiffOrig" to see the differences
between the current buffer and the file it was loaded from. between the current buffer and the file it was loaded from.

57
runtime/gvimrc_example.vim
View File

@ -1,57 +0,0 @@
" An example for a gvimrc file.
" The commands in this are executed when the GUI is started.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last change: 2001 Sep 02
"
" To use it, copy it to
" for Unix: ~/.gvimrc
" for MS-DOS and Win32: $VIM\_gvimrc
" Make external commands work through a pipe instead of a pseudo-tty
"set noguipty
" set the X11 font to use
" set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
set ch=2 " Make command line two lines high
set mousehide " Hide the mouse when typing text
" Make shift-insert work like in Xterm
map <S-Insert> <MiddleMouse>
map! <S-Insert> <MiddleMouse>
" Only do this for Vim version 5.0 and later.
if version >= 500
" I like highlighting strings inside C comments
let c_comment_strings=1
" Switch on syntax highlighting if it wasn't on yet.
if !exists("syntax_on")
syntax on
endif
" Switch on search pattern highlighting.
set hlsearch
" For Win32 version, have "K" lookup the keyword in a help file
"if has("win32")
" let winhelpfile='windows.hlp'
" map K :execute "!start winhlp32 -k <cword> " . winhelpfile <CR>
"endif
" Set nice colors
" background for normal text is light grey
" Text below the last line is darker grey
" Cursor is green, Cyan when ":lmap" mappings are active
" Constants are not underlined but have a slightly lighter background
highlight Normal guibg=grey90
highlight Cursor guibg=Green guifg=NONE
highlight lCursor guibg=Cyan guifg=NONE
highlight NonText guibg=grey80
highlight Constant gui=NONE guibg=grey95
highlight Special gui=NONE guibg=grey95
endif

65
runtime/vimrc_example.vim
View File

@ -1,87 +1,52 @@
" An example for a vimrc file. " An example for a vimrc file.
" "
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last change: 2014 Nov 05
"
" To use it, copy it to " To use it, copy it to
" for Unix: ~/.vimrc " for Unix: ~/.vimrc
" for MS-DOS and Win32: $VIM\_vimrc " for Windows: $VIM\_vimrc
" allow backspacing over everything in insert mode
set backspace=indent,eol,start
set backup " keep a backup file (restore to previous version) set backup " keep a backup file (restore to previous version)
set undofile " keep an undo file (undo changes after closing) set undofile " keep an undo file (undo changes after closing)
set history=50 " keep 50 lines of command line history
set ruler " show the cursor position all the time set ruler " show the cursor position all the time
set showcmd " display incomplete commands set showcmd " display incomplete commands
set incsearch " do incremental searching
" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
" let &guioptions = substitute(&guioptions, "t", "", "g")
" Don't use Ex mode, use Q for formatting " Don't use Ex mode, use Q for formatting
map Q gq noremap Q gq
" CTRL-U in insert mode deletes a lot. Use CTRL-G u to first break undo, " CTRL-U in insert mode deletes a lot. Use CTRL-G u to first break undo,
" so that you can undo CTRL-U after inserting a line break. " so that you can undo CTRL-U after inserting a line break.
inoremap <C-U> <C-G>u<C-U> inoremap <C-U> <C-G>u<C-U>
" In many terminal emulators the mouse works just fine, thus enable it. " Switch syntax highlighting on
if has('mouse') syntax on
set mouse=a
endif
" Switch syntax highlighting on, when the terminal has colors " Enable file type detection.
" Also switch on highlighting the last used search pattern. " Use the default filetype settings, so that mail gets 'textwidth' set to 72,
if &t_Co > 2 || has("gui_running") " 'cindent' is on in C files, etc.
syntax on " Also load indent files, to automatically do language-dependent indenting.
set hlsearch filetype plugin indent on
endif
" Only do this part when compiled with support for autocommands. " Put these in an autocmd group, so that we can delete them easily.
if has("autocmd") augroup vimrcEx
autocmd!
" Enable file type detection.
" Use the default filetype settings, so that mail gets 'tw' set to 72,
" 'cindent' is on in C files, etc.
" Also load indent files, to automatically do language-dependent indenting.
filetype plugin indent on
" Put these in an autocmd group, so that we can delete them easily.
augroup vimrcEx
au!
" For all text files set 'textwidth' to 78 characters. " For all text files set 'textwidth' to 78 characters.
autocmd FileType text setlocal textwidth=78 autocmd FileType text setlocal textwidth=78
" When editing a file, always jump to the last known cursor position. " When editing a file, always jump to the last known cursor position.
" Don't do it when the position is invalid or when inside an event handler " Don't do it when the position is invalid or when inside an event handler
" (happens when dropping a file on gvim).
" Also don't do it when the mark is in the first line, that is the default " Also don't do it when the mark is in the first line, that is the default
" position when opening a file. " position when opening a file.
autocmd BufReadPost * autocmd BufReadPost *
\ if line("'\"") > 1 && line("'\"") <= line("$") | \ if line("'\"") > 1 && line("'\"") <= line("$") |
\ exe "normal! g`\"" | \ execute "normal! g`\"" |
\ endif \ endif
augroup END augroup END
else
set autoindent " always set autoindenting on
endif " has("autocmd")
" Convenient command to see the difference between the current buffer and the " Convenient command to see the difference between the current buffer and the
" file it was loaded from, thus the changes you made. " file it was loaded from, thus the changes you made.
" Only define it when not defined already. " Only define it when not defined already.
if !exists(":DiffOrig") if !exists(":DiffOrig")
command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis command DiffOrig vert new | set buftype=nofile | read ++edit # | 0d_ | diffthis
\ | wincmd p | diffthis \ | wincmd p | diffthis
endif endif
" Prevent that the langmap option applies to characters that result from a
" mapping. If unset (default), this may break plugins (but it's backward
" compatible).
set langnoremap