diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-18 14:05:31 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-18 14:05:31 -0700 |
| commit | 3aa73b04e81ebc396892b14e5e9fa78a13ff85d1 (patch) | |
| tree | 336a9b31454bbf0f9c888ea6169c852e7eae9462 /lisp/emacs-lisp/derived.el | |
| parent | dd92b5f5047931f6020045ce47360b62d1c2cb72 (diff) | |
| parent | 1b98a68b660501c44d3a142a12ee35e3c215b05a (diff) | |
| download | emacs-3aa73b04e81ebc396892b14e5e9fa78a13ff85d1.tar.gz emacs-3aa73b04e81ebc396892b14e5e9fa78a13ff85d1.tar.bz2 emacs-3aa73b04e81ebc396892b14e5e9fa78a13ff85d1.zip | |
; Merge from origin/emacs-25
The following commit was skipped:
1b98a68 Fix Bug#20637. Do not merge to master
Diffstat (limited to 'lisp/emacs-lisp/derived.el')
0 files changed, 0 insertions, 0 deletions