From: Philip Kaludercic <philipk@posteo.net>
Date: Wed, 29 Sep 2021 10:15:18 +0000 (+0200)
Subject: Remove rcirc-omit-responses-after-join option
X-Git-Tag: emacs-28.0.90~527
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a0f4b3f2352ea5efeac8b3ad704304ed0244f25;p=emacs.git

Remove rcirc-omit-responses-after-join option

The implementation does not work as expected and behaves
unpredictably.

* rcirc.el (rcirc-omit-responses-after-join): Remove option
(rcirc-joined): Remove variable
(rcirc-reconnect): Remove rcirc-joined code
(rcirc-get-buffer-create): Remove rcirc-joined code
(rcirc-print): Remove rcirc-omit-responses-after-join check
* doc/misc/rcirc.texi (Notices): Remove documentation
* etc/NEWS: Remove mention
---

diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index cbf94cab19b..20971293ed1 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -823,18 +823,6 @@ active and only omits a message if the nick has not been active.  The
 window @code{rcirc} considers is controlled by the
 @code{rcirc-omit-threshold} variable.
 
-@vindex rcirc-omit-responses-after-join
-Right after connecting to a server, rcirc will also hide all messages
-in @code{rcirc-omit-responses-after-join}, next to
-@code{rcirc-omit-responses}. For example,
-
-@example
-(setq rcirc-omit-responses-after-join '("TOPIC" "NICK"))
-@end example
-
-would hide the topic message and the list of users in the current
-channel right after joining a new channel.
-
 @node Hacking and Tweaking
 @chapter Hacking and Tweaking
 @cindex hacking and tweaking
diff --git a/etc/NEWS b/etc/NEWS
index c42539a7aa4..475d294270c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3011,10 +3011,6 @@ This includes support for the capabilities: 'server-time', 'batch',
 ---
 *** Check 'auth-sources' for server passwords.
 
----
-*** Allow for channels to hide certain message types right after connecting.
-Set 'rcirc-omit-responses-after-join' analogously to 'rcirc-omit-responses'.
-
 +++
 *** Implement repeated reconnection strategy.
 See 'rcirc-reconnect-attempts'.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index e02d85e21a1..ba7fbbf6b7d 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -195,16 +195,6 @@ If nil, no maximum is applied."
   "Responses which will be hidden when `rcirc-omit-mode' is enabled."
   :type '(repeat string))
 
-(defcustom rcirc-omit-responses-after-join '()
-  "Types of messages to hide right after joining a channel."
-  :type '(repeat string)
-  :version "28.1")
-
-(defvar-local rcirc-joined nil
-  "Non-nil means we have just connected.
-This is used to hide the message types enumerated in
-`rcirc-omit-responses-after-join'.")
-
 (defvar-local rcirc-prompt-start-marker nil
   "Marker indicating the beginning of the message prompt.")
 
@@ -841,8 +831,7 @@ If QUIET is non-nil, no not emit a message."
         (dolist (buffer (mapcar #'cdr rcirc-buffer-alist))
 	  (when (buffer-live-p buffer)
             (with-current-buffer buffer
-	      (setq rcirc-joined (current-time)
-                    mode-line-process ":connecting"))))
+	      (setq mode-line-process ":connecting"))))
 	(let ((nprocess (apply #'rcirc-connect conn-info)))
           (when (and (< rcirc-failed-attempts rcirc-reconnect-attempts)
                      (eq (process-status nprocess) 'failed))
@@ -1568,8 +1557,7 @@ Create the buffer if it doesn't exist."
 	  (with-current-buffer new-buffer
             (unless (eq major-mode 'rcirc-mode)
 	      (rcirc-mode process target))
-            (setq mode-line-process nil)
-            (setq rcirc-joined (current-time)))
+            (setq mode-line-process nil))
 	  (rcirc-put-nick-channel process (rcirc-nick process) target
 				  rcirc-current-line)
 	  new-buffer)))))
@@ -1970,10 +1958,7 @@ connection."
               ;; make text omittable
 	      (let ((last-activity-lines (rcirc-elapsed-lines process sender target)))
 		(if (and (not (string= (rcirc-nick process) sender))
-			 (or (member response rcirc-omit-responses)
-                             (and (member response rcirc-omit-responses-after-join)
-                                  (< (time-to-seconds (time-since rcirc-joined))
-                                     1)))
+			 (member response rcirc-omit-responses)
 			 (or (not last-activity-lines)
 			     (< rcirc-omit-threshold last-activity-lines)))
                   (put-text-property (point-min) (point-max)