Introduce major-mode-remap-alist into auto-mode configuration
Also distribute the current auto-mode setting from `db/run-init` to the individual packages, to allow overwriting via customizations.
This commit is contained in:
parent
a4556632b0
commit
2f6aa6a1f7
40
init.el
40
init.el
|
@ -160,19 +160,6 @@
|
||||||
(add-hook 'text-mode-hook 'abbrev-mode)
|
(add-hook 'text-mode-hook 'abbrev-mode)
|
||||||
(add-hook 'text-mode-hook 'hl-line-mode)
|
(add-hook 'text-mode-hook 'hl-line-mode)
|
||||||
|
|
||||||
;; Auto-Modes
|
|
||||||
|
|
||||||
(dolist (mode-spec '(("\\.clj\\'" . clojure-mode)
|
|
||||||
("\\.cl\\'" . lisp-mode)
|
|
||||||
("\\.lisp\\'" . lisp-mode)
|
|
||||||
("\\.plx\\’" . cperl-mode)
|
|
||||||
("\\.hs\\'" . haskell-mode)
|
|
||||||
("\\.lhs\\'" . haskell-mode)
|
|
||||||
("\\.md\\'" . markdown-mode)
|
|
||||||
("\\.html\\'" . nxml-mode)
|
|
||||||
("\\.xml\\'" . nxml-mode)))
|
|
||||||
(add-to-list 'auto-mode-alist mode-spec))
|
|
||||||
|
|
||||||
;; Top-Level Keybindings
|
;; Top-Level Keybindings
|
||||||
|
|
||||||
(bind-key "<XF86Back>" #'winner-undo)
|
(bind-key "<XF86Back>" #'winner-undo)
|
||||||
|
@ -484,6 +471,9 @@
|
||||||
diary-show-holidays-flag t
|
diary-show-holidays-flag t
|
||||||
calendar-view-holidays-initially-flag nil))
|
calendar-view-holidays-initially-flag nil))
|
||||||
|
|
||||||
|
(use-package files
|
||||||
|
:init (setq major-mode-remap-alist `((perl-mode . cperl-mode))))
|
||||||
|
|
||||||
(use-package grep
|
(use-package grep
|
||||||
:commands (rgrep zrgrep)
|
:commands (rgrep zrgrep)
|
||||||
:bind (:map grep-mode-map
|
:bind (:map grep-mode-map
|
||||||
|
@ -2772,6 +2762,8 @@ eventuelly be set to nil, however)."
|
||||||
;; General Stuff first
|
;; General Stuff first
|
||||||
|
|
||||||
(use-package lisp-mode
|
(use-package lisp-mode
|
||||||
|
:mode (("\\.cl\\'" . lisp-mode)
|
||||||
|
("\\.lisp\\'" . lisp-mode))
|
||||||
:init (setq lisp-indent-function #'common-lisp-indent-function))
|
:init (setq lisp-indent-function #'common-lisp-indent-function))
|
||||||
|
|
||||||
(use-package lispy
|
(use-package lispy
|
||||||
|
@ -2817,6 +2809,7 @@ eventuelly be set to nil, however)."
|
||||||
(add-hook 'cider-repl-mode-hook 'company-mode)))
|
(add-hook 'cider-repl-mode-hook 'company-mode)))
|
||||||
|
|
||||||
(use-package clojure-mode
|
(use-package clojure-mode
|
||||||
|
:mode (("\\.clj\\'" . clojure-mode))
|
||||||
:config (progn
|
:config (progn
|
||||||
(define-clojure-indent
|
(define-clojure-indent
|
||||||
(forall 'defun)
|
(forall 'defun)
|
||||||
|
@ -3005,20 +2998,13 @@ eventuelly be set to nil, however)."
|
||||||
(use-package cperl-mode
|
(use-package cperl-mode
|
||||||
:ensure t
|
:ensure t
|
||||||
:commands (cperl-mode)
|
:commands (cperl-mode)
|
||||||
:init (progn
|
:mode ("\\.plx\\'" . cperl-mode)
|
||||||
;; replace perl-mode with cperl-mode
|
:init (setq cperl-hairy nil
|
||||||
(mapc
|
cperl-invalid-face 'default
|
||||||
#'(lambda (pair)
|
cperl-electric-keywords nil
|
||||||
(if (eq (cdr pair) 'perl-mode)
|
cperl-lazy-help-time 2
|
||||||
(setcdr pair 'cperl-mode)))
|
cperl-highlight-variables-indiscriminately t
|
||||||
(append auto-mode-alist interpreter-mode-alist))
|
cperl-indent-parens-as-block t)
|
||||||
|
|
||||||
(setq cperl-hairy nil
|
|
||||||
cperl-invalid-face 'default
|
|
||||||
cperl-electric-keywords nil
|
|
||||||
cperl-lazy-help-time 2
|
|
||||||
cperl-highlight-variables-indiscriminately t
|
|
||||||
cperl-indent-parens-as-block t))
|
|
||||||
:config (progn
|
:config (progn
|
||||||
(add-hook 'cperl-mode-hook 'flycheck-mode)
|
(add-hook 'cperl-mode-hook 'flycheck-mode)
|
||||||
(add-hook 'cperl-mode-hook 'prettify-symbols-mode)
|
(add-hook 'cperl-mode-hook 'prettify-symbols-mode)
|
||||||
|
|
Loading…
Reference in New Issue