* lisp/desktop.el (desktop-create-buffer): Use activate-mark to set
`mark-active' (bug#19058).
Fix `nato-alphabet' docstring.

* play/morse.el (nato-alphabet): Mark URL in docstring in a way that
is recognized by `help-mode'.
lisp/ChangeLog: Use double space to end sentence.
Rename vc-name to vc-master-rename.

* vc-hooks.el, vc-rcs.el, vc-sccs.el: vc-name -> vc-master-name.  This
is preaparatory to isolating all the 'master' functions used only by
the file-oriented back ends.  With this done first, the substantive
diffs will be easier to read.
Isolating support code for the file-granularity back ends: the easy part.

* vc-filewise.el: New file to isolate code used only by the
file-oriented back ends (SCCS/RCS/CVS/SRC) which should not live in
vc.el and certainly not in vc-hooks.el.
More movement of master-related code to vc-filewise.el.

Goes with my 2014-11-22 lisp/ChangeLog entry.
Revert "More movement of master-related code to vc-filewise.el."

Must unbreak the build.  Which is way too complicated...
Unbreak the build.

I don't really understand why this reversion works, but it will do until I can
actually comprehend the bizarre hairball that is Emacs bootstrapping.
Propagate remote process environment.

* net/tramp-sh.el (tramp-sh-handle-start-file-process)
(tramp-sh-handle-process-file): Propagate `process-environment'.

* vc/vc-hg.el (vc-hg-state): No special handling for remote files;
Tramp propagates environment variables now.
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
newsticker: Fix bug#18787: Tell libxml-parse-xml-region to discard comments.

* lisp/net/newst-backend.el (newsticker--sentinel-work): Tell
`libxml-parse-xml-region' to discard comments. Fixes bug#18787.
Don't shrink frame when using desktop-save-mode (Bug#19048).

* w32fns.c (x_set_tool_bar_lines): Always call
x_change_tool_bar_height (Bug#19048).
(x_change_tool_bar_height): Mark frame as garbaged since
adjust_frame_size might not have done that.
* xfns.c (x_set_tool_bar_lines): Always call
x_change_tool_bar_height (Bug#19048).
(x_change_tool_bar_height): Mark frame as garbaged since
adjust_frame_size might not have done that.
* nextstep/templates/Info-gnustep.plist.in: Let configure set URL.
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...
* admin/admin.el: Fix paren typo in previous.