homebrew: look for .git/ outside of build workspace #1274
cmake: handle missing git or .git/

GetGitRevisionDescription.cmake: we don't need fine-grained failure
modes, we only need "yes" or "no".

fix #1292
Merge pull request #1293 from justinmk/homebrew

handle missing git or .git/
vim-patch:7.4.436 #1246

Problem:  ml_get error for autocommand that moves the cursor of the
          current window.
Solution: Check the cursor position after switching back to the current
          buffer. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=v7-4-436
vim-patch:7.4.439 #1245

Problem:  Duplicate message in message history. Some quickfix messages
          appear twice. (Gary Johnson)
Solution: Do not reset keep_msg too early. (Hirohito Higashi)

https://code.google.com/p/vim/source/detail?r=v7-4-439
vim-patch:7.4.440 #1244

Problem:  Omni complete popup drawn incorrectly.
Solution: Call validate_cursor() instead of check_cursor(). (Hirohito
          Higashi)

https://code.google.com/p/vim/source/detail?r=v7-4-440
deps: Add lua nvim-client as a dependency
test: Remove run-functional-tests.py

Now that the lua client is available, python/lupa are no longer necessary to run
the functional tests. The helper functions previously defined in
run-functional-tests.py were adapted to test/functional/helpers.lua.
test: Use lua to perform sanity API checks

Sanity API checks made by the python-client in the api-python travis target were
converted to lua and will now live in this repository. This will simplify
performing breaking changes to the API as it won't be necessary to send parallel
PRs the python-client.
Merge PR #1296 'Use the lua client to run functional tests'
vim-patch:7.4.418

Problem:    When leaving ":append" the cursor shape is like in Insert mode.
            (Jacob Niehus)
Solution:   Do not have State set to INSERT when calling getline().

https://code.google.com/p/vim/source/detail?r=v7-4-418
Merge pull request #1298 from splinterofchaos/418

vim-patch:7.4.418
Add missing linker flags required for LuaJIT on 64-bit Mac OS X.

This was brought up in #1294.
Merge pull request #1299 from jszakmeister/add-missing-luajit-flags

Add missing linker flags required for LuaJIT on 64-bit Mac OS X.
server: Improve error reporting.

If we fail to bind to the server address, do not try and listen lest the
reported error always be "invalid argument".

Also, return whether or not we errored from server_init() in case we
want to respond differently in the future.
Merge pull request #1297 from splinterofchaos/server-errors

server: Improve error reporting.
rstream: Extract some RStream functionality to RBuffer

RBuffer instances represent the internal buffer used by RStreams.

This changes RStream constructor to receive RBuffer pointers and adds a set of
RBuffer methods that expose the lower level buffer manipulation to consumers of
the RStream API.
ui: Refactor input buffer handling

All input buffer code was moved to os/input.c, and `inbuf` is now a `RBuffer`
instance(which abstracts static buffer manipulation).
Merge PR #1300 'Refactor input buffer'
Add Boolean argument escape_csi to vim_feedkeys

- By default vim_feedkeys escaped all input for CSI/K_SPECIAL bytes
  before using it. However since vim_replace_termcodes() also escapes
  the input string chaining these functions together escapes input twice
- vim_feedkeys() now takes a third Boolean argument to enable/disable
  escaping
- Breaks API compatibility