diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:52:26 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:52:26 -0800 |
| commit | eced64b2f76d1f85fb6fd54c67deadf1978cb344 (patch) | |
| tree | 75ab1abe5eef83d0f91da2d247ed1468ebb7e61b /lisp/emacs-lisp/lisp.el | |
| parent | fd4fc004ab4d4fd5a75f1663e7067e58cf389912 (diff) | |
| parent | dfe16506a98681b390b119a137776f10ed637126 (diff) | |
| download | emacs-eced64b2f76d1f85fb6fd54c67deadf1978cb344.tar.gz emacs-eced64b2f76d1f85fb6fd54c67deadf1978cb344.tar.bz2 emacs-eced64b2f76d1f85fb6fd54c67deadf1978cb344.zip | |
; Merge from origin/emacs-25
The following commits were skipped:
dfe1650 (ls-lisp-insert-directory): Make -B work
42bc065 Make buttons in header lines work
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
0 files changed, 0 insertions, 0 deletions