summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2024-03-16 05:52:31 -0400
committerEli Zaretskii <eliz@gnu.org>2024-03-16 05:52:31 -0400
commitd60d625f6e76781bc4f3640ec269a051b3ecb1ae (patch)
treed2944fb115818a26f5dcb5d552db310e7613236e /doc
parentcc8a2c57b5eed4045035dfeaf129ce33d7f74733 (diff)
parentc12852bbf61ebb9ae124033deb427b15ce1a2ffb (diff)
downloademacs-d60d625f6e76781bc4f3640ec269a051b3ecb1ae.tar.gz
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/markers.texi7
-rw-r--r--doc/lispref/windows.texi4
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index 3037790692c..28ad0ff73c0 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -283,6 +283,13 @@ This function returns the position that @var{marker} points to, or
@code{nil} if it points nowhere.
@end defun
+@defun marker-last-position marker
+This function returns the last known position of @var{marker} in its
+buffer. It behaves like @code{marker-position} with one exception: If
+the buffer of @var{marker} has been killed, it returns the last position
+of @var{marker} in that buffer before it was killed.
+@end defun
+
@defun marker-buffer marker
This function returns the buffer that @var{marker} points into, or
@code{nil} if it points nowhere.
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 2e2fdee422b..eef05d94fdb 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -6424,8 +6424,8 @@ windows are restored by @code{window-state-put}.
The second argument specifies a list of entries for @emph{all} windows
whose previous buffers have been found dead at the time
@code{set-window-configuration} or @code{window-state-put} tried to
-restore it in that window (minibuffer windows are excluded). This means
-that the function may also delete windows which were found live by
+restore them (minibuffer windows are excluded). This means that the
+function may also delete windows which were found live by
@code{set-window-configuration}.
Each entry in the list that is passed as the second argument to the