Add some .ico dependencies to Makefile .res rules

* lib-src/Makefile.in (emacsclient.res): Add dependency on icons/emacs.ico.

* nt/Makefile.in (emacs.res): Add dependency on icons/hand.cur.
* src/Makefile.in (emacs.res): Add dependency on icons/hand.cur.  Use $<.
Fix error with `mark-defun' and "protected:" in C++ Mode.
Fixes: debbugs:19134.

progmodes/cc-cmds.el (c-where-wrt-brace-construct): Handle a return code
of (label) from c-beginning-of-decl-1.
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Further reduce number of versioned files storing Emacs version number.

* configure.ac (comma_version, comma_space_version) [mingw32]:
New output variables.
(nt/emacs.rc, nt/emacsclient.rc) [mingw32]: New output files.

* make-dist: Update nt/ for *.rc -> *.rc.in changes.

* nt/emacs.rc.in, nt/emacsclient.rc.in: Rename from nt/emacs.rc, emacsclient.rc.
Let configure generate the real files, and set the version numbers.

* lib-src/Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc
now being in the build directory, not the source directory.

* nt/Makefile.in (distclean): Delete *.rc.
(emacs.res): Update deps for nt/emacsclient.rc now being in the
build directory, not the source directory.

* admin/admin.el (set-version): No more need to update nt/*.rc.

* admin/authors.el (authors-renamed-files-alist): Add .rc.in files.
* nt/emacs.rc, nt/emacsclient.rc: Remove files.
Accidentally left out of previous commit.
Apparently "git mv" doesn't do what I thought it did...