diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:53:27 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:53:27 -0800 |
| commit | eab3f9e76b8188b5f99139b220a272fe3f2debaf (patch) | |
| tree | c78b2d85b6ea672e92ac3446da088ae0542ad359 /lisp/emacs-lisp/derived.el | |
| parent | 68ce800e9200724d36a0b1bf1923401682bce96d (diff) | |
| parent | dc42d0ca0b7b6877bd22b91e19c34d3d7d7902f9 (diff) | |
| download | emacs-eab3f9e76b8188b5f99139b220a272fe3f2debaf.tar.gz emacs-eab3f9e76b8188b5f99139b220a272fe3f2debaf.tar.bz2 emacs-eab3f9e76b8188b5f99139b220a272fe3f2debaf.zip | |
; Merge from origin/emacs-25
The following commits were skipped:
dc42d0c Use the correct background color when filling nested <divs>
9781dc4 Make <div> in <li> not insert extra newlines
Diffstat (limited to 'lisp/emacs-lisp/derived.el')
0 files changed, 0 insertions, 0 deletions