From dc2f2f9988c9931f563969de2b8d4dcc09835d2b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 21 May 2013 00:15:59 -0700 Subject: Make some trivial erc.el functions obsolete * lisp/erc/erc.el (erc-quit-reason-various-alist) (erc-part-reason-various-alist): Don't mention zippy. (erc-quit-reason, erc-part-reason): Remove zippy options. (erc-quit-reason-zippy, erc-part-reason-zippy): Make obsolete. If yow is not defined, fall back to -normal versions. --- lisp/erc/ChangeLog | 8 ++++++++ lisp/erc/erc.el | 28 ++++++++++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) (limited to 'lisp/erc') diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index f4293c8f08..5a6ac93edd 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,11 @@ +2013-05-21 Glenn Morris + + * erc.el (erc-quit-reason-various-alist) + (erc-part-reason-various-alist): Don't mention zippy. + (erc-quit-reason, erc-part-reason): Remove zippy options. + (erc-quit-reason-zippy, erc-part-reason-zippy): Make obsolete. + If yow is not defined, fall back to -normal versions. + 2013-05-15 Glenn Morris * erc-list.el (erc-list): diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 042ad09dec..b2724b9737 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -899,13 +899,12 @@ If no elements match, then the empty string is used. As an example: (setq erc-quit-reason-various-alist - '((\"zippy\" erc-quit-reason-zippy) - (\"xmms\" dme:now-playing) + '((\"xmms\" dme:now-playing) (\"version\" erc-quit-reason-normal) (\"home\" \"Gone home !\") (\"^$\" \"Default Reason\"))) -If the user types \"/quit zippy\", then a Zippy the Pinhead quotation -will be used as the quit message." +If the user types \"/quit home\", then \"Gone home !\" will be used +as the quit message." :group 'erc-quit-and-part :type '(repeat (list regexp (choice (string) (function))))) @@ -923,13 +922,12 @@ If no elements match, then the empty string is used. As an example: (setq erc-part-reason-various-alist - '((\"zippy\" erc-part-reason-zippy) - (\"xmms\" dme:now-playing) + '((\"xmms\" dme:now-playing) (\"version\" erc-part-reason-normal) (\"home\" \"Gone home !\") (\"^$\" \"Default Reason\"))) -If the user types \"/part zippy\", then a Zippy the Pinhead quotation -will be used as the part message." +If the user types \"/part home\", then \"Gone home !\" will be used +as the part message." :group 'erc-quit-and-part :type '(repeat (list regexp (choice (string) (function))))) @@ -940,7 +938,6 @@ The function is passed a single argument, the string typed by the user after \"/quit\"." :group 'erc-quit-and-part :type '(choice (const erc-quit-reason-normal) - (const erc-quit-reason-zippy) (const erc-quit-reason-various) (symbol))) @@ -951,7 +948,6 @@ The function is passed a single argument, the string typed by the user after \"/PART\"." :group 'erc-quit-and-part :type '(choice (const erc-part-reason-normal) - (const erc-part-reason-zippy) (const erc-part-reason-various) (symbol))) @@ -3398,7 +3394,11 @@ If S is non-nil, it will be used as the quit reason." If S is non-nil, it will be used as the quit reason." (or s - (erc-replace-regexp-in-string "\n" "" (yow)))) + (if (fboundp 'yow) + (erc-replace-regexp-in-string "\n" "" (yow)) + (erc-quit-reason-normal)))) + +(make-obsolete 'erc-quit-reason-zippy "it will be removed." "24.4") (defun erc-quit-reason-various (s) "Choose a quit reason based on S (a string)." @@ -3425,7 +3425,11 @@ If S is non-nil, it will be used as the quit reason." If S is non-nil, it will be used as the quit reason." (or s - (erc-replace-regexp-in-string "\n" "" (yow)))) + (if (fboundp 'yow) + (erc-replace-regexp-in-string "\n" "" (yow)) + (erc-part-reason-normal)))) + +(make-obsolete 'erc-part-reason-zippy "it will be removed." "24.4") (defun erc-part-reason-various (s) "Choose a part reason based on S (a string)." -- cgit v1.2.3