]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Fri, 10 Aug 2018 18:37:11 +0000 (11:37 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 10 Aug 2018 18:37:11 +0000 (11:37 -0700)
commitbd6b6cdb62aac5be34a8bb367f43d8367fc341f8
treeb5386b322b0b247ab44eefd12e1fa865844249f7
parent506ea8a2f70d8c9d53a34ea9469d3edbe6655f0c
parent71c92d89137b7fdde6c2bd4bed9b8dfda5fa53dd
Merge from origin/emacs-26

71c92d8 Fix copying text properties by 'format'
96be6b6 Improve error messages regarding initial-buffer-choice (Bug#2...
00fb127 * test/lisp/wdired-tests.el (wdired-test-unfinished-edit-01):...

Conflicts:
lisp/startup.el
lisp/startup.el
src/editfns.c
test/src/editfns-tests.el