# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1256738509 0
# Node ID 6df5ff499103b0bf21d053b05e7de25595c592c0
# Parent  fedd4c047ce757c912195442777d84514766dd16
* cedet/mode-local.el (make-obsolete-overload): Add `when' argument.
(overload-docstring-extension): Use that info.
* cedet/semantic/fw.el (semantic-alias-obsolete): Pass the `when' info.
* cedet/semantic/idle.el (semantic-eldoc-current-symbol-info):
* cedet/semantic/tag-ls.el (semantic-nonterminal-protection)
(semantic-nonterminal-abstract, semantic-nonterminal-leaf)
(semantic-nonterminal-full-name): Add the new `when' info.
* cedet/semantic/decorate/mode.el (semantic/decorate): Require CL for `assert'.

diff -r fedd4c047ce7 -r 6df5ff499103 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 28 13:59:30 2009 +0000
+++ b/lisp/ChangeLog	Wed Oct 28 14:01:49 2009 +0000
@@ -1,5 +1,15 @@
 2009-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* cedet/mode-local.el (make-obsolete-overload): Add `when' argument.
+	(overload-docstring-extension): Use that info.
+	* cedet/semantic/fw.el (semantic-alias-obsolete): Pass the `when' info.
+	* cedet/semantic/idle.el (semantic-eldoc-current-symbol-info):
+	* cedet/semantic/tag-ls.el (semantic-nonterminal-protection)
+	(semantic-nonterminal-abstract, semantic-nonterminal-leaf)
+	(semantic-nonterminal-full-name): Add the new `when' info.
+	* cedet/semantic/decorate/mode.el (semantic/decorate): Require CL for
+	`assert'.
+
 	* pcomplete.el (pcomplete-comint-setup): If there's a choice, replace
 	shell-dynamic-complete-filename in preference to
 	comint-dynamic-complete-filename.
diff -r fedd4c047ce7 -r 6df5ff499103 lisp/cedet/mode-local.el
--- a/lisp/cedet/mode-local.el	Wed Oct 28 13:59:30 2009 +0000
+++ b/lisp/cedet/mode-local.el	Wed Oct 28 14:01:49 2009 +0000
@@ -442,9 +442,11 @@
 
 ;;; Function overloading
 ;;
-(defun make-obsolete-overload (old new)
-  "Mark OLD overload as obsoleted by NEW overload."
+(defun make-obsolete-overload (old new when)
+  "Mark OLD overload as obsoleted by NEW overload.
+WHEN is a string describing the first release where it was made obsolete."
   (put old 'overload-obsoleted-by new)
+  (put old 'overload-obsoleted-since when)
   (put old 'mode-local-overload t)
   (put new 'overload-obsolete old))
 
@@ -592,12 +594,12 @@
  with `define-mode-local-override'.")
         (sym (overload-obsoleted-by overload)))
     (when sym
-      (setq doc (format "%s\nIt makes the overload `%s' obsolete."
-                        doc sym)))
+      (setq doc (format "%s\nIt has made the overload `%s' obsolete since %s."
+                        doc sym (get sym 'overload-obsoleted-since))))
     (setq sym (overload-that-obsolete overload))
     (when sym
-      (setq doc (format "%s\nThis overload is obsoletes;\nUse `%s' instead."
-                        doc sym)))
+      (setq doc (format "%s\nThis overload is obsolete since %s;\nUse `%s' instead."
+                        doc (get overload 'overload-obsoleted-since) sym)))
     doc))
 
 (defun mode-local-augment-function-help (symbol)
diff -r fedd4c047ce7 -r 6df5ff499103 lisp/cedet/semantic/decorate/mode.el
--- a/lisp/cedet/semantic/decorate/mode.el	Wed Oct 28 13:59:30 2009 +0000
+++ b/lisp/cedet/semantic/decorate/mode.el	Wed Oct 28 14:01:49 2009 +0000
@@ -36,6 +36,7 @@
 ;;
 
 ;;; Code:
+(eval-when-compile (require 'cl))
 (require 'semantic)
 (require 'semantic/decorate)
 (require 'semantic/tag-ls)
diff -r fedd4c047ce7 -r 6df5ff499103 lisp/cedet/semantic/fw.el
--- a/lisp/cedet/semantic/fw.el	Wed Oct 28 13:59:30 2009 +0000
+++ b/lisp/cedet/semantic/fw.el	Wed Oct 28 14:01:49 2009 +0000
@@ -161,7 +161,7 @@
              byte-compile-current-file
 	     (not (string-match "cedet" byte-compile-current-file))
 	     )
-    (make-obsolete-overload oldfnalias newfn)
+    (make-obsolete-overload oldfnalias newfn when)
     (semantic-compile-warn
      "%s: `%s' obsoletes overload `%s'"
      byte-compile-current-file
diff -r fedd4c047ce7 -r 6df5ff499103 lisp/cedet/semantic/idle.el
--- a/lisp/cedet/semantic/idle.el	Wed Oct 28 13:59:30 2009 +0000
+++ b/lisp/cedet/semantic/idle.el	Wed Oct 28 14:01:49 2009 +0000
@@ -795,7 +795,8 @@
   "Return a string message describing the current context.")
 
 (make-obsolete-overload 'semantic-eldoc-current-symbol-info
-                        'semantic-idle-summary-current-symbol-info)
+                        'semantic-idle-summary-current-symbol-info
+                        "23.2")
 
 (define-semantic-idle-service semantic-idle-summary
   "Display a tag summary of the lexical token under the cursor.
diff -r fedd4c047ce7 -r 6df5ff499103 lisp/cedet/semantic/tag-ls.el
--- a/lisp/cedet/semantic/tag-ls.el	Wed Oct 28 13:59:30 2009 +0000
+++ b/lisp/cedet/semantic/tag-ls.el	Wed Oct 28 14:01:49 2009 +0000
@@ -76,7 +76,7 @@
   (:override))
 
 (make-obsolete-overload 'semantic-nonterminal-protection
-                        'semantic-tag-protection)
+                        'semantic-tag-protection "23.2")
 
 (defun semantic-tag-protection-default (tag &optional parent)
   "Return the protection of TAG as a child of PARENT default action.
@@ -138,7 +138,7 @@
 is to return true if `abstract' is in the type modifiers.")
 
 (make-obsolete-overload 'semantic-nonterminal-abstract
-                        'semantic-tag-abstract-p)
+                        'semantic-tag-abstract-p "23.2")
 
 (defun semantic-tag-abstract-p-default (tag &optional parent)
   "Return non-nil if TAG is abstract as a child of PARENT default action.
@@ -161,7 +161,7 @@
 is to return true if `leaf' is in the type modifiers.")
 
 (make-obsolete-overload 'semantic-nonterminal-leaf
-                        'semantic-tag-leaf-p)
+                        'semantic-tag-leaf-p "23.2")
 
 (defun semantic-tag-leaf-p-default (tag &optional parent)
   "Return non-nil if TAG is leaf as a child of PARENT default action.
@@ -238,7 +238,7 @@
     (:override-with-args (tag stream))))
 
 (make-obsolete-overload 'semantic-nonterminal-full-name
-                        'semantic-tag-full-name)
+                        'semantic-tag-full-name "23.2")
 
 (defun semantic-tag-full-name-default (tag stream)
   "Default method for `semantic-tag-full-name'.