From: Stefan Kangas <stefan@marxist.se>
Date: Wed, 10 Aug 2022 04:31:02 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~1886^2~258
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=358ad0d30a099efcdc5a8f1d6fffe27360a91168;p=emacs.git

Merge from origin/emacs-28

14833cd9df Improve wording when documenting other TRAMP syntaxes
628df15da5 ; * doc/misc/viper.texi (Rudimentary Changes): Avoid alias.
85de996bbb * lisp/vc/diff-mode.el: Don't mention XEmacs.
---

358ad0d30a099efcdc5a8f1d6fffe27360a91168