From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Dec 2016 20:41:05 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1163
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c102a84a48cf91f6ffde43270ff34b37fdada8dd;p=emacs.git

Merge from origin/emacs-25

35ce3fb Don't assume window-point and point are the same
---

c102a84a48cf91f6ffde43270ff34b37fdada8dd