Merging r275943:

------------------------------------------------------------------------
r275943 | compnerd | 2016-07-18 19:13:08 -0700 (Mon, 18 Jul 2016) | 1 line

clang-rename: fix referenced variable in vim-script
------------------------------------------------------------------------

llvm-svn: 276115