diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/cedet/mode-local.el | 14 | ||||
| -rw-r--r-- | lisp/cedet/semantic/decorate/mode.el | 1 | ||||
| -rw-r--r-- | lisp/cedet/semantic/fw.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/idle.el | 3 | ||||
| -rw-r--r-- | lisp/cedet/semantic/tag-ls.el | 8 |
6 files changed, 26 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c05d4406d8..4ad20dd0a9e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index 79fb652eb72..62e8c89a0bd 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -442,9 +442,11 @@ DOCSTRING is optional." ;;; 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 @@ PROMPT, INITIAL, HIST, and DEFAULT are the same as for `completing-read'." 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 --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el index f0aad47141a..4f467a7bb70 100644 --- a/lisp/cedet/semantic/decorate/mode.el +++ b/lisp/cedet/semantic/decorate/mode.el @@ -36,6 +36,7 @@ ;; ;;; Code: +(eval-when-compile (require 'cl)) (require 'semantic) (require 'semantic/decorate) (require 'semantic/tag-ls) diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index 1c8d2804202..c75a7cfeb09 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el @@ -161,7 +161,7 @@ will throw a warning when it encounters this symbol." 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 --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index 38811634670..b93ed65c1f5 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -795,7 +795,8 @@ specific to a major mode. For example, in jde mode: "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 --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index b9448dc1c32..2d12b03e248 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -76,7 +76,7 @@ is to return a symbol based on type modifiers." (: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 @@ The default behavior (if not overridden with `tag-abstract-p' 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 @@ The default behavior (if not overridden with `tag-leaf-p' 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 @@ STREAM-OR-BUFFER with a tag stream value, or nil." (: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'. |