summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-09-25 11:16:05 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-09-25 11:16:05 -0700
commit0bd61c212fe53fb843a10da9a2da88e110d3785a (patch)
treef8a36a8338b59b5ffeaca8b3049c10e385ddf611 /lisp/emacs-lisp
parent1bb8ac0c02d91c64ae14e37680fc90ff899da2b4 (diff)
parent3003ac046900f9e7fdaa3161b99dbb1cc8f37b32 (diff)
downloademacs-0bd61c212fe53fb843a10da9a2da88e110d3785a.tar.gz
emacs-0bd61c212fe53fb843a10da9a2da88e110d3785a.tar.bz2
emacs-0bd61c212fe53fb843a10da9a2da88e110d3785a.zip
; Merge from origin/emacs-26
The following commit was skipped: 3003ac0469 Adapt Tramp version. Do not merge
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions