Merge from origin/emacs-31

7a17f97baa7 Prettify special glyphs
f13287fde0d Revert "sh-script: Mark + and * as punctuation rather tha...
70b79b3ed8d Rename `icalendar-recur' type and related functions
3d2bb233f27 ; Minor Tramp changes
f6281d757d3 ; * etc/NEWS: Tell how to disable 'markdown-ts-mode'.
142b1e0d4c3 Fix Lisp injection via X-Draft-From in Gnus
d6f7b2d99bd Save/restore old_buffer slot via window configurations (B...
e0fbecaf658 Adapt ert-remote-temporary-file-directory settings
3de7f0ce5e5 Fix warning message in 'markdown-ts-mode--initialize'
7df8604ea63 ; Improve documentation of lazy-highlight in search and r...
2936b36164d Fix "assertion 'GTK_IS_WINDOW (window)' failed"
98348a0bdc9 [Xt] Fix child frame resizing glitch
13b29eebc16 Eglot: use standard face for completion annotations (bug#...

# Conflicts:
#	etc/NEWS

2 files changed, 23 insertions, 9 deletions

diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 2bd35380780..5f7aa1f1ef5 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -2202,24 +2202,20 @@ variable @code{isearch-lazy-highlight} to @code{nil} disables this
 highlighting.  Here are some other variables that customize the lazy
 highlighting:
 
-@table @code
+@vtable @code
 @item lazy-highlight-initial-delay
-@vindex lazy-highlight-initial-delay
 Time in seconds to wait before highlighting visible matches.
 Applies only if the search string is less than
 @code{lazy-highlight-no-delay-length} characters long.
 
 @item lazy-highlight-no-delay-length
-@vindex lazy-highlight-no-delay-length
 For search strings at least as long as the value of this variable,
 lazy highlighting of matches starts immediately.
 
 @item lazy-highlight-interval
-@vindex lazy-highlight-interval
 Time in seconds between highlighting successive matches.
 
 @item lazy-highlight-max-at-a-time
-@vindex lazy-highlight-max-at-a-time
 The maximum number of matches to highlight before checking for input.
 A large number can take some time to highlight, so if you want to
 continue searching and type @kbd{C-s} or @kbd{C-r} during that time,
@@ -2227,17 +2223,28 @@ Emacs will not respond until it finishes highlighting all those
 matches.  Thus, smaller values make Emacs more responsive.
 
 @item isearch-lazy-count
-@vindex isearch-lazy-count
 Show the current match number and the total number of matches in the
 search prompt.
 
 @item lazy-count-prefix-format
 @itemx lazy-count-suffix-format
-@vindex lazy-count-prefix-format
-@vindex lazy-count-suffix-format
 These two variables determine the format of showing the current and
 the total number of matches for @code{isearch-lazy-count}.
-@end table
+
+@item lazy-highlight-buffer
+If non-@code{nil}, lazy highlighting highlights the matches in the
+entire buffer, not only those visible on display of the current window
+(so, for example, they will also become visible in other windows showing
+the same buffer).
+
+@item lazy-highlight-buffer-max-at-a-time
+Like @code{lazy-highlight-max-at-a-time}, but used for highlighting
+matches not currently visible in the window when
+@code{lazy-highlight-buffer} is non-@code{nil}.  It defaults to 200; set
+to @code{nil} to highlight all the matches in a buffer without checking
+for input.  @strong{Warning:} this could make Emacs not responsive when
+searching large buffers.
+@end vtable
 
 @vindex search-nonincremental-instead
   Normally, entering @key{RET} within incremental search when the
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index ae65cf2a620..6daa2b010cf 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -6436,6 +6436,13 @@ You can change this directory by setting the user option
 
 
 @item
+I get an error @samp{Method `gdrive' not supported by GVFS}.
+
+@samp{google-drive} has been disabled in @acronym{GNOME} 50.  It is
+not clear yet whether and when it will be reenabled.
+@c @uref{https://discourse.gnome.org/t/google-drive-in-gnome-50/34417}
+
+@item
 How to ignore errors when changing file attributes?
 
 @vindex tramp-inhibit-errors-if-setting-file-attributes-fail