]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cedc55 868eb74)
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 21 Oct 2017 05:45:36 +0000 (22:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 21 Oct 2017 05:45:36 +0000 (22:45 -0700)
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

1  2 
lisp/subr.el patch | diff1 | diff2 | blob | history

diff --cc lisp/subr.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.