summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cursor-sensor.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-10-10 07:35:33 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-10-10 07:35:33 -0700
commitbe589ea0dc71063d26595378df303a2a1c25ee4e (patch)
tree6b98db09a0df03c66f2750e4e40afabfad1a8229 /lisp/emacs-lisp/cursor-sensor.el
parentcf9bdf12da73bef67a6cc27a71ab76c67af24111 (diff)
parenta6e0a6770129e612398c8db98cd214586dc250f4 (diff)
downloademacs-be589ea0dc71063d26595378df303a2a1c25ee4e.tar.gz
emacs-be589ea0dc71063d26595378df303a2a1c25ee4e.tar.bz2
emacs-be589ea0dc71063d26595378df303a2a1c25ee4e.zip
; Merge from origin/emacs-25
The following commits were skipped: a6e0a67 gitmerge: Add cherry pick to gitmerge-skip-regexp fb12af2 ; Merge: some backports from master 6234012 Don't require isearch-update before isearch-done 5e50114 Avoid error in icalendar--read-element ace9d22 Make a menu less ambiguous e683495 Doc fix for url-http
Diffstat (limited to 'lisp/emacs-lisp/cursor-sensor.el')
0 files changed, 0 insertions, 0 deletions