To: vim_dev@googlegroups.com Subject: Patch 7.4.1695 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1695 Problem: ":syn reset" clears the effect ":syn iskeyword". (James McCoy) Solution: Remove clearing the syntax keywords. Files: src/syntax.c *** ../vim-7.4.1694/src/syntax.c 2016-03-31 23:02:11.658763051 +0200 --- src/syntax.c 2016-04-02 19:00:22.416692345 +0200 *************** *** 3815,3820 **** --- 3815,3821 ---- /* * Handle ":syntax reset" command. + * It actually resets highlighting, not syntax. */ static void syn_cmd_reset(exarg_T *eap, int syncing UNUSED) *************** *** 3822,3828 **** eap->nextcmd = check_nextcmd(eap->arg); if (!eap->skip) { - clear_string_option(&curwin->w_s->b_syn_isk); set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"reset"); do_cmdline_cmd((char_u *)"runtime! syntax/syncolor.vim"); do_unlet((char_u *)"g:syntax_cmd", TRUE); --- 3823,3828 ---- *** ../vim-7.4.1694/src/version.c 2016-04-02 15:59:37.019059251 +0200 --- src/version.c 2016-04-02 18:55:15.811766406 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1695, /**/ -- Some of the well known MS-Windows errors: ETIME Wrong time, wait a little while ECRASH Try again... EDETECT Unable to detect errors EOVER You lost! Play another game? ENOCLUE Eh, what did you want? /// 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 ///