diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:41:05 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:41:05 -0800 |
| commit | 99e20f105aa8a33ca9e70b741400a46447a287af (patch) | |
| tree | 54f401c83871ceddcacfdd48abb2dbd661d03d46 /lisp/emacs-lisp/cursor-sensor.el | |
| parent | e22eabd5bcd6a840b4f4ff91e37a64c606c9751d (diff) | |
| parent | ba2847f5a5c3a34274d564584ce6e1d1fbae6e85 (diff) | |
| download | emacs-99e20f105aa8a33ca9e70b741400a46447a287af.tar.gz emacs-99e20f105aa8a33ca9e70b741400a46447a287af.tar.bz2 emacs-99e20f105aa8a33ca9e70b741400a46447a287af.zip | |
Merge from origin/emacs-25
ba2847f ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. ...
8b43f97 * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)
c20035c ; * doc/emacs/programs.texi (Man Page): Fix last change.
93d8346 Improve indexing of 'man'
Diffstat (limited to 'lisp/emacs-lisp/cursor-sensor.el')
0 files changed, 0 insertions, 0 deletions