Merge from origin/emacs-26
commitf400c7b69714c91a714ff0ab5b9f16708daf49b9
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 21 Oct 2017 05:45:36 +0000 (20 22:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 21 Oct 2017 05:45:36 +0000 (20 22:45 -0700)
tree4a6549c67213696481b659654cac312f204f9479
parent8cedc552463358509dd785f54e58bfaf8099de62
parent868eb74f910eb67a5e74ebb1867ebcfbfced55c4
Merge from origin/emacs-26

868eb74f91 Simplify make-progress-reporter vs float-time
83db9a1bba Fix two more minor Gnus typos
e655946ce0 Fix two minor Gnus typos
6a00914d6d Tweak Fdocumentation's error for an undefined function
7c63655e39 Tweak format of list of old files in NEWS header

# Conflicts:
# etc/NEWS
lisp/subr.el