summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2019-10-11 13:54:30 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2019-10-11 13:54:30 -0400
commita93dceda3fdcca18b51cb96461e1b8a4fc61bfd7 (patch)
treecea78c213727884969164b13de3ececf4233a96d
parent421db07d061cdc493300b30646c2acd13f26d8f3 (diff)
downloademacs-a93dceda3fdcca18b51cb96461e1b8a4fc61bfd7.tar.gz
* lisp/cedet/mode-local.el (define-overload): Declare obsolete
* lisp/cedet/srecode/ctxt.el (srecode-calculate-context): * lisp/cedet/srecode/semantic.el (srecode-semantic-apply-tag-to-dict) (srecode-semantic-find-template): Use define-overloadable-function instead.
-rw-r--r--etc/NEWS3
-rw-r--r--lisp/cedet/mode-local.el3
-rw-r--r--lisp/cedet/semantic/bovine/el.el4
-rw-r--r--lisp/cedet/srecode/ctxt.el2
-rw-r--r--lisp/cedet/srecode/semantic.el4
5 files changed, 10 insertions, 6 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 2fe0a907ef4..eeb02b7066c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2076,6 +2076,9 @@ Emacs init file does not expose you to this change. However,
if you set 'time-stamp-format' or 'time-stamp-pattern' with a
file-local variable, you may need to update the value.
+** mode-local
+*** define-overload is declared obsolete
+
* New Modes and Packages in Emacs 27.1
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 50dc3cb7937..28867eea9b6 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -560,7 +560,8 @@ OVERARGS is a list of arguments passed to the override and
(put ',name 'mode-local-overload t)))
(put :override-with-args 'lisp-indent-function 1)
-(defalias 'define-overload 'define-overloadable-function)
+(define-obsolete-function-alias 'define-overload
+ #'define-overloadable-function "27.1")
(defsubst function-overload-p (symbol)
"Return non-nil if SYMBOL is a function which can be overloaded."
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index b4217080b66..dd21f50325e 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -241,8 +241,8 @@ Return a bovination list to use."
(semantic-elisp-desymbolify-args (nth 2 form))
:user-visible-flag (eq (car-safe (nth 4 form)) 'interactive)
:documentation (semantic-elisp-do-doc (nth 3 form))
- :overloadable (or (eq (car form) 'define-overload)
- (eq (car form) 'define-overloadable-function))
+ :overloadable (memq (car form) '(define-overload
+ define-overloadable-function))
))
defun
defun*
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index b20b9bc6417..ee9f12fcae3 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -36,7 +36,7 @@
;;; Code:
-(define-overload srecode-calculate-context ()
+(define-overloadable-function srecode-calculate-context ()
"Calculate the context at the current point.
The returned context is a list, with the top-most context first.
Each returned context is a string that would show up in a `context'
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 1e1a60e0245..344b908da32 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -89,7 +89,7 @@ If this is nil, then `senator-tag-ring' is used.")
The hook is called with two arguments, the TAG and DICT
to be augmented.")
-(define-overload srecode-semantic-apply-tag-to-dict (tagobj dict)
+(define-overloadable-function srecode-semantic-apply-tag-to-dict (tagobj dict)
"Insert features of TAGOBJ into the dictionary DICT.
TAGOBJ is an object of class `srecode-semantic-tag'. This class
is a compound inserter value.
@@ -227,7 +227,7 @@ Assumes the cursor is in a tag of class type. If not, throw an error."
;;; INSERT A TAG API
;;
;; Routines that take a tag, and insert into a buffer.
-(define-overload srecode-semantic-find-template (class prototype ctxt)
+(define-overloadable-function srecode-semantic-find-template (class prototype ctxt)
"Find a template for a tag of class CLASS based on context.
PROTOTYPE is non-nil if we want a prototype template instead."
)