aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2025-04-05 10:11:03 +0300
committerEli Zaretskii2025-04-05 10:11:03 +0300
commitcffe5a02454f0d2201172c07a239bd9a3682ad68 (patch)
treefd38b28caceb5259cb55e417d64d018c2792d5af
parent3ee021dc19e314f6f456867ec43c25aed5cc41b8 (diff)
downloademacs-cffe5a02454f0d2201172c07a239bd9a3682ad68.tar.gz
emacs-cffe5a02454f0d2201172c07a239bd9a3682ad68.zip
; Fix wording of recent documentation changes
* lisp/desktop.el (desktop-restore-frames): * etc/NEWS: * doc/emacs/misc.texi (Saving Emacs Sessions): Fix wording of the recent changes.
-rw-r--r--doc/emacs/misc.texi15
-rw-r--r--etc/NEWS6
-rw-r--r--lisp/desktop.el6
3 files changed, 14 insertions, 13 deletions
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.
2925 2925
2926@vindex desktop-restore-frames 2926@vindex desktop-restore-frames
2927 By default, the desktop tries to save and restore the frame and window 2927 By default, the desktop tries to save and restore the frame and window
2928configuration.@footnote{Except on Android, where this option defaults to 2928configuration.@footnote{
2929@code{nil} because the window manager (@pxref{Android Windowing}) is too 2929Except on Android, where this option defaults to @code{nil} because the
2930prohibitive to admit of restoring frame configurations.} To disable or 2930window manager (@pxref{Android Windowing}) is too prohibitive, and
2931enable this, set @code{desktop-restore-frames} to @code{nil} or any 2931doesn't allow restoring frame configurations.}
2932non-@code{nil} value respectively. (See that variable's documentation 2932To disable or enable this, set @code{desktop-restore-frames} to
2933for some related options that you can customize to fine-tune this 2933@code{nil} or any non-@code{nil} value respectively. (See that
2934behavior.) 2934variable's documentation for some related options that you can customize
2935to fine-tune this behavior.)
2935 2936
2936@vindex frameset-filter-alist 2937@vindex frameset-filter-alist
2937 When the desktop restores the frame and window configuration, it 2938 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).
2088--- 2088---
2089** 'desktop-restore-frames' has been disabled by default on Android systems. 2089** 'desktop-restore-frames' has been disabled by default on Android systems.
2090Restrictions imposed on clients by the window manager on these systems 2090Restrictions imposed on clients by the window manager on these systems
2091are too prohibitive to admit of restoring frame configurations, and on 2091are too prohibitive and don't allow restoring frame configurations.
2092the same account many window management facilities are unimplemented by 2092(For the same reason many window management facilities are also not
2093Emacs also. 2093implemented by Emacs.)
2094 2094
2095--- 2095---
2096** 'NSSpeechRecognitionUsageDescription' now included in "Info.plist" (macOS). 2096** '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."
428See related options `desktop-restore-reuses-frames', 428See related options `desktop-restore-reuses-frames',
429`desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'. 429`desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'.
430 430
431This option is enabled by default elsewhere than on Android, where it is 431This option is enabled by default, except on Android. It is disabled by
432disabled by default as programs are too handicapped by the window 432default on Android because the window manager there prevents programs from
433manager for frames to be restored." 433restoring frames."
434 :type 'boolean 434 :type 'boolean
435 :group 'desktop 435 :group 'desktop
436 :version "31.1") 436 :version "31.1")