master cc5491c575d 5/5: Merge from origin/emacs-31

branch: master
commit cc5491c575d47eb14c7206598c515b9aed4a5724
Merge: e000b6c4c68 39cb1e483fd
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    Merge from origin/emacs-31
    
    39cb1e483fd ; * lisp/bookmark.el (bookmark-alist): Doc fix (bug#81461).
    296869994e4 ; Remove 'sit-for' treesit parser workaround (bug#81019)
    633a998bcfd ; Improve documentation of text properties for strings
---
 doc/lispref/strings.texi           | 3 +++
 lisp/bookmark.el                   | 2 +-
 lisp/textmodes/markdown-ts-mode.el | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 53d80bc84d2..5aac39fa0f9 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -444,6 +444,9 @@ characters, and removes all text properties.  It may also change
 @var{string}'s length.
 @end defun
 
+  To modify the text properties of a string, use the functions described
+in @ref{Changing Properties}.
+
 @need 2000
 @node Text Comparison
 @section Comparison of Characters and Strings
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 1113144f87a..77136308573 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -286,7 +286,7 @@ described below.  An entry with a key but null value means the entry
 is not used.
 
  (filename . FILENAME)
- (buf . BUFFER-OR-NAME)
+ (buffer . BUFFER-OR-NAME)
  (position . POS)
  (front-context-string . STR-AFTER-POS)
  (rear-context-string  . STR-BEFORE-POS)
diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 9b287d4459b..6b0b0424095 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -3098,8 +3098,6 @@ See `markdown-ts--run-command-in-code-block'.")
 
 (defun markdown-ts--enable-code-block-in-context-mode ()
   "Enable `markdown-ts-code-block-in-context-mode' if in a fenced code block."
-  ;; Let treesit catch up with buffer edits.
-  (sit-for 0)
   (markdown-ts-code-block-in-context-mode
    (if (markdown-ts-at-code-block-p) 1 -1)))