diff options
| -rw-r--r-- | runtime/doc/diff.txt | 2 | ||||
| -rw-r--r-- | runtime/gvimrc_example.vim | 57 | ||||
| -rw-r--r-- | runtime/vimrc_example.vim | 65 |
3 files changed, 16 insertions, 108 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 909aedb221..250275d80a 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -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 loaded. Since Vim doesn't allow having two buffers for the same file, you 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 (this is in |vimrc_example.vim|). Use ":DiffOrig" to see the differences between the current buffer and the file it was loaded from. diff --git a/runtime/gvimrc_example.vim b/runtime/gvimrc_example.vim deleted file mode 100644 index ab9803413b..0000000000 --- a/runtime/gvimrc_example.vim +++ /dev/null @@ -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 diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim index 1be1bcd3b6..97f646b91a 100644 --- a/runtime/vimrc_example.vim +++ b/runtime/vimrc_example.vim @@ -1,87 +1,52 @@ " An example for a vimrc file. " -" Maintainer: Bram Moolenaar <Bram@vim.org> -" Last change: 2014 Nov 05 -" " To use it, copy it to " for Unix: ~/.vimrc -" for MS-DOS and Win32: $VIM\_vimrc - -" allow backspacing over everything in insert mode -set backspace=indent,eol,start +" for Windows: $VIM\_vimrc set backup " keep a backup file (restore to previous version) 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 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 -map Q gq +noremap Q gq " 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. inoremap <C-U> <C-G>u<C-U> -" In many terminal emulators the mouse works just fine, thus enable it. -if has('mouse') - set mouse=a -endif - -" Switch syntax highlighting on, when the terminal has colors -" Also switch on highlighting the last used search pattern. -if &t_Co > 2 || has("gui_running") - syntax on - set hlsearch -endif +" Switch syntax highlighting on +syntax on -" Only do this part when compiled with support for autocommands. -if has("autocmd") +" Enable file type detection. +" Use the default filetype settings, so that mail gets 'textwidth' set to 72, +" 'cindent' is on in C files, etc. +" Also load indent files, to automatically do language-dependent indenting. +filetype plugin indent on - " 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! +" Put these in an autocmd group, so that we can delete them easily. +augroup vimrcEx + autocmd! " For all text files set 'textwidth' to 78 characters. autocmd FileType text setlocal textwidth=78 " 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 - " (happens when dropping a file on gvim). " Also don't do it when the mark is in the first line, that is the default " position when opening a file. autocmd BufReadPost * \ if line("'\"") > 1 && line("'\"") <= line("$") | - \ exe "normal! g`\"" | + \ execute "normal! g`\"" | \ endif - augroup END - -else - - set autoindent " always set autoindenting on - -endif " has("autocmd") +augroup END " Convenient command to see the difference between the current buffer and the " file it was loaded from, thus the changes you made. " Only define it when not defined already. 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 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 |