Runtime file updates

runtime/doc/eval.txt

@@ -8497,8 +8497,8 @@ listcmds		Compiled with commands for the buffer list |:files|
 localmap		Compiled with local mappings and abbr. |:map-local|
 lua			Compiled with Lua interface |Lua|.
 mac			Any Macintosh version of Vim, but not all OS X.
-macunix			Compiled for OS X, with darwin
+macunix			Compiled for OS X, with |mac-darwin-feature|
-osx			Compiled for OS X, with or without darwin
+osx			Compiled for OS X, with or w/o |mac-darwin-feature|
 menu			Compiled with support for |:menu|.
 mksession		Compiled with support for |:mksession|.
 modify_fname		Compiled with file name modifiers. |filename-modifiers|

runtime/doc/os_mac.txt

@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 8.0.  Last change: 2006 Apr 30
+*os_mac.txt*    For Vim version 8.0.  Last change: 2017 Apr 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
@@ -18,6 +18,7 @@ NOTE: This file is a bit outdated.  You might find more useful info here:
 5. Known Lack			|mac-lack|
 6. Mac Bug Report		|mac-bug|
 7. Compiling Vim		|mac-compile|
+8. The darwin feature		|mac-darwin-feature|
 
 There was a Mac port for version 3.0 of Vim.  Here are the first few lines
 from the old file:
@@ -126,5 +127,55 @@ send a message to the current MacVim maintainers:
 
 See the file "src/INSTALLmac.txt" that comes with the source files.
 
+==============================================================================
+8. The Darwin Feature					*mac-darwin-feature*
+
+If you have a Mac that isn't very old, you will be running OS X, also called
+Darwin.  The last pre-Darwin OS was Mac OS 9.  The darwin feature makes Vim
+use Darwin-specific properties.
+
+What is accomplished with this feature is two-fold:
+
+- Make Vim interoperable with the system clipboard.
+- Incorporate into Vim a converter module that bridges the gap between some
+  character encodings specific to the platform and those known to Vim.
+
+Needless to say, both are not to be missed for any decent text editor to work
+nicely with other applications running on the same desktop environment.
+
+As Vim is not an application dedicated only to macOS, we need an extra feature
+to add in order for it to offer the same user experience that our users on
+other platforms enjoy to people on macOS.
+
+For brevity, the feature is referred to as "darwin" to signify it one of the
+Vim features that are specific to that particular platform.
+
+The feature is a configuration option.  Accordingly, whether it is enabled or
+not is determined at build time; once it is selected to be enabled, it is
+compiled in and hence cannot be disabled at runtime.
+
+The feature is enabled by default.  For most macOS users, that should be
+sufficient unless they have specific needs mentioned briefly below.
+
+If you want to disable it, pass `--disable-darwin` to the configure script: >
+
+    ./configure --disable-darwin <other options>
+
+and then run `make` to build Vim.  The order of the options doesn't matter.
+
+To make sure at runtime whether or not the darwin feature is compiled in, you
+can use `has('macunix')` which returns 1 if the feature is compiled in; 0
+otherwise.
+
+Notable use cases where `--disable-darwin` is turned out to be useful are:
+
+- When you want to use |x11-selection| instead of the system clipboard.
+- When you want to use |x11-clientserver|.
+
+Since both have to make use of X11 inter-client communication for them to work
+properly, and since the communication mechanism can come into conflict with
+the system clipboard, the darwin feature should be disabled to prevent Vim
+from hanging at runtime.
+
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/tags

