Merge from origin/emacs-29

79659416f95 ; * admin/git-bisect-start: Fix commit hash
a9037aa8e81 ; Fix use-package-ensure-system-package macOS footnote
7d787564c08 Actually improve detection of long lines
118465f6fed ; Improve checkdoc.el commentary section
30e3cb21351 Unset the weight/slant/width in the spec when realizing a...
01154166057 Update to Org 9.6-31-g954a95
26a8644a587 ; tabulated-list.el: Remove duplicate obsolete declaration
29b9aeae32a ; * doc/misc/use-package.texi: Fix misplaced @end group.
3c5a41b2008 ; * doc/lispref/keymaps.texi (Searching Keymaps): Fix a t...
1753da24cd4 Fix infloop in 'shell-resync-dirs' with tcsh
2f1269c3331 ; Fix some minor issues in use-package.texi

2 files changed, 17 insertions, 21 deletions

diff --git a/doc/misc/org.org b/doc/misc/org.org
index 43d85099cff..0b926e3ceed 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -1401,7 +1401,7 @@ you, configure the option ~org-table-auto-blank-field~.
 - {{{kbd(M-x org-table-blank-field)}}} ::
 
   #+findex: org-table-blank-field
-  Blank the field at point.
+  Blank the current table field or active region.
 
 - {{{kbd(S-TAB)}}} (~org-table-previous-field~) ::
 
diff --git a/doc/misc/use-package.texi b/doc/misc/use-package.texi
index d3b6ee99003..6447f96c63f 100644
--- a/doc/misc/use-package.texi
+++ b/doc/misc/use-package.texi
@@ -652,12 +652,11 @@ elisp, GNU Emacs Lisp Reference Manual}).  Further, this value is fixed at
 whatever was determined during compilation, to avoid looking up the
 same information again on each startup.  For example:
 
-@c FIXME: the below should use shell-command-to-string, surely?
 @lisp
 @group
 (eval-and-compile
   (defun ess-site-load-path ()
-    (shell-command "find ~ -path ess/lisp")))
+    (shell-command-to-string "find ~ -path ess/lisp")))
 @end group
 
 @group
@@ -739,10 +738,8 @@ function and variable definitions that will:
 
 @enumerate
 @item
-@c FIXME: ``within a guard block''? what's that??
 Make the byte-compiler happy: it will not complain about functions
-whose definitions are unknown because you have them within a guard
-block.
+whose definitions are unknown.
 
 @item
 Define functions and variables that will be used in an @code{:if}
@@ -1684,9 +1681,9 @@ them directly to the developers of that package manager.
 
 Some users might want to byte-compile their init file to make Emacs
 startup faster.  This is not recommended in most cases, as the
-speed-up is often too small to be worth it, and can lead to confusion
-if the byte-compiled files are out-of-date.  If you still want to do
-it, this chapter explains how to do that.
+speed-up is usually too small to be worth it, and it can lead to
+confusion if the byte-compiled files are out-of-date.  If you still
+want to do it, this chapter explains how to do that.
 
 @code{use-package} always loads every library that it can while a file
 is being byte-compiled.  This helps silence spurious warnings about
@@ -1723,9 +1720,8 @@ If you need to silence a missing function warning, you can use
   (defun my-ruby-mode-hook ()
     (require 'inf-ruby)
     (inf-ruby-keys))
-@end group
-
   (add-hook 'ruby-mode-hook 'my-ruby-mode-hook))
+@end group
 @end lisp
 
 @findex :no-require
@@ -1922,11 +1918,12 @@ be optionally enabled.
 @findex :ensure-system-package
 The @code{:ensure-system-package} keyword allows you to ensure certain
 executables are available on your system alongside your package
-declarations.@footnote{On macOS, you will want to make sure
-@code{exec-path} is cognisant of all binary package names that you
-would like to ensure are installed.  The
+declarations.@footnote{On macOS, your @code{exec-path} might be
+different if you are starting Emacs as a GUI app instead of from a
+shell.  If you find that Emacs on macOS cannot find some executables
+that you know are already installed, you could try the
 @uref{https://github.com/purcell/exec-path-from-shell,@samp{exec-path-from-shell}}
-package is often a good way to do this.}
+package.}
 
 To use this extension, add this immediately after loading
 @code{use-package}:
@@ -1962,7 +1959,7 @@ together with @code{:ensure}.
 @end group
 @end lisp
 
-For example, on a @code{Debian GNU/Linux} system, this would call
+For example, on a Debian GNU/Linux system, this would call
 @samp{apt-get install foo}.
 
 If the package is named differently than the binary, you can use a
@@ -1976,11 +1973,10 @@ cons in the form of @code{(binary . package-name)}.  For example:
 @end group
 @end lisp
 
-On a @code{Debian GNU/Linux} system, this would call @code{apt install
-foo} if Emacs could not locate the executable
-@code{foocmd}.@footnote{For manual testing, you could use the
-@code{executable-find} function, which is what @samp{system-packages}
-uses internally.}
+On a Debian GNU/Linux system, this would call @code{apt install foo}
+if Emacs could not locate the executable @code{foocmd}.@footnote{For
+manual testing, you could use the @code{executable-find} function,
+which is what @samp{system-packages} uses internally.}
 
 @code{:ensure-system-package} can also take a cons where the
 @code{cdr} is a string that will get called by