diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:07:57 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:07:57 -0700 |
commit | a8da4d033d98f6bee89f3fd3f067389705c45d4d (patch) | |
tree | 37a25e04d242d85980579076be228cdeecf8d7f1 /lisp/emacs-lisp/cursor-sensor.el | |
parent | ce92397425d29ec27fc701c36c589a5e1f894898 (diff) | |
parent | 71fb0e06e7e04d8300be10feffd3d314a76b4d27 (diff) | |
download | emacs-a8da4d033d98f6bee89f3fd3f067389705c45d4d.tar.gz emacs-a8da4d033d98f6bee89f3fd3f067389705c45d4d.tar.bz2 emacs-a8da4d033d98f6bee89f3fd3f067389705c45d4d.zip |
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
Diffstat (limited to 'lisp/emacs-lisp/cursor-sensor.el')
0 files changed, 0 insertions, 0 deletions