Merge from origin/emacs-29

d09de2f49d7 Ignore quit while getting interprogram paste in kill-new
afdf54a5313 * lisp/progmodes/gdb-mi.el: Fix interactive invocation of...
b54febef5d7 Fix NetBSD build with and without ncurses
c5fb7301599 ; * lisp/paren.el (show-paren-function): Fix last change ...
ea696ea4b9a ; Fix last change.
b0181dafb9e Improve documentation of 'enable-local-variables' in Emac...
eb7c45ca43f ; Fix copy-paste in Widget Manual (Bug#64610)
aedbc3006e1 ; * doc/misc/eshell.texi (Aliases): Remove stray "@end ta...
673992d28e2 ; * lisp/progmodes/sql.el (sql-interactive-mode): Remove ...

8 files changed, 23 insertions, 16 deletions

diff --git a/configure.ac b/configure.ac
index a51aa44cf2c..38ff6e18daf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5174,7 +5174,11 @@ fail;
     ;;
 
   netbsd)
-    if test "x$LIBS_TERMCAP" != "x-lterminfo"; then
+    # NetBSD versions prior to 6.0 lack native terminfo, but have a
+    # tputs() built on top of termcap in these libraries. Use native
+    # termcap instead in this case. NetBSD >= 6.0 has native terminfo
+    # implementation in -lterminfo.
+    if test "x$LIBS_TERMCAP" = "x-ltermcap" -o "x$LIBS_TERMCAP" = "x-lcurses"; then
       TERMINFO=no
       LIBS_TERMCAP="-ltermcap"
     fi
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index d8221f51425..d2d51e344dd 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1368,9 +1368,11 @@ can include remote directories as well (@pxref{Remote Files}).
 way Emacs processes local variables.  Its default value is @code{t},
 which specifies the behavior described above.  If it is @code{nil},
 Emacs simply ignores all file local variables.  @code{:safe} means use
-only the safe values and ignore the rest.  Any other value says to
-query you about each file that has local variables, without trying to
-determine whether the values are known to be safe.
+only the safe values and ignore the rest.  @code{:all} instructs Emacs
+to set all file local variables regardless of whether their value is
+safe or not (we advise not to use this permanently).  Any other value
+says to query you about each file that has local variables, without
+trying to determine whether the values are known to be safe.
 
 @vindex enable-local-eval
 @vindex safe-local-eval-forms
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 9b9268ae4ea..099bf3e9809 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1092,8 +1092,6 @@ the alias.  This lets you selectively use an alias's arguments, so
 @kbd{alias mcd 'mkdir $1 && cd $1'} would cause @kbd{mcd foo} to
 create and switch to a directory called @samp{foo}.
 
-@end table
-
 @node Remote Access
 @section Remote Access
 @cmindex remote access
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 4ac57a95a43..13b37ab5b54 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -1600,9 +1600,7 @@ when the widget is created, and on any value set later with
 @item :value-to-external
 Function to convert the value to the external format.  The function
 takes two arguments, a widget and an internal value, and returns the
-external value.  The function is called on the present @code{:value}
-when the widget is created, and on any value set later with
-@code{widget-value-set}.
+external value.
 
 @vindex create@r{ keyword}
 @item :create
diff --git a/lisp/paren.el b/lisp/paren.el
index 54a2c23f17f..6296d7e67fa 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -515,10 +515,9 @@ It is the default value of `show-paren-data-function'."
                                   ;; ...or partially visible, and the
                                   ;; invisible part is less than 1/4th
                                   ;; of the default font height
-                                  (or (< (length part) 4)
-                                      (and
+                                  (and (>= (length part) 4)
                                        (< (nth 2 part) dfh4)
-                                       (< (nth 3 part) dfh4)))))))
+                                       (< (nth 3 part) dfh4))))))
               (let ((context (blink-paren-open-paren-line-string
                               openparen))
                     (message-log-max nil))
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 199be3318a1..a1091de43e9 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -987,7 +987,7 @@ detailed description of this mode.
            "\C-u" "Continue to current line or address.")
   (gud-def
    gud-go (progn
-            (when arg
+            (when (and current-prefix-arg arg)
               (gud-call (concat "-exec-arguments "
                                 (read-string "Arguments to exec-run: "))))
             (gud-call
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index c6667c075f6..89d62ab3a61 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4200,7 +4200,7 @@ must tell Emacs.  Here's how to do that in your init file:
 
 (put 'sql-interactive-mode 'mode-class 'special)
 (put 'sql-interactive-mode 'custom-mode-group 'SQL)
-;; FIXME: Why not use `define-derived-mode'?
+
 (define-derived-mode sql-interactive-mode comint-mode "SQLi[?]"
   "Major mode to use a SQL interpreter interactively.
 
diff --git a/lisp/simple.el b/lisp/simple.el
index e31ef026ad5..54e71e1b040 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5651,8 +5651,14 @@ argument should still be a \"useful\" string for such uses."
       (if (fboundp 'menu-bar-update-yank-menu)
           (menu-bar-update-yank-menu string (and replace (car kill-ring)))))
     (when save-interprogram-paste-before-kill
-      (let ((interprogram-paste (and interprogram-paste-function
-                                     (funcall interprogram-paste-function))))
+      (let ((interprogram-paste
+             (and interprogram-paste-function
+                  ;; On X, the selection owner might be slow, so the user might
+                  ;; interrupt this. If they interrupt it, we want to continue
+                  ;; so we become selection owner, so this doesn't stay slow.
+                  (if (eq (window-system) 'x)
+                      (ignore-error 'quit (funcall interprogram-paste-function))
+                    (funcall interprogram-paste-function)))))
         (when interprogram-paste
           (setq interprogram-paste
                 (if (listp interprogram-paste)