Merge from origin/emacs-25
commite676b7b80b5c5bd65b7a9f28fdac631cf78c22db
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:04 +0000 (7 12:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:04 +0000 (7 12:41 -0800)
tree19ce0dc5b3b9a2db7aa1b854026517c7d6fb92e2
parent8cd0d5df81a1cd4ed2187ac4b5a4202f3ad46c67
parentd31298d8afa8166346fbc9206f38ec4b09a12204
Merge from origin/emacs-25

d31298d Fix documentation of `window-combination-resize'
2086f4c Typo fixes in elisp manual
doc/lispref/sequences.texi
doc/lispref/strings.texi
doc/lispref/windows.texi
src/window.c