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

Merge from origin/emacs-25

d31298d Fix documentation of `window-combination-resize'
2086f4c Typo fixes in elisp manual
---

e676b7b80b5c5bd65b7a9f28fdac631cf78c22db