General cleanup & refactor

This commit is contained in:
Henrik Lissner 2017-08-06 16:30:53 +02:00
parent a76693c7e2
commit 85c28444b3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
4 changed files with 6 additions and 6 deletions

View file

@ -51,8 +51,8 @@ list, whose car is NAME, and cdr the current version list and latest version
list of the package." list of the package."
(cl-assert (symbolp name) t) (cl-assert (symbolp name) t)
(doom-initialize-packages) (doom-initialize-packages)
(when-let (pkg (assq name package-alist)) (when-let (desc (cadr (assq name package-alist)))
(let* ((old-version (package-desc-version (cadr pkg))) (let* ((old-version (package-desc-version desc))
(new-version (new-version
(pcase (doom-package-backend name) (pcase (doom-package-backend name)
('quelpa ('quelpa

View file

@ -148,7 +148,7 @@ local value, whether or not it's permanent-local. Therefore, we cycle
;; undo/redo changes to Emacs' window layout ;; undo/redo changes to Emacs' window layout
(defvar winner-dont-bind-my-keys t) ; I'll bind keys myself (defvar winner-dont-bind-my-keys t) ; I'll bind keys myself
(autoload 'winner-mode "winner" nil t) (autoload 'winner-mode "winner" nil t)
(add-hook 'doom-init-hook #'winner-mode) (add-hook 'doom-init-ui-hook #'winner-mode)
;; highlight matching delimiters ;; highlight matching delimiters
(setq show-paren-delay 0.1 (setq show-paren-delay 0.1
@ -185,7 +185,7 @@ local value, whether or not it's permanent-local. Therefore, we cycle
;; Getting themes to remain consistent across GUI Emacs, terminal Emacs and ;; Getting themes to remain consistent across GUI Emacs, terminal Emacs and
;; daemon Emacs is hairy. ;; daemon Emacs is hairy.
;; ;;
;; + Running `+doom|init-ui' directly sorts out the initial GUI frame. ;; + Running `doom|init-ui' directly sorts out the initial GUI frame.
;; + Attaching it to `after-make-frame-functions' sorts out daemon Emacs. ;; + Attaching it to `after-make-frame-functions' sorts out daemon Emacs.
;; + Waiting for 0.1s in `doom|reload-ui-in-daemon' fixes daemon Emacs started ;; + Waiting for 0.1s in `doom|reload-ui-in-daemon' fixes daemon Emacs started
;; with `server-start' in an interactive session of Emacs AND in tty Emacs. ;; with `server-start' in an interactive session of Emacs AND in tty Emacs.

View file

@ -64,7 +64,7 @@
(switch-to-buffer a) (switch-to-buffer a)
(should (eq (current-buffer) a)) (should (eq (current-buffer) a))
(should (eq (selected-window) (get-buffer-window a))) (should (eq (selected-window) (get-buffer-window a)))
(split-window) (split-window nil 1)
(switch-to-buffer b) (switch-to-buffer b)
(should (eq (current-buffer) b)) (should (eq (current-buffer) b))
(should (eq (selected-window) (get-buffer-window b))) (should (eq (selected-window) (get-buffer-window b)))

View file

@ -41,7 +41,7 @@ renamed.")
persp-auto-save-opt (if noninteractive 0 1)) persp-auto-save-opt (if noninteractive 0 1))
;; Bootstrap ;; Bootstrap
(add-hook 'doom-init-hook #'+workspaces|init) (add-hook 'doom-post-init-hook #'+workspaces|init)
(add-hook 'after-make-frame-functions #'+workspaces|init) (add-hook 'after-make-frame-functions #'+workspaces|init)
(define-key persp-mode-map [remap delete-window] #'+workspace/close-window-or-workspace) (define-key persp-mode-map [remap delete-window] #'+workspace/close-window-or-workspace)