Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
This commit is contained in:
commit
d60d625f6e
4 changed files with 20 additions and 8 deletions
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
5
etc/NEWS
5
etc/NEWS
|
@ -1816,6 +1816,11 @@ improves performance. Such a Lisp program can then use the
|
|||
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.
|
||||
|
||||
|
||||
** Functions and variables to transpose sexps
|
||||
|
||||
+++
|
||||
|
|
12
src/window.c
12
src/window.c
|
@ -8711,12 +8711,12 @@ third argument is the symbol `configuration' if the windows are
|
|||
restored by `set-window-configuration' and the symbol `state' if the
|
||||
windows are restored by `window-state-put'.
|
||||
|
||||
The second argument specifies a list of entries for all windows
|
||||
whose previous buffers have been found dead at the time
|
||||
`set-window-configuration' or `window-state-put' tried to restore it in
|
||||
that window (minibuffer windows are excluded). This means that the
|
||||
function specified by this variable may also delete windows which were
|
||||
found to be alive by `set-window-configuration'.
|
||||
The second argument specifies a list of entries for all windows whose
|
||||
previous buffers have been found dead at the time
|
||||
`set-window-configuration' or `window-state-put' tried to restore them
|
||||
(minibuffer windows are excluded). This means that the function
|
||||
specified by this variable may also delete windows which were found to
|
||||
be alive by `set-window-configuration'.
|
||||
|
||||
Each entry is a list of six values: the window whose buffer was found
|
||||
dead, the dead buffer or its name, the positions of window-start and
|
||||
|
|
Loading…
Add table
Reference in a new issue