Merge branch 'master' into feature/tree-sitter

diff --cc configure.ac
Simple merge

diff --cc lisp/progmodes/python.el
index b498baec608d6a0dea423d2af14018d20aee55c0,80c5b31b6eaba9c88b5291be2c020f285ee169ea..801432cd188c2cbadd9ea5b782dceca34caf00be
--- 1/lisp/progmodes/python.el
--- 2/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@@ -245,9 -261,10 +261,12 @@@
  (require 'ansi-color)
  (require 'cl-lib)
  (require 'comint)
 -(eval-when-compile (require 'subr-x))   ;For `string-empty-p'.
 +(eval-when-compile (require 'subr-x))   ;For `string-empty-p' and `string-join'.
 +(require 'treesit)
 +(require 'pcase)
+ (require 'compat nil 'noerror)
+ (require 'project nil 'noerror)
+ (require 'seq)
  
  ;; Avoid compiler warnings
  (defvar compilation-error-regexp-alist)
@@@ -267,12 -284,13 +286,20 @@@
    :version "24.3"
    :link '(emacs-commentary-link "python"))
  
 +(defcustom python-use-tree-sitter nil
 +  "If non-nil, `python-mode' tries to use tree-sitter.
 +Currently `python-mode' uses tree-sitter for font-locking, imenu,
 +and movement functions."
 +  :type 'boolean)
 +
+ (defcustom python-interpreter "python"
+   "Python interpreter for noninteractive use.
+ To customize the Python shell, modify `python-shell-interpreter'
+ instead."
+   :version "29.1"
+   :type 'string)
+ 
++
  \f
  ;;; Bindings
  

diff --cc src/alloc.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge