Merge from origin/emacs-29

e9b88f61ccc Fix a defcustom :type
3216cd96952 Fix pulse-flag :type
2065ab5562e Fix defcustoms in timeclock.el
bdd30132496 ; * lisp/image-mode.el (image-mode-to-text, image-mode-as...
5c2d9ae48ed ; * lisp/image-mode.el: Fix typos in doc strings (bug#663...
fa0d3f45aeb ; Improve wording of last change
3ef259e28a8 Improve documentation of `ns-use-proxy-icon`
712505a82b9 Document assigning libraries to packages in make-tarball.txt
6bdc5cfe384 Doc fix; more consistently refer to "text terminals"
d210d761b19 ; Fix doc strings of overlay-arrow variables
4fd00ff1f7e Fix defcustoms in type-break.el (Bug#66210)
47770b0eca4 Fix term-scroll-to-bottom-on-output :type
f8bdc8dff0b ; Normalize GNU ELPA :core package statements
63ec6d998d4 ; * doc/emacs/custom.texi (Early Init File): Improve inde...
a4185f87bd0 ; Silence macOS 14 warning
d9d6e14a698 ; * lisp/vc/vc.el (vc-next-action): Improve commentary.
d558f38fe5c ; * lisp/emacs-lisp/let-alist.el (let-alist): Fix quoting...
71feee79309 Doc fix in let-alist for keys with nil value
72cc9cf2cde ; Fix typos

diff --cc ChangeLog.4
Simple merge

diff --cc doc/emacs/custom.texi
Simple merge

diff --cc doc/emacs/emacs.texi
Simple merge

diff --cc doc/emacs/frames.texi
Simple merge

diff --cc doc/emacs/misc.texi
Simple merge

diff --cc doc/misc/gnus.texi
Simple merge

diff --cc lisp/image-mode.el
Simple merge

diff --cc lisp/net/tramp.el
Simple merge

diff --cc lisp/printing.el
Simple merge

diff --cc lisp/progmodes/project.el
index 2e6ae89a443ad7f10ab3d0f23fdf2036cd70dce4,920860f0d3a392debf9ff5230876ac229cc84470..68d5edc482cbb9a0720ab3f451c86c7c7d1c6766
--- 1/lisp/progmodes/project.el
--- 2/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@@ -1,11 -1,11 +1,11 @@@
  ;;; project.el --- Operations on the current project  -*- lexical-binding: t; -*-
  
  ;; Copyright (C) 2015-2023 Free Software Foundation, Inc.
 -;; Version: 0.9.8
 +;; Version: 0.10.0
  ;; Package-Requires: ((emacs "26.1") (xref "1.4.0"))
  
- ;; This is a GNU ELPA :core package.  Avoid using functionality that
- ;; not compatible with the version of Emacs recorded above.
+ ;; This is a GNU ELPA :core package.  Avoid functionality that is not
+ ;; compatible with the version of Emacs recorded above.
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/term.el
Simple merge

diff --cc lisp/type-break.el
Simple merge

diff --cc lisp/vc/vc.el
Simple merge

diff --cc src/nsfns.m
Simple merge

diff --cc src/nsterm.m
Simple merge

diff --cc src/xdisp.c
Simple merge