[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode ac50534 067/325: Make ergoemacs-mode onl
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode ac50534 067/325: Make ergoemacs-mode only run when called, not when the file is loaded. |
Date: |
Sat, 23 Oct 2021 18:48:23 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit ac50534dd91617c10b95cf4f00cdeb41a77cd29b
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>
Make ergoemacs-mode only run when called, not when the file is loaded.
---
ergoemacs-mode.el | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 8fd11f8..94f145d 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -279,7 +279,8 @@ The `execute-extended-command' is now
\\[execute-extended-command].
:global t
:group 'ergoemacs-mode
:keymap ergoemacs-menu-keymap
- :after-hook (if (and (not noninteractive)
+ (setq ergoemacs-mode--start-p t)
+ (if (and (not noninteractive)
(not ergoemacs-mode--start-p))
(if ergoemacs-mode
(message "Ergoemacs will be started.")
@@ -300,12 +301,15 @@ The `execute-extended-command' is now
\\[execute-extended-command].
(add-hook 'pre-command-hook
#'ergoemacs-pre-command-hook)
(add-hook 'post-command-hook
#'ergoemacs-post-command-hook)
(add-hook 'after-load-functions
#'ergoemacs-after-load-functions)
+ (add-hook 'after-load-functions
#'ergoemacs-mode-after-startup-run-load-hooks)
+
(setq ergoemacs-require--ini-p t)
(ergoemacs-setup-override-keymap)
(if refresh-p
(message "Ergoemacs-mode keys refreshed (%s:%s)"
ergoemacs-keyboard-layout (or
ergoemacs-theme "standard"))
(message "Ergoemacs-mode turned ON (%s:%s)."
ergoemacs-keyboard-layout (or ergoemacs-theme "standard"))))
+
(modify-all-frames-parameters
ergoemacs-mode--default-frame-alist)
(unless (assoc 'cursor-type
ergoemacs-mode--default-frame-alist)
(modify-all-frames-parameters (list (cons 'cursor-type
'box))))
@@ -315,7 +319,13 @@ The `execute-extended-command' is now
\\[execute-extended-command].
(remove-hook 'pre-command-hook
#'ergoemacs-pre-command-hook)
(remove-hook 'after-load-functions
#'ergoemacs-after-load-functions)
(unless refresh-p
- (message "Ergoemacs-mode turned OFF."))))))
+ (message "Ergoemacs-mode turned OFF.")
+ )
+ )
+ )
+ (setq ergoemacs-mode-started-p t)
+ )
+ )
(defvar ergoemacs--gzip (executable-find "gzip")
"Gzip location.")
@@ -423,7 +433,6 @@ This is structured by valid keyboard layouts for
(calculate-ergoemacs-remap . "ergoemacs-map.el")
(calc-remaps . "ergoemacs-map.el")
(calc-passthrough . "ergoemacs-map.el")
- (ergoemacs-mode-after-init-emacs . "ergoemacs-mode.el")
(setup-ergoemacs-hash . "ergoemacs-mode.el"))
"Alist of known timing functions.")
@@ -1008,20 +1017,6 @@ also perform `outline-next-visible-heading'"
(run-hooks 'ergoemacs-mode-after-load-hook))
(defvar ergoemacs-mode-started-p nil)
-(defun ergoemacs-mode-after-init-emacs ()
- "Start `ergoemacs-mode' after loading Emacs."
- (unless ergoemacs-mode--start-p
- (ergoemacs-timing ergoemacs-mode-after-init-emacs
- (setq ergoemacs-mode--start-p t)
- (ergoemacs-mode ergoemacs-mode)
- (run-hooks 'ergoemacs-mode-init-hook)
- (add-hook 'after-load-functions
#'ergoemacs-mode-after-startup-run-load-hooks))
- (let* ((time1 ergoemacs--load-time)
- (time2 (aref (gethash 'ergoemacs-mode-after-init-emacs
ergoemacs-timing-hash) 1))
- (time3 (+ time1 time2)))
- (message "Started `ergoemacs-mode'. Total startup time %f (Load: %f,
Initialize:%f%s)"
- time3 time1 time2 (or (and ergoemacs-mode--fast-p ", cached")
""))))
- (setq ergoemacs-mode-started-p t))
(if ergoemacs-mode--fast-p
(provide 'ergoemacs-themes)
@@ -1039,9 +1034,6 @@ also perform `outline-next-visible-heading'"
(puthash 'ergoemacs-load-time (vector 1 ergoemacs--load-time
ergoemacs--load-time ergoemacs--load-time (or load-file-name buffer-file-name))
ergoemacs-timing-hash)
-(run-with-timer 0.0 nil #'ergoemacs-mode-after-init-emacs)
-(add-hook 'emacs-startup-hook #'ergoemacs-mode-after-init-emacs)
-
(provide 'ergoemacs-mode)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; ergoemacs-mode.el ends here
- [elpa] externals/ergoemacs-mode a876297 027/325: Add a comment, (continued)
- [elpa] externals/ergoemacs-mode a876297 027/325: Add a comment, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 9e8d701 010/325: Remove unused require 'strings and assorted cleanup, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f0c4e91 142/325: Unset keys in ibuffer, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 1c2f61e 018/325: Remove tabbar-toddle since its only purpose is to download tabber, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 8b47756 021/325: Revert "Remove cttl-x-c 'both' option", Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 5e0c000 050/325: Cleanup, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode c59bedc 047/325: Remove more modal, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 65ad125 054/325: Cleanup, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 7c8eea5 069/325: Remove command loop timer, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 49a1430 064/325: Remove theme test, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode ac50534 067/325: Make ergoemacs-mode only run when called, not when the file is loaded.,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode b40f209 084/325: Remove duplicate entries, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 655f116 085/325: Remove redundant entries in term-raw-map, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f46b453 087/325: Remove some term bindings, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 58dc2d8 083/325: Use explicit functions for term-raw-map so byte compiling works, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 1a67e04 074/325: Remove shift translation, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 876e40e 082/325: Merge branch 'master' into ergoterm, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 5464d82 088/325: Remove dead code, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 82cba16 070/325: Remove shift selection, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 80461f6 118/325: Remove debug statements, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode dc9878c 127/325: Move a whole bunch of bindings into regular functions, Stefan Monnier, 2021/10/23