From: Glenn Morris <rgm@gnu.org>
Date: Mon, 4 Jun 2018 16:25:22 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~5336
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ee82a4ea98a17362fe36bfd5253eda768003683;p=emacs.git

Merge from origin/emacs-26

03697e6 Fix remote-host directory tracking for shells in `term' buffers
16e8541 Update doc string of 'rx'
---

4ee82a4ea98a17362fe36bfd5253eda768003683