diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 8b0f96a3de3..5feee108331 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -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 diff --git a/etc/NEWS b/etc/NEWS index fc202a795e4..5ee1e3596dd 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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). diff --git a/lisp/desktop.el b/lisp/desktop.el index 4067b5a1286..b19889c5c42 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -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")