From 86f1602f648fb5cf78ced645f869b0d33703c7c5 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 24 Oct 2009 18:02:47 +0000 Subject: [PATCH] * cedet/semantic/util.el (semantic-recursive-find-nonterminal-by-name): * cedet/semantic/tag.el (semantic-token-type-parent): Add WHEN argument to make-obsolete. * cedet/semantic/fw.el (semantic-alias-obsolete) (semantic-varalias-obsolete): Add optional WHEN argument. --- lisp/ChangeLog | 9 +++++++++ lisp/cedet/semantic/fw.el | 8 ++++---- lisp/cedet/semantic/tag.el | 2 +- lisp/cedet/semantic/util.el | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8a41ef8d171..2b05d3dd6ae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2009-10-24 Chong Yidong + + * cedet/semantic/util.el (semantic-recursive-find-nonterminal-by-name): + * cedet/semantic/tag.el (semantic-token-type-parent): Add WHEN + argument to make-obsolete. + + * cedet/semantic/fw.el (semantic-alias-obsolete) + (semantic-varalias-obsolete): Add optional WHEN argument. + 2009-10-24 Dan Nicolaescu * vc.el (vc-backend-for-registration): Rename from diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index a958e0112f2..95eb4b6e453 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el @@ -148,12 +148,12 @@ Remove self from `post-command-hook' if it is empty." (intern (substring sym-name (match-end 0))) name))) -(defun semantic-alias-obsolete (oldfnalias newfn) +(defun semantic-alias-obsolete (oldfnalias newfn &optional when) "Make OLDFNALIAS an alias for NEWFN. Mark OLDFNALIAS as obsolete, such that the byte compiler will throw a warning when it encounters this symbol." (defalias oldfnalias newfn) - (make-obsolete oldfnalias newfn) + (make-obsolete oldfnalias newfn when) (when (and (function-overload-p newfn) (not (overload-obsoleted-by newfn)) ;; Only throw this warning when byte compiling things. @@ -169,11 +169,11 @@ will throw a warning when it encounters this symbol." (semantic-overload-symbol-from-function oldfnalias)) )) -(defun semantic-varalias-obsolete (oldvaralias newvar) +(defun semantic-varalias-obsolete (oldvaralias newvar &optional when) "Make OLDVARALIAS an alias for variable NEWVAR. Mark OLDVARALIAS as obsolete, such that the byte compiler will throw a warning when it encounters this symbol." - (make-obsolete-variable oldvaralias newvar) + (make-obsolete-variable oldvaralias newvar when) (condition-case nil (defvaralias oldvaralias newvar) (error diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el index 5cc3629aa39..44fbe764059 100644 --- a/lisp/cedet/semantic/tag.el +++ b/lisp/cedet/semantic/tag.el @@ -1347,7 +1347,7 @@ interfaces, or abstract classes which are parents of TAG." (make-obsolete 'semantic-token-type-parent "\ use `semantic-tag-type-superclass' \ -and `semantic-tag-type-interfaces' instead") +and `semantic-tag-type-interfaces' instead" "23.2") (semantic-alias-obsolete 'semantic-tag-make-assoc-list 'semantic-tag-make-plist) diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el index 974f915c834..6d3985e147b 100644 --- a/lisp/cedet/semantic/util.el +++ b/lisp/cedet/semantic/util.el @@ -174,7 +174,7 @@ THIS ISN'T USED IN SEMANTIC. DELETE ME SOON." (setq includelist (cdr includelist))) found))) (make-obsolete 'semantic-recursive-find-nonterminal-by-name - "Do not use this function.") + "Do not use this function." "23.2") ;;; Completion APIs ;; -- 2.39.5