master 580bb8f46c4: Merge from origin/emacs-29

[Stefan Kangas]

branch: master
commit 580bb8f46c413506e53f77a25fbdea3322922f88
Merge: 9565e34762a 3cae0e3d96a
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-29
    
    3cae0e3d96a python-ts-mode: Fix single-quote string fontification
    68d753e3712 ; * etc/NEWS: Fix typos.
    ab0cc4e7811 Fix infloop in bidi.c
    3b8b23f66df ; Fix doc string of 'emacs-lisp-byte-compile'
    
    # Conflicts:
    #       etc/NEWS
---
 etc/NEWS.29                  | 10 +++++-----
 lisp/progmodes/elisp-mode.el |  2 +-
 lisp/progmodes/python.el     |  2 +-
 src/bidi.c                   |  1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/etc/NEWS.29 b/etc/NEWS.29
index b6c6f2c6362..5a244285efa 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -828,12 +828,12 @@ filter/sentinel error has been handled.
 +++
 ** New faces for font-lock.
 These faces are primarily meant for use with tree-sitter.  They are:
-'font-lock-function-call-face', 'font-lock-variable-ref-face',
 'font-lock-bracket-face', 'font-lock-delimiter-face',
-'font-lock-escape-face', 'font-lock-misc-punctuation-face',
-'font-lock-number-face', 'font-lock-operator-face',
-'font-lock-property-name-face', 'font-lock-property-ref-face',
-'font-lock-punctuation-face', and 'font-lock-regexp-face'.
+'font-lock-escape-face', 'font-lock-function-call-face',
+'font-lock-misc-punctuation-face', 'font-lock-number-face',
+'font-lock-operator-face', 'font-lock-property-name-face',
+'font-lock-property-ref-face', 'font-lock-punctuation-face',
+'font-lock-regexp-face', and 'font-lock-variable-ref-face'.
 
 +++
 ** New face 'variable-pitch-text'.
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index f7cd9e90926..27e39900830 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -191,7 +191,7 @@ All commands in `lisp-mode-shared-map' are inherited by 
this map."
   menu)
 
 (defun emacs-lisp-byte-compile ()
-  "Byte compile the file containing the current buffer."
+  "Byte-compile the current buffer's file."
   (interactive nil emacs-lisp-mode)
   (if buffer-file-name
       (byte-compile-file buffer-file-name)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8220e3086fd..5aab31c3ea8 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1070,7 +1070,7 @@ fontified."
     ;; Don't highlight string prefixes like f/r/b.
     (save-excursion
       (goto-char string-beg)
-      (when (search-forward "\"" string-end t)
+      (when (re-search-forward "[\"']" string-end t)
         (setq string-beg (match-beginning 0))))
     (treesit-fontify-with-override
      string-beg string-end face override start end)))
diff --git a/src/bidi.c b/src/bidi.c
index 93875d243e4..3c26ae19322 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1126,6 +1126,7 @@ bidi_set_paragraph_end (struct bidi_it *bidi_it)
   bidi_it->invalid_levels = 0;
   bidi_it->invalid_isolates = 0;
   bidi_it->stack_idx = 0;
+  bidi_it->isolate_level = 0;
   bidi_it->resolved_level = bidi_it->level_stack[0].level;
 }