Suppress log module when inserting date stamps in ERC

* lisp/erc/erc-log.el (erc-truncate-buffer-on-save): Use
`make-obsolete-variable' because `erc-truncate-buffer-on-save' is an
option, not a function.  Already mentioned in etc/ERC-NEWS.
(erc-logging-enabled): Return nil if `log' appears in the `erc--skip'
msg prop.
* lisp/erc/erc-stamp.el (erc-stamp--defer-date-insertion-on-post-modify):
Add `log' to `erc--skip' msg prop.  This tells the log module to defer
advancing the `erc-last-saved-position' marker until after stamps have
been inserted, thus ensuring they're included in logs when
`erc-log-write-after-insert' is non-nil.
* test/lisp/erc/erc-scenarios-log.el
(erc-scenarios-log--save-buffer-in-logs/truncate-on-save): Suppress
warning for `erc-truncate-buffer-on-save'.
(erc-scenarios-log--write-after-insert): New test.  (Bug#76875)

(cherry picked from commit 3db65ff5cb3d6f58b83052760b4ce04eb77db1bc)

diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 730e8a45fc696b6407c9098defc195df6caec5cc..730faacdfb3174c3a40df219c36469eb03d2a38c 100644 (file)
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -124,7 +124,8 @@ custom function which returns the directory part and set
 (defcustom erc-truncate-buffer-on-save nil
   "Erase the contents of any ERC (channel, query, server) buffer when it is saved."
   :type 'boolean)
-(make-obsolete 'erc-truncate-buffer-on-save 'erc-cmd-CLEAR "30.1")
+(make-obsolete-variable 'erc-truncate-buffer-on-save
+                        "maybe see command `erc-cmd-CLEAR'" "30.1")
 
 (defcustom erc-enable-logging t
   "If non-nil, ERC will log IRC conversations.
@@ -316,6 +317,7 @@ is writable (it will be created as necessary) and
   (or buffer (setq buffer (current-buffer)))
   (and erc-log-channels-directory
        (not erc-log--save-in-progress-p)
+       (not (erc--memq-msg-prop 'erc--skip 'log))
        (or (functionp erc-log-channels-directory)
           (erc-directory-writable-p erc-log-channels-directory))
        (if (functionp erc-enable-logging)

diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index a2c6e37b9b3c5966abeede8a49f0255680849c18..3aee51666d50d81d5cd690740c70d9fa8cf805c6 100644 (file)
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -732,6 +732,9 @@ non-nil."
              (symbol (make-symbol "erc-stamp--insert-date"))
              (marker (setf (erc-stamp--date-marker data) (point-min-marker))))
     (setf (erc-stamp--date-fn data) symbol)
+    ;; Disable logging in case `erc-log-write-after-insert' is in effect.
+    (when erc--msg-props
+      (push 'log (gethash 'erc--skip erc--msg-props)))
     (fset symbol
           (lambda (&rest _)
             (remove-hook hook-var symbol)