diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-10-24 23:06:23 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-10-24 23:06:23 -0400 |
| commit | f131e396f8a32003b795456130ea37efa6ff41eb (patch) | |
| tree | cceba834987ecea14bbbe8db5aa2877f2e6de13d /lisp/cedet/srecode/map.el | |
| parent | 4a083b0d36a8b2afe23447dbc357de3641140d4d (diff) | |
| download | emacs-f131e396f8a32003b795456130ea37efa6ff41eb.tar.gz emacs-f131e396f8a32003b795456130ea37efa6ff41eb.tar.bz2 emacs-f131e396f8a32003b795456130ea37efa6ff41eb.zip | |
* lisp/cedet/mode-local.el: Clean up name space
Mostly renaming functions by adding `mode-local--` to their name
and leaving an obsolete alias behind, just in case.
(define-child-mode): Make obsolete.
(mode-local--set-parent): Rename from set-mode-local-parent.
(mode-local--new-bindings): Rename from new-mode-local-bindings.
Use `obarray-make`.
(mode-local--activate-bindings): Rename from activate-mode-local-bindings.
(mode-local--deactivate-bindings): Rename from
deactivate-mode-local-bindings.
(make-obsolete-overload): Rename properties with a `mode-local--` prefix.
Adjust all users.
(mode-local--overload-obsoleted-by): Rename from overload-obsoleted-by.
(mode-local--overload-that-obsolete): Rename from overload-that-obsolete.
(mode-local--function-overload-p): Rename from function-overload-p.
(mode-local-read-function): Mark obsolete.
(mode-local--overload-docstring-extension): Rename from
overload-docstring-extension.
(mode-local--describe-overload): Rename from describe-mode-local-overload.
* lisp/cedet/semantic/fw.el (semantic-install-function-overrides):
Remove unused `mode` argument.
* lisp/cedet/semantic/grammar-wy.el (semantic-grammar-wy--install-parser):
* lisp/cedet/semantic/bovine/grammar.el (bovine-grammar-mode):
* lisp/cedet/semantic/texi.el (semantic-default-texi-setup):
* lisp/cedet/semantic/wisent/grammar.el (wisent-grammar-setupcode-builder)
(wisent-grammar-mode):
* lisp/cedet/semantic/html.el (semantic-default-html-setup):
Make the `semantic-` prefix explicit to ease grep search.
(html-helper-mode): Remove obsolete setting.
* lisp/cedet/semantic/wisent/javascript.el: Fix js-mode/javascript-mode
mixup so we don't need define-child-mode any more.
(semantic-get-local-variables, semantic-ctxt-current-symbol)
(semantic-tag-protection, semantic-analyze-scope-calculate-access):
Use `js-mode` rather than `javascript-mode` as the mode name since
that's the real mode's name.
* lisp/cedet/semantic/wisent/python.el (python-2-mode, python-3-mode):
Remove child declaration for non-existing modes.
* lisp/cedet/srecode/map.el (srecode-map-validate-file-for-mode): Simplify.
Diffstat (limited to 'lisp/cedet/srecode/map.el')
| -rw-r--r-- | lisp/cedet/srecode/map.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el index 08ff0e6305e..343cc9155d3 100644 --- a/lisp/cedet/srecode/map.el +++ b/lisp/cedet/srecode/map.el @@ -346,8 +346,8 @@ if that file is NEW, otherwise assume the mode has not changed." Argument FAST implies that the file should not be reparsed if there is already an entry for it. Return non-nil if the map changed." - (when (or (not fast) - (not (srecode-map-entry-for-file-anywhere srecode-current-map file))) + (unless (and fast + (srecode-map-entry-for-file-anywhere srecode-current-map file)) (let ((buff-orig (get-file-buffer file)) (dirty nil)) (save-excursion |