From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 6 Apr 2015 23:07:56 +0000 (+0000)
Subject: dgnushack.el (define-obsolete-function-alias): Redefine for XEmacs
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=e111930368a2ec2749860e85e8e115c463ff138f;p=gnus

dgnushack.el (define-obsolete-function-alias): Redefine for XEmacs
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c2359bca..ef12266e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* dgnushack.el (define-obsolete-function-alias): Add a compiler-marco
+	and a runtime function for it, of which the XEmacs version takes only
+	two arguments.
+
 2015-04-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use American spelling for 'normalize'
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index d65d24b8f..99b4f5b0d 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -568,17 +568,26 @@ but which should be robust in the unexpected case that an error is signaled."
 	   (progn ,@body)
 	 (error (message "Error: %S" ,err) nil)))))
 
-;; XEmacs's `define-obsolete-variable-alias' takes only two arguments:
+;; `define-obsolete-function-alias' and `define-obsolete-variable-alias'
+;; take only two arguments in XEmacs:
+;; (define-obsolete-function-alias OLDFUN NEWFUN)
 ;; (define-obsolete-variable-alias OLDVAR NEWVAR)
 (condition-case nil
-    (progn
-      (defvar dgnushack-obsolete-name nil)
-      (defvar dgnushack-current-name nil)
-      (unwind-protect
-	  (define-obsolete-variable-alias
-	    'dgnushack-obsolete-name 'dgnushack-current-name "0")
-	(makunbound 'dgnushack-obsolete-name)
-	(makunbound 'dgnushack-current-name)))
+    (define-obsolete-function-alias
+      'dgnushack-obsolete-name 'dgnushack-current-name "0")
+  (wrong-number-of-arguments
+   (defadvice define-obsolete-function-alias (around ignore-rest-args
+						     (oldfun newfun &rest args)
+						     activate)
+     "Ignore arguments other than the 1st and the 2nd ones."
+     ad-do-it)
+   (put 'define-obsolete-function-alias 'byte-optimizer
+	(lambda (form)
+	  (setcdr (nthcdr 2 form) nil)
+	  form))))
+(condition-case nil
+    (define-obsolete-variable-alias
+      'dgnushack-obsolete-name 'dgnushack-current-name "0")
   (wrong-number-of-arguments
    (defadvice define-obsolete-variable-alias (around ignore-rest-args
 						     (oldvar newvar &rest args)