From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 14 Jan 2023 14:10:45 +0000 (-0500)
Subject: ; Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3eb495851ef0de8ca8ab81274d57954d51ead58e;p=emacs.git

; Merge from origin/emacs-29

The following commits were skipped:

59c3c53efa4 * lisp/subr.el (combine-change-calls-1): Fix bug#60467
9f8f8ed1baf Adapt tramp-tests.el  (do not merge with master)
---

3eb495851ef0de8ca8ab81274d57954d51ead58e