From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 10 Oct 2016 14:35:32 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1494
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=314f3972bf864a527494db043f01d603b0eef522;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

e1b2918 Document yank behavior in the right place
---

314f3972bf864a527494db043f01d603b0eef522