[Emacs-diffs] /srv/bzr/emacs/trunk r112650: Make some trivial erc.el functions obsolete

[Glenn Morris]

------------------------------------------------------------
revno: 112650
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-21 00:15:59 -0700
message:
  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.
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2013-05-15 23:55:41 +0000
+++ b/lisp/erc/ChangeLog        2013-05-21 07:15:59 +0000
@@ -1,3 +1,11 @@
+2013-05-21  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * erc-list.el (erc-list):

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2013-01-02 16:13:04 +0000
+++ b/lisp/erc/erc.el   2013-05-21 07:15:59 +0000
@@ -899,13 +899,12 @@
 
 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 @@
 
 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 @@
 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 @@
 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."
   (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."
   (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)."