To: vim_dev@googlegroups.com Subject: Patch 7.4.1714 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1714 Problem: Non-GUI specific settings in the gvimrc_example file. Solution: Move some settings to the vimrc_example file. Remove setting 'hlsearch' again. (suggested by Hirohito Higashi) Files: runtime/vimrc_example.vim, runtime/gvimrc_example.vim *** ../vim-7.4.1713/runtime/vimrc_example.vim 2014-11-05 17:44:47.676471691 +0100 --- runtime/vimrc_example.vim 2016-04-05 22:04:12.740740835 +0200 *************** *** 1,7 **** " An example for a vimrc file. " " Maintainer: Bram Moolenaar ! " Last change: 2014 Nov 05 " " To use it, copy it to " for Unix and OS/2: ~/.vimrc --- 1,7 ---- " An example for a vimrc file. " " Maintainer: Bram Moolenaar ! " Last change: 2016 Apr 05 " " To use it, copy it to " for Unix and OS/2: ~/.vimrc *************** *** 47,57 **** 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 " Only do this part when compiled with support for autocommands. --- 47,62 ---- set mouse=a endif ! " Switch syntax highlighting on when the terminal has colors or when using the ! " GUI (which always has colors). if &t_Co > 2 || has("gui_running") syntax on + + " Also switch on highlighting the last used search pattern. set hlsearch + + " I like highlighting strings inside C comments. + let c_comment_strings=1 endif " Only do this part when compiled with support for autocommands. *************** *** 73,82 **** " 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`\"" | \ endif --- 78,85 ---- " 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). autocmd BufReadPost * ! \ if line("'\"") >= 1 && line("'\"") <= line("$") | \ exe "normal! g`\"" | \ endif *************** *** 102,104 **** --- 105,114 ---- " compatible). set langnoremap endif + + + " Add optional packages. + " + " The matchit plugin makes the % command work better, but it is not backwards + " compatible. + packadd matchit *** ../vim-7.4.1713/runtime/gvimrc_example.vim 2010-05-15 13:03:31.000000000 +0200 --- runtime/gvimrc_example.vim 2016-04-05 22:03:05.829420543 +0200 *************** *** 1,8 **** " An example for a gvimrc file. ! " The commands in this are executed when the GUI is started. " " Maintainer: Bram Moolenaar ! " Last change: 2001 Sep 02 " " To use it, copy it to " for Unix and OS/2: ~/.gvimrc --- 1,9 ---- " An example for a gvimrc file. ! " The commands in this are executed when the GUI is started, after the vimrc ! " has been executed. " " Maintainer: Bram Moolenaar ! " Last change: 2016 Apr 05 " " To use it, copy it to " for Unix and OS/2: ~/.gvimrc *************** *** 27,43 **** " 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' --- 28,38 ---- *** ../vim-7.4.1713/src/version.c 2016-04-05 21:56:03.101715603 +0200 --- src/version.c 2016-04-05 22:05:25.012006716 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1714, /**/ -- hundred-and-one symptoms of being an internet addict: 231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner in the front doorway permanently so it always looks like you are actually attempting to do something about that mess that has amassed since you discovered the Internet. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///