; Merge from origin/emacs-26

The following commits were skipped:

7a81586bd7 Fix Bug#29149 in dired-aux.el
9b2c3c190a Fix Bug#29149 in shell.el
This commit is contained in:
Glenn Morris 2018-01-15 13:53:40 -08:00
commit 8491cbef1a

Diff content is not available