TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add variable `dotspacemacs-loading-progress-bar` 

Default is t
This commit is contained in:
syl20bnr 2015-02-15 21:25:12 -05:00
parent 4168b9f217
commit 97bb568360
6 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
core/core-configuration-layer.el
View File

@ -270,7 +270,8 @@ the following keys:
;; install and initialize packages and extensions
(configuration-layer//initialize-extensions configuration-layer-all-pre-extensions-sorted t)
(configuration-layer//install-packages)
(spacemacs/append-to-buffer spacemacs-loading-text)
(when dotspacemacs-loading-progress-bar
(spacemacs/append-to-buffer spacemacs-loading-text))
(configuration-layer//initialize-packages)
(configuration-layer//initialize-extensions configuration-layer-all-post-extensions-sorted)
;; restore warning level before initialization
@ -383,7 +384,7 @@ If PRE is non nil then `layer-pre-extensions' is read instead of
not-installed-count))
(spacemacs/append-to-buffer
"--> fetching new package repository indexes...\n")
(redisplay)
(spacemacs//redisplay)
(package-refresh-contents)
(setq installed-count 0)
(dolist (pkg not-installed)
@ -401,7 +402,7 @@ If PRE is non nil then `layer-pre-extensions' is read instead of
pkg))
(configuration-layer//activate-package (car dep)))
(package-install pkg)))
(redisplay))
(spacemacs//redisplay))
(spacemacs/append-to-buffer "\n")))))
(defun configuration-layer//get-packages-to-update (packages)
@ -435,7 +436,7 @@ If PRE is non nil then `layer-pre-extensions' is read instead of
"\nUpdating Spacemacs... (for now only ELPA packages are updated)\n")
(spacemacs/append-to-buffer
"--> fetching new package repository indexes...\n")
(redisplay)
(spacemacs//redisplay)
(package-refresh-contents)
(let* ((update-packages (configuration-layer//get-packages-to-update
configuration-layer-all-packages-sorted))
@ -456,7 +457,7 @@ If PRE is non nil then `layer-pre-extensions' is read instead of
;; variable to be cached for easy update and rollback
(spacemacs/replace-last-line-of-buffer
"--> performing backup of package(s) to update...\n" t)
(redisplay)
(spacemacs//redisplay)
(dolist (pkg update-packages)
(let* ((src-dir (configuration-layer//get-package-directory pkg))
(dest-dir (expand-file-name
@ -475,7 +476,7 @@ If PRE is non nil then `layer-pre-extensions' is read instead of
(spacemacs/replace-last-line-of-buffer
(format "--> updating package %s... [%s/%s]"
pkg upgraded-count upgrade-count) t)
(redisplay)
(spacemacs//redisplay)
(configuration-layer//package-delete pkg)
(condition-case err (package-install pkg)
('error
@ -492,9 +493,9 @@ If PRE is non nil then `layer-pre-extensions' is read instead of
(format "\n--> %s packages updated.\n" upgraded-count))
(spacemacs/append-to-buffer
"\nEmacs has to be restarted for the changes to take effect.\n")
(redisplay))
(spacemacs//redisplay))
(spacemacs/append-to-buffer "--> All packages are up to date.\n")
(redisplay))))
(spacemacs//redisplay))))
(defun configuration-layer//ido-candidate-rollback-slot ()
"Return a list of candidates to select a rollback slot."
@ -538,7 +539,7 @@ to select one."
(rollbacked-count 0))
(spacemacs/append-to-buffer
(format "Found %s package(s) to rollback...\n" rollback-count))
(redisplay)
(spacemacs//redisplay)
(dolist (apkg update-packages-alist)
(let* ((pkg (car apkg))
(pkg-dir-name (cdr apkg))
@ -553,7 +554,7 @@ to select one."
(spacemacs/replace-last-line-of-buffer
(format "--> rollbacking package %s... [%s/%s]"
pkg rollbacked-count rollback-count) t)
(redisplay)
(spacemacs//redisplay)
(configuration-layer//package-delete pkg)
(copy-directory src-dir dest-dir 'keeptime 'create 'copy-content)))
(spacemacs/append-to-buffer
@ -758,7 +759,8 @@ deleted safely."
(if orphans
(progn
;; for the loading dot bar
(spacemacs/append-to-buffer "OK!\n")
(when dotspacemacs-loading-progress-bar
(spacemacs/append-to-buffer "OK!\n"))
(spacemacs/append-to-buffer
(format "Found %s orphan package(s) to delete...\n"
orphans-count))
@ -771,26 +773,28 @@ deleted safely."
deleted-count
orphans-count) t)
(configuration-layer//package-delete orphan)
(redisplay))
(spacemacs//redisplay))
(spacemacs/append-to-buffer "\n"))
(spacemacs/message "No orphan package to delete."))))
(defun configuration-layer/setup-after-init-hook ()
"Add post init processing."
(add-hook 'after-init-hook
(lambda ()
;; Ultimate configuration decisions are given to the user who can defined
;; them in his/her ~/.spacemacs file
(dotspacemacs|call-func dotspacemacs/config "Executing user config...")
(spacemacs/append-to-buffer (format "%s\n" spacemacs-loading-done-text))
;; from jwiegley
;; https://github.com/jwiegley/dot-emacs/blob/master/init.el
(let ((elapsed (float-time
(time-subtract (current-time) emacs-start-time))))
(spacemacs/append-to-buffer
(format "[%s packages loaded in %.3fs]\n"
(configuration-layer//initialized-packages-count)
elapsed)))
(spacemacs/check-for-new-version spacemacs-version-check-interval))))
(add-hook
'after-init-hook
(lambda ()
;; Ultimate configuration decisions are given to the user who can defined
;; them in his/her ~/.spacemacs file
(dotspacemacs|call-func dotspacemacs/config "Executing user config...")
(when dotspacemacs-loading-progress-bar
(spacemacs/append-to-buffer (format "%s\n" spacemacs-loading-done-text)))
;; from jwiegley
;; https://github.com/jwiegley/dot-emacs/blob/master/init.el
(let ((elapsed (float-time
(time-subtract (current-time) emacs-start-time))))
(spacemacs/append-to-buffer
(format "[%s packages loaded in %.3fs]\n"
(configuration-layer//initialized-packages-count)
elapsed)))
(spacemacs/check-for-new-version spacemacs-version-check-interval))))
(provide 'core-configuration-layer)

5
core/core-dotspacemacs.el
View File

@ -59,6 +59,11 @@ with `:' and Emacs commands are executed with `<leader> :'.")
(defvar dotspacemacs-guide-key-delay 0.4
"Guide-key delay in seconds.")
(defvar dotspacemacs-loading-progress-bar t
"If non nil a progress bar is displayed when spacemacs is loading. This
may increase the boot time on some systems and emacs builds, set it to nil
to boost the loading time.")
(defvar dotspacemacs-helm-micro-state t
"Enable micro-state for helm buffer when pressing on TAB.")

7
core/core-funcs.el
View File

@ -65,4 +65,11 @@ and its values are removed."
(print (list 'setq var (list 'quote (symbol-value var)))
buffer)))
(defvar spacemacs--init-redisplay-count 0
"The number of calls to `redisplay'")
(defun spacemacs//redisplay ()
"`redisplay' wrapper."
(setq spacemacs--init-redisplay-count (1+ spacemacs--init-redisplay-count))
(redisplay))
(provide 'core-funcs)

22
core/core-spacemacs-buffer.el
View File

@ -31,7 +31,8 @@ Doge special banner can be reachable via `999', `doge' or `random*'.
(spacemacs/message (format "Banner: %s" banner))
(insert-file-contents banner)
(spacemacs//inject-version-in-buffer)
(spacemacs/insert-buttons))))
(spacemacs/insert-buttons)
(spacemacs//redisplay))))
(defun spacemacs//choose-random-banner (&optional all)
"Return the full path of a banner chosen randomly.
@ -91,15 +92,16 @@ buffer, right justified."
"Display LOADING-TITLE with trailing dots of max length
SPACEMACS-TITLE-LENGTH. New loading title is displayed by chunk
of size LOADING-DOTS-CHUNK-THRESHOLD."
(setq spacemacs-loading-counter (1+ spacemacs-loading-counter))
(when (>= spacemacs-loading-counter spacemacs-loading-dots-chunk-threshold)
(setq spacemacs-loading-counter 0)
(let ((i 0))
(while (< i spacemacs-loading-dots-chunk-size)
(setq spacemacs-loading-text (concat spacemacs-loading-text "."))
(setq i (1+ i))))
(spacemacs/replace-last-line-of-buffer spacemacs-loading-text)
(redisplay)))
(when dotspacemacs-loading-progress-bar
(setq spacemacs-loading-counter (1+ spacemacs-loading-counter))
(when (>= spacemacs-loading-counter spacemacs-loading-dots-chunk-threshold)
(setq spacemacs-loading-counter 0)
(let ((i 0))
(while (< i spacemacs-loading-dots-chunk-size)
(setq spacemacs-loading-text (concat spacemacs-loading-text "."))
(setq i (1+ i))))
(spacemacs/replace-last-line-of-buffer spacemacs-loading-text)
(spacemacs//redisplay))))
(defun spacemacs/insert-buttons ()
(goto-char (point-max))

3
core/core-spacemacs-mode.el
View File

@ -106,7 +106,6 @@ initialization."
(car dotspacemacs-default-font)))
;; banner
(spacemacs//insert-banner)
(redisplay)
(setq-default evil-want-C-u-scroll t)
;; Initializing configuration from ~/.spacemacs
(dotspacemacs|call-func dotspacemacs/init "Executing user init...")
@ -157,7 +156,7 @@ FILE-TO-LOAD is an explicit file to load after the installation."
(when log
(spacemacs/append-to-buffer
(format "(Bootstrap) Installing %s...\n" pkg))
(redisplay))
(spacemacs//redisplay))
(package-refresh-contents)
(package-install pkg)
(setq pkg-elpa-dir (spacemacs//get-package-directory pkg)))

4
core/templates/.spacemacs.template
View File

@ -57,6 +57,10 @@
;; Guide-key delay in seconds. The Guide-key is the popup buffer listing
;; the commands bound to the current keystrokes.
dotspacemacs-guide-key-delay 0.4
;; If non nil a progress bar is displayed when spacemacs is loading. This
;; may increase the boot time on some systems and emacs builds, set it to nil
;; to boost the loading time.
dotspacemacs-loading-progress-bar t
;; Enable micro-state for helm buffer when pressing on TAB."
dotspacemacs-helm-micro-state t
;; If non nil the frame is fullscreen when Emacs starts up (Emacs 24.4+ only).