[Erc-help] [S] [PATCH] erc: XEmacs make-obsolete only takes two arguments

[Adrian A. <ad...@xe...>]

I messed up my first try real bad:
Instead of adding the message-id of Kyle's followup to a references
mail header, I used it as the message-id of my mail!

This is probably why my mail has not shown up in the
gmane.emacs.erc.general newsgroup.

I hope I'll get it right this time ...

SUPERSEDES <1xo...@sm...>

Following Kyle's advice, this patch will make XEmacs use the three
argument version should that become available in a future version of
XEmacs.

erc developers, please review and send me your approval.

I will then try to commit this little patch myself.

Best regards,

Adrian

ChangeLog addition:

2004-03-18  Adrian Aichner  <ad...@xe...>

	* erc-nets.el: Use two arguments version of `make-obsolete', if
	third argument is not supported (for XEmacs).

erc source patch:
Diff command:   cvs -f -z3 -q diff -u -N
Files affected: erc-nets.el

Index: erc-nets.el
===================================================================
RCS file: /cvsroot/erc/erc/erc-nets.el,v
retrieving revision 1.11
diff -u -r1.11 erc-nets.el
--- erc-nets.el	13 Mar 2004 14:04:08 -0000	1.11
+++ erc-nets.el	18 Mar 2004 21:53:37 -0000
@@ -712,9 +712,9 @@
   (with-current-buffer (erc-server-buffer)
     (intern (downcase (symbol-name erc-network)))))
 
-(if (featurep 'xemacs)
-    (make-obsolete 'erc-current-network 'erc-network)
-  (make-obsolete 'erc-current-network 'erc-network "Obsolete since erc-nets 1.5"))
+(condition-case nil
+    (make-obsolete 'erc-current-network 'erc-network "Obsolete since erc-nets 1.5")
+  (wrong-number-of-arguments (make-obsolete 'erc-current-network 'erc-network)))
 
 (defun erc-network-name ()
   "Returns the name of the current network as a string."
@@ -724,9 +724,9 @@
 ;; returns the name of the current network as a string.  Some of us use these
 ;; functions in our personal ERC configuration code.  (franl, 2004-03-13)
 ;;
-;;(if (featurep 'xemacs)
-;;    (make-obsolete 'erc-network-name 'erc-network)
-;;  (make-obsolete 'erc-network-name 'erc-network "Obsolete since erc-nets 1.5"))
+;;(condition-case nil
+;;    (make-obsolete 'erc-network-name 'erc-network "Obsolete since erc-nets 1.5")
+;;  (wrong-number-of-arguments (make-obsolete 'erc-network-name 'erc-network)))
 
 (defun erc-set-network-name (proc parsed)
   "Set `erc-network' to the value returned by `erc-determine-network'."

-- 
Adrian Aichner
 mailto:ad...@xe...
 http://www.xemacs.org/