Merge remote-tracking branch 'origin/master' into feature/package+vc

diff --cc etc/NEWS
index 19c90141167f8ffb951ca629cea44d78d8bb1258,a1859674835de9183bfab1b23657712b36ee89ca..cbde7afecb690a7b93ca7818f3b1c7a8450032d3
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -1561,26 -1548,18 +1548,38 @@@ These commands can be useful if the ".e
  If no packages are marked, 'x' will install the package under point if
  it isn't already, and remove it if it is installed.
  
 ++++
 +*** New command 'package-vc-install'
 +Packages can now be installed directly from source by cloning from a
 +repository.
 +
 ++++
 +*** New command 'package-vc-link-directory'
 +An existing checkout can now be loaded via package.el, by creating a
 +symbolic link from the usual package directory to the checkout.
 +
 ++++
 +*** New command 'package-vc-prepare-patch'
 +This command allows you to send patches to package maintainers, for
 +packages checked out using 'package-vc-install'.
 +
 ++++
 +*** New command 'package-report-bug'
 +This command helps you compose an email for sending bug reports to
 +package maintainers.
 +
+ ** Emacs Sessions (Desktop)
+ 
+ +++
+ *** New user option to load a locked desktop if locking Emacs is not running.
+ The option 'desktop-load-locked-desktop' can now be set to the value
+ 'check-pid', which means to allow loading a locked ".emacs.desktop"
+ file if the Emacs process which locked it is no longer running on the
+ local machine.  This allows avoiding questions about locked desktop
+ files when the Emacs session which locked it crashes, or was otherwise
+ interrupted, and didn't exit gracefully.  See the "(emacs) Saving
+ Emacs Sessions" node in the Emacs manual for more details.
+ 
  ** Miscellaneous
  
  +++
@@@ -4221,11 -4246,11 +4266,3 @@@ GNU General Public License for more det
  
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
--
--\f
--Local variables:
--coding: utf-8
--mode: outline
--mode: emacs-news
--paragraph-separate: "[        \f]*$"
--end:

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/vc/vc-hg.el
Simple merge

diff --cc src/keyboard.c
Simple merge