]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: ce92397 71fb0e0)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:07:57 +0000 (18:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:07:57 +0000 (18:07 -0700)
commita8da4d033d98f6bee89f3fd3f067389705c45d4d
tree37a25e04d242d85980579076be228cdeecf8d7f1tree
parentce92397425d29ec27fc701c36c589a5e1f894898commit | diff
parent71fb0e06e7e04d8300be10feffd3d314a76b4d27commit | diff
Merge from origin/emacs-25

71fb0e0 Improve last change to vc-git-mode-line-string
6858e77 Todo mode doc bug fix
e55d0db Fix revision calculation in vc-git-mode-line-string
ca87b34 ; Fix errant revert ccb75d7
40bfebe Add Python 3.5 keyword "await"
fa7886a Add new keywords of Python 3.5
ccb75d7 Partially revert previous change.
8ee168a ; * etc/NEWS: Update entry about color fonts on OS X with a w...
b09ca27 Say why text-quoting-style is not a user option
etc/NEWS diff1 | diff2 | blob | history
lisp/rect.el diff1 | diff2 | blob | history
lisp/vc/vc-git.el diff1 | diff2 | blob | history