Merge from origin/emacs-31

7eab6ef3cee Fix 'sgml-parse-tag-backward' to handle tags in comments
09dc864b0b8 Fix eww-submit for forms with no action (bug#80918)
0e7a24d9313 * lisp/progmodes/hideshow.el (hs--set-variable): Use 'set...
f12b01582db Fix Completions buffer disappearing with tmm-menubar (bug...
519fd832111 Fix secrets.el when Emacs is a flatpak
9e4ea934f23 Fix 'prepare-user-lisp' to follow symlinks
e613e38021e Update "timeout" to 2.1.6
196fd80689e [GTK3, HiDPI] Fix width/height round-trip through Configu...
acc07f1a030 [GTK3] On Expose, repaint the border before the content
5323eebcffc Test read-passwd behavior (bug#80838)
01c5990dd06 Fix nested read-passwd calls (bug#80838)
027043df257 ; * lisp/gnus/message.el (message-server-alist): Doc fix ...
3b608b233ed Fix terminal emulation of "ESC [ K" sequence
6a605c65a83 Fix vertical-motion across overlay strings with embedded ...
e4d529c67b6 ; Fix last change
d54faa0f1bf Mark gnus-dbus.el as obsolete
9bf2a19bb21 Move gnus-dbus.el to obsolete/gnus-dbus.el
984024daf3c Gnus: Use new sleep library
d7c130972e0 ; * lisp/term/pgtk-win.el (icon-map-list): Fix :type.
5579893ed7c ; Don't block/unblock input in text_extents methods
547b1ee7b6d Fix Rmail behavior wrt globalized minor modes
6ba05106f4e Fix display images in the display margins
56f27dd9f06 Eglot: fix eglot--sig-info with non-UTF-32 positionEncoding
543d8a7a9d7 [NS] Fix deprecated variable (bug#80985)

# Conflicts:
#	etc/NEWS

2 files changed, 44 insertions, 14 deletions

diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 1f9d571a3b0..8764fcade90 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -66,6 +66,7 @@ another.  An overview of D-Bus can be found at
 * Errors and Events::           Errors and events.
 * Monitoring Messages::         Monitoring messages.
 * File Descriptors::            Handle file descriptors.
+* Flatpak integration::         Integration with flatpak
 * Index::                       Index including concepts, functions, variables.
 
 * GNU Free Documentation License:: The license for this documentation.
@@ -2302,6 +2303,38 @@ instance have acquired a file descriptor as well.  Example:
 @end defun
 
 
+@node Flatpak integration
+@chapter Integration with flatpak
+
+@c https://docs.flatpak.org/en/latest/sandbox-permissions.html
+@c TODO: This needs more input.
+
+If you run the Emacs flatpak program, there are restrictions.  By
+default, there is limited access to the session D-Bus, and no access to
+the system D-Bus.  You must enable access to services living outside the
+sandbox like
+
+@example
+# flatpak override --talk-name=org.freedesktop.secrets org.gnu.emacs
+@end example
+
+@samp{org.gnu.emacs} is the Emacs flatpak application, and
+@samp{org.freedesktop.secrets} is a service you want to talk to, for
+example.
+
+Access to the entire bus with @samp{--socket=system-bus} or
+@samp{--socket=session-bus} stops the filtering and using them is a
+security risk. So they must be avoided.
+
+@c Bug#80977.
+Service names might be mapped when arriving Emacs.  For example, you
+will see the @samp{org.freedesktop.DBus.NameOwnerChanged} signal for
+service @samp{org.freedesktop.portal.Flatpak}, even if you have
+registered the signal for another namespace.
+
+@c TODO: What about portals?
+
+
 @node Index
 @unnumbered Index
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a440aac1a90..fa436e0b87d 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -849,7 +849,7 @@ Various
 * Spam Package::                A package for filtering and processing spam.
 * The Gnus Registry::           A package for tracking messages by Message-ID.
 * The Gnus Cloud::              A package for synchronizing Gnus marks.
-* D-Bus Integration::           Closing Gnus servers on system sleep.
+* System Sleep Integration::    Closing Gnus servers on system sleep.
 * Other modes::                 Interaction with other modes.
 * Various Various::             Things that are really various.
 
@@ -22712,7 +22712,7 @@ For instance, @code{nnir-notmuch-program} is now
 * Spam Package::                A package for filtering and processing spam.
 * The Gnus Registry::           A package for tracking messages by Message-ID.
 * The Gnus Cloud::              A package for synchronizing Gnus marks.
-* D-Bus Integration::           Closing Gnus servers on system sleep.
+* System Sleep Integration::    Closing Gnus servers on system sleep.
 * Other modes::                 Interaction with other modes.
 * Various Various::             Things that are really various.
 @end menu
@@ -26680,11 +26680,11 @@ CloudSynchronizationDataPack(TM)s.  It's easiest to set this from the
 Server buffer (@pxref{Gnus Cloud Setup}).
 @end defvar
 
-@node D-Bus Integration
-@section D-Bus Integration
-@cindex dbus
-@cindex D-Bus
-@cindex gnus-dbus
+@c Section name changed from this in Emacs 31.  @c
+@c This anchor allows old links to continue working.  @c
+@anchor{D-Bus Integration}
+@node System Sleep Integration
+@section System Sleep Integration
 @cindex system sleep
 @cindex closing servers automatically
 @cindex hung connections
@@ -26692,13 +26692,10 @@ Server buffer (@pxref{Gnus Cloud Setup}).
 When using laptops or other systems that have a sleep or hibernate
 functionality, it's possible for long-running server connections to
 become ``hung'', requiring the user to manually close and re-open the
-connections after the system resumes.  On systems compiled with D-Bus
-support (check the value of @code{(featurep 'dbusbind)}), Gnus can
-register a D-Bus signal to automatically close all server connections
-before the system goes to sleep.  To enable this, set
-@code{gnus-dbus-close-on-sleep} to a non-@code{nil} value.
-
-For more information about D-Bus and Emacs, @pxref{Top,,, dbus, D-Bus integration in Emacs}.
+connections after the system resumes.  Using the system sleep library,
+Gnus can automatically close all server connections before the system
+goes to sleep.  To enable this, set @code{gnus-close-on-sleep} to a
+non-@code{nil} value.
 
 @node Other modes
 @section Interaction with other modes