@@ -7180,6 +7180,7 @@ m`	motion.txt	/*m`*
 mac	os_mac.txt	/*mac*
 mac-bug	os_mac.txt	/*mac-bug*
 mac-compile	os_mac.txt	/*mac-compile*
+mac-darwin-feature	os_mac.txt	/*mac-darwin-feature*
 mac-faq	os_mac.txt	/*mac-faq*
 mac-filename	os_mac.txt	/*mac-filename*
 mac-lack	os_mac.txt	/*mac-lack*

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.0.  Last change: 2017 Apr 23
+*todo.txt*      For Vim version 8.0.  Last change: 2017 Apr 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -111,11 +111,16 @@ Regexp problems:
 - Difference between two engines: ".*\zs\/\@>\/" on text "///"
   (Chris Paul, 2016 Nov 13)  New engine not greedy enough?
 
+With foldmethod=syntax and nofoldenable comment highlighting isn't removed.
+(Marcin Szewczyk, 2017 Apr 26)
+
 Running test_gui and test_gui_init with Motif sometimes kills the window
 manager.  Problem with Motif?
 
 Memory leak in test97?  The string is actually freed.  Weird.
 
+Patch for shellescape(). (Christian Brabandt, 2017 Apr 20, #1590)
+
 Patch for flickering redraw. (Hirohito Higashi, 2017 Apr 23, #1637)
 
 New value "uselast" for 'switchbuf'. (Lemonboy, 2017 Apr 23, #1652)
@@ -246,6 +251,9 @@ Does this also fix #1408 ?
 
 Patch for 'cursorlinenr' option. (Ozaki Kiichi, 2016 Nov 30)
 
+When 'completeopt' has "noselect" does not insert a newline. (Lifepillar, 2017
+Apr 23, #1653)
+
 Window resizing with 'winfixheight': With a vertical split the height changes
 anyway. (Tommy allen, 2017 Feb 21, #1502)
 
@@ -355,6 +363,10 @@ names, shell commands and the like.  (Kikuchan, 2010 Oct 14)
 Assume the system converts between the actual encoding of the filesystem to
 the system encoding (usually utf-8).
 
+Using ":tab drop file" does not trigger BufEnter or TabEnter events.
+(Andy Stewart, 2017 Apr 27, #1660)
+Autocommands blocked in do_arg_all().  Supposed to happen later?
+
 'hlsearch' interferes with a Conceal match. (Rom Grk, 2016 Aug 9)
 
 Patch to add context information to quickfix/location list. (Yegappan

runtime/syntax/php.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: php PHP 3/4/5/7
 " Maintainer: Jason Woofenden <jason@jasonwoof.com>
-" Last Change: Dec 11, 2016
+" Last Change: Apr 28, 2017
 " URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD
 " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
 "         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -11,32 +11,28 @@
 "       colourscheme, because elflord's colours will better highlight the break-points
 "       (Statements) in your code.
 "
-" Options:  php_sql_query = 1  for SQL syntax highlighting inside strings
+" Options:
-"           php_htmlInStrings = 1  for HTML syntax highlighting inside strings
+"    Set to anything to enable:
-"           php_baselib = 1  for highlighting baselib functions
+"       php_sql_query           SQL syntax highlighting inside strings
-"           php_asp_tags = 1  for highlighting ASP-style short tags
+"       php_htmlInStrings       HTML syntax highlighting inside strings
-"           php_parent_error_close = 1  for highlighting parent error ] or )
+"       php_baselib             highlighting baselib functions
-"           php_parent_error_open = 1  for skipping an php end tag, if there exists an open ( or [ without a closing one
+"       php_asp_tags            highlighting ASP-style short tags
-"           php_oldStyle = 1  for using old colorstyle
+"       php_parent_error_close  highlighting parent error ] or )
-"           php_noShortTags = 1  don't sync <? ?> as php
+"       php_parent_error_open   skipping an php end tag, if there exists
-"           php_folding = 1  for folding classes and functions
+"                                 an open ( or [ without a closing one
-"           php_folding = 2  for folding all { } regions
+"       php_oldStyle            use old colorstyle
-"           php_sync_method = x
+"       php_noShortTags         don't sync <? ?> as php
-"                             x=-1 to sync by search ( default )
+"    Set to a specific value:
-"                             x>0 to sync at least x lines backwards
+"       php_folding = 1         fold classes and functions
-"                             x=0 to sync from start
+"       php_folding = 2         fold all { } regions
-"
+"       php_sync_method = x  where x is an integer:
-"       Added by Peter Hodge On June 9, 2006:
+"                         -1  sync by search ( default )
-"           php_special_functions = 1|0 to highlight functions with abnormal behaviour
+"                         >0  sync at least x lines backwards
-"           php_alt_comparisons = 1|0 to highlight comparison operators in an alternate colour
+"                         0   sync from start
-"           php_alt_assignByReference = 1|0 to highlight '= &' in an alternate colour
+"    Set to 0 to _disable_:      (Added by Peter Hodge On June 9, 2006)
-"
+"       php_special_functions = 0      highlight functions with abnormal behaviour
-"           Note: these all default to 1 (On), so you would set them to '0' to turn them off.
+"       php_alt_comparisons = 0        comparison operators in an alternate colour
-"                 E.g., in your .vimrc or _vimrc file:
+"       php_alt_assignByReference = 0  '= &' in an alternate colour
-"                   let php_special_functions = 0
-"                   let php_alt_comparisons = 0
-"                   let php_alt_assignByReference = 0
-"                 Unletting these variables will revert back to their default (On).
 "
 "
 " Note: