Merge from origin/emacs-27

b77f6af24e (origin/emacs-27) ERC right stamps: also use latest buffer...

# Conflicts:
#	lisp/erc/erc-stamp.el

diff --cc lisp/erc/erc-stamp.el
index 31de9e80697ab2ccaed1b6b8b63365579e8ca14d,b9adce65858b220fe9c20033830cb63f27762f2f..dde2556ddb786b454b81a16bfab215687799dca4
--- 1/lisp/erc/erc-stamp.el
--- 2/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@@ -181,10 -192,16 +181,15 @@@ or `erc-send-modify-hook'.
                                 (list (lambda (_window _before dir)
                                         (erc-echo-timestamp dir ct))))))))
  
 -(defvar erc-timestamp-last-inserted nil
+ (defvar-local erc-timestamp-last-window-width nil
+   "Stores the width of the last window that showed the current
+ buffer. This is used by `erc-insert-timestamp-right' when the
+ current buffer is not shown in any window.")
+ 
 +(defvar-local erc-timestamp-last-inserted nil
    "Last timestamp inserted into the buffer.")
 -(make-variable-buffer-local 'erc-timestamp-last-inserted)
  
 -(defvar erc-timestamp-last-inserted-left nil
 +(defvar-local erc-timestamp-last-inserted-left nil
    "Last timestamp inserted into the left side of the buffer.
  This is used when `erc-insert-timestamp-function' is set to
  `erc-timestamp-left-and-right'")