From: Glenn Morris <rgm@gnu.org>
Date: Mon, 15 Jan 2018 21:53:40 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5871
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8491cbef1afa0e4088729bfd7476d82bc2f09bba;p=emacs.git

; 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
---

8491cbef1afa0e4088729bfd7476d82bc2f09bba