[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 5a9263a872 1/3: Increment erc-debug-irc-protocol-version to 2
From: |
F. Jason Park |
Subject: |
emacs-29 5a9263a872 1/3: Increment erc-debug-irc-protocol-version to 2 |
Date: |
Fri, 16 Dec 2022 09:37:01 -0500 (EST) |
branch: emacs-29
commit 5a9263a87251fddcc5043ef0abb3884e90434e2e
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>
Increment erc-debug-irc-protocol-version to 2
* lisp/erc/erc.el (erc-debug-irc-protocol-version): Change version to
2 to help dependent tooling detect redacted passwords.
(erc-log-irc-protocol): Don't bother redacting incoming messages.
(Bug#59284.)
---
lisp/erc/erc.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 5e78096da5..6afa400478 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2323,7 +2323,7 @@ message instead, to make debugging easier."
(defvar erc-debug-irc-protocol-time-format "%FT%T.%6N%z "
"Timestamp format string for protocol logger.")
-(defconst erc-debug-irc-protocol-version "1"
+(defconst erc-debug-irc-protocol-version "2"
"Protocol log format version number.
This exists to help tooling track changes to the format.
@@ -2334,7 +2334,10 @@ interpreted as email-style headers. Folding is not
supported. A second
double CRLF, if present, signals the end of a log. Session resumption
is not supported. Logger lines must adhere to the following format:
TIMESTAMP PEER-NAME FLOW-INDICATOR IRC-MESSAGE CRLF. Outgoing messages
-are indicated with a >> and incoming with a <<.")
+are indicated with a >> and incoming with a <<.
+
+In version 2, certain outgoing passwords are replaced by a string
+of ten question marks.")
(defvar erc-debug-irc-protocol nil
"If non-nil, log all IRC protocol traffic to the buffer \"*erc-protocol*\".
@@ -2390,7 +2393,7 @@ workaround."
(format "%s:%s" erc-session-server erc-session-port))))
(ts (when erc-debug-irc-protocol-time-format
(format-time-string erc-debug-irc-protocol-time-format))))
- (when erc--debug-irc-protocol-mask-secrets
+ (when (and outbound erc--debug-irc-protocol-mask-secrets)
(setq string (erc--mask-secrets string)))
(with-current-buffer (get-buffer-create "*erc-protocol*")
(save-excursion