From: Glenn Morris <rgm@gnu.org>
Date: Fri, 6 Aug 2021 15:49:32 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~1591^2~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b049fe71d73f6885a3c81ea31829e3befc18933;p=emacs.git

Merge from origin/emacs-27

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

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

0b049fe71d73f6885a3c81ea31829e3befc18933
diff --cc lisp/erc/erc-stamp.el
index 31de9e80697,b9adce65858..dde2556ddb7
--- a/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-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 erc-timestamp-last-inserted nil
 +(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'")