Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

; Fix wording of recent documentation changes

Browse source 
* lisp/desktop.el (desktop-restore-frames):
* etc/NEWS:
* doc/emacs/misc.texi (Saving Emacs Sessions): Fix wording of the
recent changes.
This commit is contained in:
Eli Zaretskii 2025-04-05 10:11:03 +03:00
parent 3ee021dc19
commit cffe5a0245
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/emacs/misc.texi
View file

@ -2925,13 +2925,14 @@ if the current Emacs session didn't load any desktop yet.
@vindex desktop-restore-frames
By default, the desktop tries to save and restore the frame and window
configuration.@footnote{Except on Android, where this option defaults to
@code{nil} because the window manager (@pxref{Android Windowing}) is too
prohibitive to admit of restoring frame configurations.} To disable or
enable this, set @code{desktop-restore-frames} to @code{nil} or any
non-@code{nil} value respectively. (See that variable's documentation
for some related options that you can customize to fine-tune this
behavior.)
configuration.@footnote{
Except on Android, where this option defaults to @code{nil} because the
window manager (@pxref{Android Windowing}) is too prohibitive, and
doesn't allow restoring frame configurations.}
To disable or enable this, set @code{desktop-restore-frames} to
@code{nil} or any non-@code{nil} value respectively. (See that
variable's documentation for some related options that you can customize
to fine-tune this behavior.)
@vindex frameset-filter-alist
When the desktop restores the frame and window configuration, it

6
etc/NEWS
View file

@ -2088,9 +2088,9 @@ where this remains unsupported is Nextstep (GNUstep or Mac OS).
---
** 'desktop-restore-frames' has been disabled by default on Android systems.
Restrictions imposed on clients by the window manager on these systems
are too prohibitive to admit of restoring frame configurations, and on
the same account many window management facilities are unimplemented by
Emacs also.
are too prohibitive and don't allow restoring frame configurations.
(For the same reason many window management facilities are also not
implemented by Emacs.)
---
** 'NSSpeechRecognitionUsageDescription' now included in "Info.plist" (macOS).

6
lisp/desktop.el
View file

@ -428,9 +428,9 @@ host is off-line."
See related options `desktop-restore-reuses-frames',
`desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'.
This option is enabled by default elsewhere than on Android, where it is
disabled by default as programs are too handicapped by the window
manager for frames to be restored."
This option is enabled by default, except on Android. It is disabled by
default on Android because the window manager there prevents programs from
restoring frames."
:type 'boolean
:group 'desktop
:version "31.1")