; Fix last change (bug#76980)

* lisp/window.el (window--state-normalize-buffer-name): Doc fix.

* doc/lispref/windows.texi (Window Configurations): Add indexing.

(cherry picked from commit 42e116bb1095f47cd0d57bbb6ee7b73d2d9f506e)

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 1ebf84c3261a2f5143e2d72fa1dc21ccc1f21e16..417c323be6bcef554e0c881509f0d12ce0db2864 100644 (file)
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -7001,6 +7001,7 @@ Together, the argument @var{writable} and the variable
 @code{window-persistent-parameters} specify which window parameters are
 saved by this function.  @xref{Window Parameters}.
 
+@vindex window-state-normalize-buffer-name
 Bind @code{window-state-normalize-buffer-name} to non-@code{nil} to
 normalize buffer names under @file{uniquify} management by removing its
 prefixes and suffixes.  This helps restore window buffers across Emacs

diff --git a/lisp/window.el b/lisp/window.el
index 4598b8ce3e2f1b2a195e51964a163b417eadefe6..fc353f0fd757249b0e0b18b8f90c137d8100d14a 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6256,7 +6256,7 @@ specific buffers."
 (defun window--state-normalize-buffer-name (buffer)
   "Normalize BUFFER name, accommodating `uniquify'.
 If BUFFER is under `uniquify' management, return its `buffer-name' with
-its prefixes and suffixes removed; otherwise return BUFFER
+its prefixes and suffixes removed; otherwise return BUFFER's
 `buffer-name'."
   (or (and window-state-normalize-buffer-name
            (fboundp 'uniquify-buffer-base-name)