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

Minor, general refactors

Browse source
This commit is contained in:
Henrik Lissner 2019-03-07 23:21:58 -05:00
parent 8f733c2ab5
commit 748b197676
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
5 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/core-editor.el
View file

@ -273,11 +273,12 @@ savehist file."
(def-package! helpful (def-package! helpful
:defer t :defer t
:init :init
(global-set-key [remap describe-function] #'helpful-callable) (define-key!
(global-set-key [remap describe-command] #'helpful-command) [remap describe-function] #'helpful-callable
(global-set-key [remap describe-variable] #'helpful-variable) [remap describe-command] #'helpful-command
(global-set-key [remap describe-key] #'helpful-key) [remap describe-variable] #'helpful-variable
(global-set-key [remap describe-symbol] #'helpful-symbol)) [remap describe-key] #'helpful-key
[remap describe-symbol] #'helpful-symbol))
(def-package! ws-butler (def-package! ws-butler

9
core/core-lib.el
View file

@ -114,10 +114,11 @@ Accepts the same arguments as `message'."
,(concat (propertize "DOOM " 'face 'font-lock-comment-face) ,(concat (propertize "DOOM " 'face 'font-lock-comment-face)
format-string format-string
(when doom--current-module (when doom--current-module
(propertize (format " [%s/%s]" (propertize
(doom-keyword-name (car doom--current-module)) (format " [%s/%s]"
(cdr doom--current-module)) (doom-keyword-name (car doom--current-module))
'face 'warning))) (cdr doom--current-module))
'face 'warning)))
,@args)))) ,@args))))
(defun FILE! () (defun FILE! ()

7
core/core-modules.el
View file

@ -84,7 +84,7 @@ non-nil."
;; ;;
;; Module API ;;; Module API
(defun doom-module-p (category module) (defun doom-module-p (category module)
"Returns t if CATEGORY MODULE is enabled (ie. present in `doom-modules')." "Returns t if CATEGORY MODULE is enabled (ie. present in `doom-modules')."
@ -194,7 +194,6 @@ non-nil, return paths of possible modules, activated or otherwise."
(let ((noninteractive t) (let ((noninteractive t)
doom-modules doom-modules
doom-init-modules-p) doom-init-modules-p)
(message "Initializing modules")
(load! "init" doom-private-dir t) (load! "init" doom-private-dir t)
(or doom-modules (or doom-modules
(make-hash-table :test 'equal (make-hash-table :test 'equal
@ -203,7 +202,7 @@ non-nil, return paths of possible modules, activated or otherwise."
;; ;;
;; Use-package modifications ;;; Use-package modifications
(autoload 'use-package "use-package-core" nil nil t) (autoload 'use-package "use-package-core" nil nil t)
@ -292,7 +291,7 @@ non-nil, return paths of possible modules, activated or otherwise."
;; ;;
;; Module config macros ;;; Module config macros
(defmacro doom! (&rest modules) (defmacro doom! (&rest modules)
"Bootstraps DOOM Emacs and its modules. "Bootstraps DOOM Emacs and its modules.

4
modules/config/default/config.el
View file

@ -29,9 +29,9 @@
(if (not (featurep 'evil)) (if (not (featurep 'evil))
(delete-selection-mode +1) (delete-selection-mode +1)
(defun turn-off-delete-selection-mode () (delete-selection-mode -1)) (defun +default|disable-delete-selection-mode () (delete-selection-mode -1))
(add-hook 'evil-insert-state-entry-hook #'delete-selection-mode) (add-hook 'evil-insert-state-entry-hook #'delete-selection-mode)
(add-hook 'evil-insert-state-exit-hook #'turn-off-delete-selection-mode)) (add-hook 'evil-insert-state-exit-hook #'+default|disable-delete-selection-mode))
(when (featurep! +smartparens) (when (featurep! +smartparens)

1
modules/ui/modeline/config.el
View file

@ -35,6 +35,7 @@
(propertize (format "%s%d" (propertize (format "%s%d"
(if indent-tabs-mode "⭾" "␣") (if indent-tabs-mode "⭾" "␣")
tab-width) tab-width)
'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive)
'mouse-face 'mode-line-highlight 'mouse-face 'mode-line-highlight
'help-echo 'help-echo
(let ((subsegs (let ((subsegs