Merge branch 'maint'

* maint:
  msvc: Fix some compiler warnings
  Documentation: grep: fix asciidoc problem with --
  msvc: Fix some "expr evaluates to function" compiler warnings

diff --cc builtin.h
Simple merge

diff --cc builtin/notes.c
Simple merge

diff --cc notes.h
Simple merge