From: Paul Eggert Date: Sat, 21 Oct 2017 05:45:36 +0000 (-0700) Subject: Merge from origin/emacs-26 X-Git-Tag: emacs-27.0.90~6228 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f400c7b69714c91a714ff0ab5b9f16708daf49b9;p=emacs.git 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 --- f400c7b69714c91a714ff0ab5b9f16708daf49b9