소스 검색

org-compat: strip last argument from define-obsolete-{function,variable}-alias for XEmacs

* lisp/org-compat.el (define-obsolete-variable-alias,
  define-obsolete-function-alias): Actually remove the third (and any
  following) argument from the argument list before calling the
  advised function.
Achim Gratz 12 년 전
부모
커밋
66057bd2a8
1개의 변경된 파일2개의 추가작업 그리고 0개의 파일을 삭제
  1. 2 0
      lisp/org-compat.el

+ 2 - 0
lisp/org-compat.el

@@ -138,12 +138,14 @@ Don't do the aliasing when `defvaralias' is not bound."
 	      (obsolete-name current-name &optional docstring)
 	      (obsolete-name current-name &optional docstring)
 	      activate preactivate)
 	      activate preactivate)
       "Declare arguments defined in later versions of Emacs."
       "Declare arguments defined in later versions of Emacs."
+      (setcdr (cdr (ad-get-args 0)) nil)
       ad-do-it)
       ad-do-it)
     (defadvice define-obsolete-function-alias
     (defadvice define-obsolete-function-alias
       (around org-define-obsolete-function-alias
       (around org-define-obsolete-function-alias
 	      (obsolete-name current-name when &optional docstring)
 	      (obsolete-name current-name when &optional docstring)
 	      activate preactivate)
 	      activate preactivate)
       "Declare arguments defined in later versions of Emacs."
       "Declare arguments defined in later versions of Emacs."
+      (setcdr (cdr (ad-get-args 0)) nil)
       ad-do-it)
       ad-do-it)
     (defvar customize-package-emacs-version-alist nil)
     (defvar customize-package-emacs-version-alist nil)
     (defvar temporary-file-directory (temp-directory)))
     (defvar temporary-file-directory (temp-directory)))