[Emacs-diffs] emacs/lisp ChangeLog cedet/mode-local.el cedet/...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/10/28 14:01:53

Modified files:
        lisp           : ChangeLog 
        lisp/cedet     : mode-local.el 
        lisp/cedet/semantic: fw.el idle.el tag-ls.el 
        lisp/cedet/semantic/decorate: mode.el 

Log message:
        * 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'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16520&r2=1.16521
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/mode-local.el?cvsroot=emacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/fw.el?cvsroot=emacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/idle.el?cvsroot=emacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/tag-ls.el?cvsroot=emacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/decorate/mode.el?cvsroot=emacs&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16520
retrieving revision 1.16521
diff -u -b -r1.16520 -r1.16521
--- ChangeLog   28 Oct 2009 13:59:30 -0000      1.16520
+++ ChangeLog   28 Oct 2009 14:01:49 -0000      1.16521
@@ -1,5 +1,15 @@
 2009-10-28  Stefan Monnier  <address@hidden>
 
+       * 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.

Index: cedet/mode-local.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/mode-local.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cedet/mode-local.el 2 Oct 2009 10:53:34 -0000       1.3
+++ cedet/mode-local.el 28 Oct 2009 14:01:52 -0000      1.4
@@ -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)

Index: cedet/semantic/fw.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic/fw.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/semantic/fw.el        25 Oct 2009 02:55:28 -0000      1.5
+++ cedet/semantic/fw.el        28 Oct 2009 14:01:52 -0000      1.6
@@ -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

Index: cedet/semantic/idle.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic/idle.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cedet/semantic/idle.el      25 Oct 2009 02:55:28 -0000      1.6
+++ cedet/semantic/idle.el      28 Oct 2009 14:01:52 -0000      1.7
@@ -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.

Index: cedet/semantic/tag-ls.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic/tag-ls.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/semantic/tag-ls.el    2 Oct 2009 10:53:35 -0000       1.5
+++ cedet/semantic/tag-ls.el    28 Oct 2009 14:01:52 -0000      1.6
@@ -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'.

Index: cedet/semantic/decorate/mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cedet/semantic/decorate/mode.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/semantic/decorate/mode.el     25 Oct 2009 02:55:27 -0000      1.5
+++ cedet/semantic/decorate/mode.el     28 Oct 2009 14:01:52 -0000      1.6
@@ -36,6 +36,7 @@
 ;;
 
 ;;; Code:
+(eval-when-compile (require 'cl))
 (require 'semantic)
 (require 'semantic/decorate)
 (require 'semantic/tag-ls)