From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 13 May 2022 20:29:53 +0000 (+0200)
Subject: Don't use obsolete yow library
X-Git-Tag: emacs-29.0.90~1910^2~716
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=942bc9c8f56c072c4c76e010370b84ae9adc3366;p=emacs.git

Don't use obsolete yow library

* lisp/erc/erc.el (erc-quit-reason-zippy, erc-part-reason-zippy):
Don't use obsolete yow library.
---

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 06381c5ebee..ff482d49338 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3625,12 +3625,7 @@ If S is non-nil, it will be used as the quit reason."
   "Zippy quit message.
 
 If S is non-nil, it will be used as the quit reason."
-  (or s
-      (if (fboundp 'yow)
-          (if (>= emacs-major-version 28)
-              (string-replace "\n" "" (yow))
-            (replace-regexp-in-string "\n" "" (yow)))
-        (erc-quit/part-reason-default))))
+  (or s (erc-quit/part-reason-default)))
 
 (make-obsolete 'erc-quit-reason-zippy "it will be removed." "24.4")
 
@@ -3654,12 +3649,7 @@ If S is non-nil, it will be used as the part reason."
   "Zippy part message.
 
 If S is non-nil, it will be used as the quit reason."
-  (or s
-      (if (fboundp 'yow)
-          (if (>= emacs-major-version 28)
-              (string-replace "\n" "" (yow))
-            (replace-regexp-in-string "\n" "" (yow)))
-        (erc-quit/part-reason-default))))
+  (or s (erc-quit/part-reason-default)))
 
 (make-obsolete 'erc-part-reason-zippy "it will be removed." "24.4")