From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 31 Jul 2023 15:11:23 +0000 (-0400)
Subject: ; Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cd6629c5dc73599176e7781b0a62b8904702f50a;p=emacs.git

; Merge from origin/emacs-29

The following commits were skipped:

0002d4f3166 Avoid spurious whitespace in the modeline of emacsclient ...
96d52f89444 Fix function help for advised aliases (bug#64797)
71419a60c37 Avoid crashes due to invalid 'mode-line-format'
b2cb6e82160 ; Better documentation of HOME on MS-Windows
54e98b5f9bd ; Clarify documentation of 'server-after-make-frame-hook'
d13029cdcde Avoid crashes under 'which-key-mode'
cb1f7db2490 ; Minor documentation fixes
4a687bcc20d Bump Emacs version
---

cd6629c5dc73599176e7781b0a62b8904702f50a