aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2019-10-11 13:54:30 -0400
committerStefan Monnier2019-10-11 13:54:30 -0400
commita93dceda3fdcca18b51cb96461e1b8a4fc61bfd7 (patch)
treecea78c213727884969164b13de3ececf4233a96d
parent421db07d061cdc493300b30646c2acd13f26d8f3 (diff)
downloademacs-a93dceda3fdcca18b51cb96461e1b8a4fc61bfd7.tar.gz
emacs-a93dceda3fdcca18b51cb96461e1b8a4fc61bfd7.zip
* 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,
2076if you set 'time-stamp-format' or 'time-stamp-pattern' with a 2076if you set 'time-stamp-format' or 'time-stamp-pattern' with a
2077file-local variable, you may need to update the value. 2077file-local variable, you may need to update the value.
2078 2078
2079** mode-local
2080*** define-overload is declared obsolete
2081
2079 2082
2080* New Modes and Packages in Emacs 27.1 2083* New Modes and Packages in Emacs 27.1
2081 2084
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
560 (put ',name 'mode-local-overload t))) 560 (put ',name 'mode-local-overload t)))
561(put :override-with-args 'lisp-indent-function 1) 561(put :override-with-args 'lisp-indent-function 1)
562 562
563(defalias 'define-overload 'define-overloadable-function) 563(define-obsolete-function-alias 'define-overload
564 #'define-overloadable-function "27.1")
564 565
565(defsubst function-overload-p (symbol) 566(defsubst function-overload-p (symbol)
566 "Return non-nil if SYMBOL is a function which can be overloaded." 567 "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."
241 (semantic-elisp-desymbolify-args (nth 2 form)) 241 (semantic-elisp-desymbolify-args (nth 2 form))
242 :user-visible-flag (eq (car-safe (nth 4 form)) 'interactive) 242 :user-visible-flag (eq (car-safe (nth 4 form)) 'interactive)
243 :documentation (semantic-elisp-do-doc (nth 3 form)) 243 :documentation (semantic-elisp-do-doc (nth 3 form))
244 :overloadable (or (eq (car form) 'define-overload) 244 :overloadable (memq (car form) '(define-overload
245 (eq (car form) 'define-overloadable-function)) 245 define-overloadable-function))
246 )) 246 ))
247 defun 247 defun
248 defun* 248 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 @@
36 36
37;;; Code: 37;;; Code:
38 38
39(define-overload srecode-calculate-context () 39(define-overloadable-function srecode-calculate-context ()
40 "Calculate the context at the current point. 40 "Calculate the context at the current point.
41The returned context is a list, with the top-most context first. 41The returned context is a list, with the top-most context first.
42Each returned context is a string that would show up in a `context' 42Each 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.")
89The hook is called with two arguments, the TAG and DICT 89The hook is called with two arguments, the TAG and DICT
90to be augmented.") 90to be augmented.")
91 91
92(define-overload srecode-semantic-apply-tag-to-dict (tagobj dict) 92(define-overloadable-function srecode-semantic-apply-tag-to-dict (tagobj dict)
93 "Insert features of TAGOBJ into the dictionary DICT. 93 "Insert features of TAGOBJ into the dictionary DICT.
94TAGOBJ is an object of class `srecode-semantic-tag'. This class 94TAGOBJ is an object of class `srecode-semantic-tag'. This class
95is a compound inserter value. 95is a compound inserter value.
@@ -227,7 +227,7 @@ Assumes the cursor is in a tag of class type. If not, throw an error."
227;;; INSERT A TAG API 227;;; INSERT A TAG API
228;; 228;;
229;; Routines that take a tag, and insert into a buffer. 229;; Routines that take a tag, and insert into a buffer.
230(define-overload srecode-semantic-find-template (class prototype ctxt) 230(define-overloadable-function srecode-semantic-find-template (class prototype ctxt)
231 "Find a template for a tag of class CLASS based on context. 231 "Find a template for a tag of class CLASS based on context.
232PROTOTYPE is non-nil if we want a prototype template instead." 232PROTOTYPE is non-nil if we want a prototype template instead."
233 ) 233 )