emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 942bc9c8f5 4/5: Don't use obsolete yow library


From: Stefan Kangas
Subject: master 942bc9c8f5 4/5: Don't use obsolete yow library
Date: Fri, 13 May 2022 17:18:49 -0400 (EDT)

branch: master
commit 942bc9c8f56c072c4c76e010370b84ae9adc3366
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Don't use obsolete yow library
    
    * lisp/erc/erc.el (erc-quit-reason-zippy, erc-part-reason-zippy):
    Don't use obsolete yow library.
---
 lisp/erc/erc.el | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 06381c5ebe..ff482d4933 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")
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]