Skip to content

Commit 69999c1

Browse files
committed
Merge pull request #70 from bbatsov/master
Use define-derived-mode to define elixir-mode
2 parents dc8f959 + 412665f commit 69999c1

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

elixir-mode.el

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -526,15 +526,11 @@ Argument END End of the region."
526526
))
527527

528528
;;;###autoload
529-
(defun elixir-mode ()
530-
"Major mode for editing Elixir files."
531-
(interactive)
532-
(kill-all-local-variables)
533-
(use-local-map elixir-mode-map)
534-
(set-syntax-table elixir-mode-syntax-table)
529+
(define-derived-mode elixir-mode prog-mode "Elixir"
530+
"Major mode for editing Elixir code.
531+
532+
\\{elixir-mode-map}"
535533
(set (make-local-variable 'font-lock-defaults) '(elixir-mode-font-lock-defaults))
536-
(setq major-mode 'elixir-mode)
537-
(setq mode-name "Elixir")
538534
(set (make-local-variable 'comment-start) "# ")
539535
(set (make-local-variable 'comment-end) "")
540536
(set (make-local-variable 'comment-use-syntax) t)
@@ -544,9 +540,7 @@ Argument END End of the region."
544540
(set (make-local-variable 'syntax-propertize-function) 'elixir-syntax-propertize))
545541
(smie-setup elixir-smie-grammar 'verbose-elixir-smie-rules ; 'elixir-smie-rules
546542
:forward-token 'elixir-smie-forward-token
547-
:backward-token 'elixir-smie-backward-token)
548-
(run-hooks 'elixir-mode-hook)
549-
(run-hooks 'prog-mode-hook))
543+
:backward-token 'elixir-smie-backward-token))
550544

551545
(define-minor-mode elixir-cos-mode
552546
"Elixir mode toggle compile on save."

0 commit comments

Comments
 (0)