remove proto.h include from vim.h
remove stdbool.h include from vim.h and globals.h
move memory.h include to version.c
move ascii.h include out of vim.h
move locale.h include out of vim.h
move <inttypes.h> include out of vim.h
move wctype.h include out of vim.h
move assert.h include out of vim.h
move stdarg.h include out of vim.h
move errno.h include out of vim.h
Merge #921 'Remove includes vim.h'
Fix two android compile errors in fs.c #924

Replace usage of deprecated S_IEXEC with S_IXUSR.
Rename a variable named "errno" to avoid clashing with define.
Avoid linking with libform(w).so

If libtgent or libcurses is installed, the first one found of them
is linked to.

But if not, a find_package(Curses REQUIRED) is used and CURSES_LIBRARIES
is added to NVIM_LINK_LIBRARIES. This contains libform(w).so on many
systems, causing nvim to be linked to and depend on libform(w).so,
which may not be installed one some space-constrained systems, unnecessarily.
Merge #933 'Avoid linking with libform(w).so'
Default 'encoding'-option from latin to utf-8 #935

Normally the default encoding does not have much effect, since it's
overridden by the environment.

But when it's not (test with "LANG= LC_ALL= C_CTYPE= nvim" and perform
":set encoding?"), utf-8 should be the default encoding for a 21st
century editor :).
c99: remove vim_round #909

C89 did not have round(), vim emulated it with vim_round. But since we're
using C99 this is not a problem anymore.
vim-patch:7.4.291 #879

Problem:    Compiler warning for int to pointer of different size when DEBUG
            is defined.
Solution:   use smsg() instead of EMSG3().

https://code.google.com/p/vim/source/detail?r=b5972833add9de714f4651e26fd9ea63ec4a880c
vim-patch:7.4.295 #833

Problem:    Various typos, bad white space and unclear comments.
Solution:   Fix typos.  Improve white space. Update comments.

https://code.google.com/p/vim/source/detail?r=662ae48e7e246a63d38c9f3165b15b62252edaee
vim-patch:7.4.306 #842

Problem:    getchar(0) does not return Esc.
Solution:   Do not wait for an Esc sequence to be complete.  (Yasuhiro
            Matsumoto)

https://code.google.com/p/vim/source/detail?r=05e1d8afcc5e375bf708ccc9810e2fd1a5a8a3cf
vim-patch:7.4.308 #832

Problem:    When using ":diffsplit" on an empty file the cursor is displayed
            on the command line.
Solution:   Limit the value of w_topfill.

https://code.google.com/p/vim/source/detail?r=e3d2b8d83bb30c428a051f50791e454fcbc080af