Merge from origin/emacs-25
commitc102a84a48cf91f6ffde43270ff34b37fdada8dd
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:05 +0000 (7 12:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:05 +0000 (7 12:41 -0800)
tree6b7977aa4f1835921c600a2d4258cca836236211
parent33a2f93aadc8da93ca5948c6b312eb3e1df25bf1
parent35ce3fb141dd72f75408e71f2daba9b513ca89f2
Merge from origin/emacs-25

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