Can some kind soul please apply the attached patch to master?  The
commit message is


In `window--display-buffer' fix behavior reported in Bug#25946

* lisp/window.el (window--display-buffer): Set the dedicated
status of the window used and clear its history of previous
buffers also for the case that the window already shows the
buffer to be displayed.  (Bug#25946)


Many thanks in advance, martin