branch: externals/ergoemacs-mode
commit b378df1a5d33817dc8921afba859f8c100f33093
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Reindent
---
ergoemacs-mode.el | 86 +++++++++++++++++++++++++++----------------------------
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index c537632..26e7eeb 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -276,49 +276,49 @@ The `execute-extended-command' is now
\\[execute-extended-command].
:keymap ergoemacs-menu-keymap
(setq ergoemacs-mode--start-p t)
(if (and (not noninteractive)
- (not ergoemacs-mode--start-p))
- (if ergoemacs-mode
- (message "Ergoemacs will be started.")
- (message "Ergoemacs startup canceled."))
- (setq ergoemacs-map--hashkey nil)
- (unless ergoemacs-require--ini-p
- (setq ergoemacs-require--ini-p :ini)
- (when ergoemacs-require
- (dolist (elt ergoemacs-require)
- (apply #'ergoemacs-require elt))))
- (let ((refresh-p
ergoemacs-component-struct--refresh-variables))
- (if ergoemacs-mode
- (progn
- (setq ergoemacs-mode--default-frame-alist nil)
- (dolist (elt (reverse default-frame-alist))
- (push elt ergoemacs-mode--default-frame-alist))
- (run-hooks 'ergoemacs-mode-startup-hook)
- (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)"
ergoemacs-keyboard-layout)
- (message "Ergoemacs-mode turned ON (%s)."
ergoemacs-keyboard-layout)))
-
- (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))))
- (setq ergoemacs-mode--default-frame-alist nil)
- (run-hooks 'ergoemacs-mode-shutdown-hook)
- (remove-hook 'post-command-hook
#'ergoemacs-post-command-hook)
- (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.")
- )
- )
- )
- (setq ergoemacs-mode-started-p t)
- )
+ (not ergoemacs-mode--start-p))
+ (if ergoemacs-mode
+ (message "Ergoemacs will be started.")
+ (message "Ergoemacs startup canceled."))
+ (setq ergoemacs-map--hashkey nil)
+ (unless ergoemacs-require--ini-p
+ (setq ergoemacs-require--ini-p :ini)
+ (when ergoemacs-require
+ (dolist (elt ergoemacs-require)
+ (apply #'ergoemacs-require elt))))
+ (let ((refresh-p ergoemacs-component-struct--refresh-variables))
+ (if ergoemacs-mode
+ (progn
+ (setq ergoemacs-mode--default-frame-alist nil)
+ (dolist (elt (reverse default-frame-alist))
+ (push elt ergoemacs-mode--default-frame-alist))
+ (run-hooks 'ergoemacs-mode-startup-hook)
+ (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)"
ergoemacs-keyboard-layout)
+ (message "Ergoemacs-mode turned ON (%s)."
ergoemacs-keyboard-layout)))
+
+ (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))))
+ (setq ergoemacs-mode--default-frame-alist nil)
+ (run-hooks 'ergoemacs-mode-shutdown-hook)
+ (remove-hook 'post-command-hook #'ergoemacs-post-command-hook)
+ (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.")
+ )
+ )
+ )
+ (setq ergoemacs-mode-started-p t)
+ )
)
(defvar ergoemacs--gzip (executable-find "gzip")
