Skip to content

Commit

Permalink
Use derived-mode-p for major-mode check (#180)
Browse files Browse the repository at this point in the history
  • Loading branch information
10sr authored Oct 23, 2018
1 parent c3be907 commit 57c0266
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions editorconfig.el
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

0 comments on commit 57c0266

Please sign in to comment.