Merge from origin/emacs-26

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

diff --cc lisp/emacs-lisp/rx.el
Simple merge

diff --cc lisp/term.el
Simple merge