diff options
| author | Glenn Morris | 2019-02-15 13:25:30 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-02-15 13:25:30 -0800 |
| commit | 38b442429bd0f15212960fb7fd37bd701cc8af3f (patch) | |
| tree | 9df0fac95982d162f647d117ea28c0f90b787c53 /src | |
| parent | a29c70d29b349712928ef8f12cfb87834df359a4 (diff) | |
| parent | 58e0e929afd432190296e6a412ff2458420fcb95 (diff) | |
| download | emacs-38b442429bd0f15212960fb7fd37bd701cc8af3f.tar.gz emacs-38b442429bd0f15212960fb7fd37bd701cc8af3f.zip | |
; Merge from origin/emacs-26
The following commits were skipped:
58e0e92 Backport: js-indent-align-list-continuation: Make variable safe
6d89120 Avoid crashes upon C-g in nested invocations of 'read_char'
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions