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

Adrian Aichner <[email protected]> Thu, 11 Mar 2004 01:43:11 +0100
Newsgroups gmane.emacs.erc.general,gmane.emacs.xemacs.design
Message-ID <[email protected]>
Hello erc developers!

Would be great if you could incorporate this XEmacs compatibility
patch to keep the XEmacs package diffs as minimal as they currently
are (synced up to erc 4.0 1.637).

Best regards,

Adrian

erc ChangeLog addition:

2004-03-11  Adrian Aichner  <[email protected]>

	* erc-nets.el: XEmacs make-obsolete only takes two arguments.

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.8
diff -u -r1.8 erc-nets.el
--- erc-nets.el	10 Mar 2004 18:15:41 -0000	1.8
+++ erc-nets.el	11 Mar 2004 00:27:55 -0000
@@ -712,14 +712,18 @@
   (with-current-buffer (erc-server-buffer)
     (intern (downcase (symbol-name erc-network)))))
 
-(make-obsolete 'erc-current-network 'erc-network "Obsolete since erc-nets 1.5")
+(if (featurep 'xemacs)
+    (make-obsolete 'erc-current-network 'erc-network)
+  (make-obsolete 'erc-current-network 'erc-network "Obsolete since erc-nets 1.5"))
 
 (defun erc-network-name ()
   "Deprecated.  Use `erc-network' instead.  Return the value of `erc-network'
 as a string."
   (with-current-buffer (erc-server-buffer) (symbol-name erc-network)))
 
-(make-obsolete 'erc-network-name 'erc-network "Obsolete since erc-nets 1.5")
+(if (featurep 'xemacs)
+    (make-obsolete 'erc-network-name 'erc-network)
+  (make-obsolete 'erc-network-name 'erc-network "Obsolete since erc-nets 1.5"))
 
 (defun erc-set-network-name (proc parsed)
   "Set `erc-network' to the value returned by `erc-determine-network'."

-- 
Adrian Aichner
 mailto:[email protected]
 http://www.xemacs.org/



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click