Merge from origin/emacs-29

84d2da003e1 ; Fix example in the Flymake manual
0a1459f1d9b * doc/misc/calc.texi (Advanced Math Functions): Correct c...
92faf1f5645 Consider 'dired-kill-when-opening-new-dired-buffer' in mo...
bafe71a69fc ; Fix use-package.texi markup
018e4ca6c5d ; * doc/misc/calc.texi (Advanced Math Functions): Fix las...
1952dbd4c5f Fix Gamma function definition in calc.texi
f73f82d7e89 Fix subscripts in the Calc manual
70fc7c41ef3 Improve documentation of 'declare' forms
c8357582389 ; * src/lread.c (bytecode_from_rev_list): Avoid C++ comment.
28478574961 Improve tree-sitter docs
0e9307eb2b8 Fix some Texinfo markup in manuals
8dc08333eea Fix bol/bos anchors in tree-sitter :match regexps
8225ade6151 ; * src/xdisp.c (syms_of_xdisp) <display-line-numbers>: F...
1f0527a312a ; Fix last change in tex-mode.el
4da479920e6 * lisp/subr.el (with-restriction): Tweak indent rule
36aa9bd8183 ; Fix previous change
aaeaf608d89 Fix setting region in the minibuffer
1383efe01d0 Fix setting $DBUS_SESSION_BUS_ADDRESS after Emacs has sta...
bdb0bc2b4e4 Fix tex-mode display-buffer issues
90047c38ce9 Add test for when 'completion-auto-help' is 'visible'
2c623e4feb9 Avoid errors in 'apropos-documentation' after 'eval-buffer'
dd3b98121cc ; * doc/emacs/indent.texi (Indentation Commands): Fix las...
904edf1f076 Mention indent-rigidly in the Emacs manual

3 files changed, 3 insertions, 3 deletions

diff --git a/src/dbusbind.c b/src/dbusbind.c
index d96b735c79a..97094e407d7 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -276,7 +276,7 @@ XD_OBJECT_TO_STRING (Lisp_Object object)
 
 #define XD_DBUS_VALIDATE_BUS_ADDRESS(bus)                               \
   do {                                                                  \
-    char const *session_bus_address = getenv ("DBUS_SESSION_BUS_ADDRESS"); \
+    char const *session_bus_address = egetenv ("DBUS_SESSION_BUS_ADDRESS"); \
     if (STRINGP (bus))                                                  \
       {                                                                 \
         DBusAddressEntry **entries;                                     \
diff --git a/src/lread.c b/src/lread.c
index 0ee208b7cba..51d0d2a3c24 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3288,7 +3288,7 @@ bytecode_from_rev_list (Lisp_Object elems, Lisp_Object readcharfun)
              Convert them back to the original unibyte form.  */
           vec[COMPILED_BYTECODE] = Fstring_as_unibyte (vec[COMPILED_BYTECODE]);
         }
-      // Bytecode must be immovable.
+      /* Bytecode must be immovable.  */
       pin_string (vec[COMPILED_BYTECODE]);
     }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 1830d1965a6..8bcf2acfe04 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -37139,7 +37139,7 @@ shown in a window.  Absolute line numbers count from the beginning of
 the current narrowing, or from buffer beginning.  The variable
 `display-line-numbers-offset', if non-zero, is a signed offset added
 to each absolute line number; it also forces line numbers to be counted
-from the beginning of the buffer, as if `display-line-numbers-wide'
+from the beginning of the buffer, as if `display-line-numbers-widen'
 were non-nil.  It has no effect when line numbers are not absolute.
 
 If the value is `relative', display for each line not containing the