summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-09-26 16:18:08 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-09-26 16:18:08 -0700
commit3db6defcf43561deb2733446571ca1fc9f589f8f (patch)
tree1e02fcc7d96e31aedb28ebb618b8e3f484be9c9a /lisp/emacs-lisp
parenta2513667af6c1cfc58e971b9a5476cd5edfaef1c (diff)
parent5b734087b18e4596cdf2fa34806e092c4b532db1 (diff)
downloademacs-3db6defcf43561deb2733446571ca1fc9f589f8f.tar.gz
emacs-3db6defcf43561deb2733446571ca1fc9f589f8f.tar.bz2
emacs-3db6defcf43561deb2733446571ca1fc9f589f8f.zip
; Merge from origin/emacs-25
The following commit was skipped: 5b73408 Backport mm-convert-shr-links fix from master (bug#23964)
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions