Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not call mode func when current mode is a child mode of target #179

Merged
merged 1 commit into from
Sep 25, 2018
Merged

Do not call mode func when current mode is a child mode of target #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions editorconfig.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,11 +438,9 @@ FILETYPE should be s string like `\"ini\"`, if not nil or empty string."
""))
(intern (concat filetype
"-mode")))))
(when (and mode
(not (editorconfig--is-a-mode-p major-mode
mode)))
(when mode
(if (fboundp mode)
(funcall mode)
(editorconig-apply-major-mode-safely mode)
(display-warning :error (format "Major-mode `%S' not found"
mode))
nil))))
Expand All @@ -464,10 +462,13 @@ This funcion will avoid such cases and set `major-mode' safely.
Just checking current `major-mode' value is not enough, because it can be
different from MODE value (for example, `conf-mode' will set `major-mode' to
`conf-unix-mode' or another conf mode)."
(cl-assert mode)
(when (and (not (eq mode
editorconfig--apply-major-mode-currently))
(not (eq mode
major-mode)))
major-mode))
(not (editorconfig--is-a-mode-p major-mode
mode)))
(unwind-protect
(progn
(setq editorconfig--apply-major-mode-currently
Expand Down