emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrite comments for forced deferral of elisp-mode

Browse source 
Made clearer and more succinct.
This commit is contained in:
Henrik Lissner 2018-07-29 17:58:15 +02:00
parent 66056e7a5d
commit a4a0441ec9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/lang/emacs-lisp/config.el
View file

@ -1,21 +1,19 @@
;;; lang/emacs-lisp/config.el -*- lexical-binding: t; -*- ;;; lang/emacs-lisp/config.el -*- lexical-binding: t; -*-
;; `elisp-mode' is always loaded at startup, so to lazy load its config we need ;; `elisp-mode' is loaded at startup. In order to lazy load its config we need
;; to be creative. So we configure it the first tiem `emacs-lisp-mode' is run. ;; to pretend it isn't loaded
(advice-add #'emacs-lisp-mode :before #'+emacs-lisp|init)
;; And we remove `elisp-mode' so later invokations of (after! elisp-mode ...)
;; work as expected.
(delq 'elisp-mode features) (delq 'elisp-mode features)
;; ...until the first time `emacs-lisp-mode' runs
(advice-add #'emacs-lisp-mode :before #'+emacs-lisp|init)
(defun +emacs-lisp|init (&rest _) (defun +emacs-lisp|init (&rest _)
;; Some plugins (like yasnippet) will run `emacs-lisp-mode' early, prematurely ;; Some plugins (like yasnippet) run `emacs-lisp-mode' early, to parse some
;; triggering this function in a non-ideal environment (`emacs-lisp-mode-hook' ;; elisp. This would prematurely trigger this function. In these cases,
;; is let-bound to nil). This breaks a lot of Doom setters, because they try ;; `emacs-lisp-mode-hook' is let-bound to nil or its hooks are delayed, so if
;; to add hooks to `emacs-lisp-mode-hook'! ;; we see either, keep pretending elisp-mode isn't loaded.
;;
;; This means, in some sessions, elisp-mode is never configured properly, so
;; we have to make extra sure `emacs-lisp-mode' was executed interactively.
(when (and emacs-lisp-mode-hook (not delay-mode-hooks)) (when (and emacs-lisp-mode-hook (not delay-mode-hooks))
;; Otherwise, announce to the world elisp-mode has been loaded, so `after!'
;; handlers can respond and configure elisp-mode as expected.
(provide 'elisp-mode) (provide 'elisp-mode)
(advice-remove #'emacs-lisp-mode #'+emacs-lisp|init))) (advice-remove #'emacs-lisp-mode #'+emacs-lisp|init)))