; Fix recent changes in documentation

* doc/lispref/markers.texi (Information from Markers):
* etc/NEWS: Improve description of 'marker-last-position'.

(cherry picked from commit d855f1c3f9c488f48694fe63bbc49d66d775c16c)

diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index 28ad0ff73c06d2f2ed9faafe2cc0099279895067..a13edb02ae6845e40e8bae4b24139e9c781dbe87 100644 (file)
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -285,9 +285,10 @@ This function returns the position that @var{marker} points to, or
 
 @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
+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.
+of @var{marker} in that buffer before the buffer was killed, instead of
+returning @code{nil}.
 @end defun
 
 @defun marker-buffer marker

diff --git a/etc/NEWS b/etc/NEWS
index abef48f54bbd40947534a207a9ec491c2d8d301e..1335411b2605dd211efc997dfcaa0ba951962bb3 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1966,8 +1966,9 @@ It returns the name of a buffer before the last time it was renamed or
 killed.
 
 ** New primitive 'marker-last-position'.
-It returns the last position of MARKER in its buffer even if that buffer
-has been killed.
+It returns the last position of a marker in its buffer even if that
+buffer has been killed.  ('marker-position' would return nil in that
+case.)
 
 
 ** Functions and variables to transpose sexps