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

Use derived-mode-p for major-mode check #180

Merged
merged 1 commit into from
Oct 23, 2018
Merged

Use derived-mode-p for major-mode check #180

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: 1 addition & 10 deletions editorconfig.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,14 +421,6 @@ TRIM-TRAILING-WS."
(> (string-to-number length) 0))
(setq fill-column (string-to-number length))))

(defun editorconfig--is-a-mode-p (current want)
"Return non-nil if major mode CURRENT is a major mode WANT."
(or (eq current
want)
(let ((parent (get current 'derived-mode-parent)))
(and parent
(editorconfig--is-a-mode-p parent want)))))

(defun editorconfig-set-major-mode-from-name (filetype)
"Set buffer `major-mode' by FILETYPE.

Expand Down Expand Up @@ -467,8 +459,7 @@ different from MODE value (for example, `conf-mode' will set `major-mode' to
editorconfig--apply-major-mode-currently))
(not (eq mode
major-mode))
(not (editorconfig--is-a-mode-p major-mode
mode)))
(not (derived-mode-p mode)))
(unwind-protect
(progn
(setq editorconfig--apply-major-mode-currently
Expand Down