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

Minor, general refactor

Browse source 
In some contexts, map-put is superior to add-to-list.
This commit is contained in:
Henrik Lissner 2018-05-29 15:34:12 +02:00
parent 592d83a968
commit 947fe345c3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
7 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/core-ui.el
View file

@ -693,8 +693,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
(memq (previous-buffer) (list buf 'nil))) (memq (previous-buffer) (list buf 'nil)))
(switch-to-buffer (doom-fallback-buffer))) (switch-to-buffer (doom-fallback-buffer)))
(kill-buffer buf))) (kill-buffer buf)))
(t ((funcall orig-fn)))))
(funcall orig-fn)))))
(defun doom|init-ui () (defun doom|init-ui ()

2
modules/feature/evil/config.el
View file

@ -16,7 +16,7 @@ variable for an explanation of the defaults (in comments). See
:defer 1 :defer 1
:after-call post-command-hook :after-call post-command-hook
:preface :preface
;; must be set before evil/evil-collcetion is loaded ;; must be set before evil/evil-collection is loaded
(setq evil-want-integration nil (setq evil-want-integration nil
evil-collection-company-use-tng nil) evil-collection-company-use-tng nil)
:config :config

2
modules/lang/csharp/config.el
View file

@ -1,6 +1,6 @@
;;; lang/csharp/config.el -*- lexical-binding: t; -*- ;;; lang/csharp/config.el -*- lexical-binding: t; -*-
(add-to-list 'auto-mode-alist '("\\.shader$" . shader-mode)) ; unity shaders (map-put auto-mode-alist '"\\.shader$" 'dshader-mode) ; unity shaders
(def-package! omnisharp (def-package! omnisharp

2
modules/lang/org/+babel.el
View file

@ -29,7 +29,7 @@ libraries (ob-*.el) that don't match the name of the language.")
(or (cdr (assoc (downcase language) +org-babel-mode-alist)) (or (cdr (assoc (downcase language) +org-babel-mode-alist))
language))) language)))
nil t)) nil t))
(add-to-list 'org-babel-load-languages (cons lang-sym t))) (map-put org-babel-load-languages lang-sym t))
(apply orig-fn args))) (apply orig-fn args)))
(advice-add #'org-babel-execute-src-block :around #'+org*babel-execute-src-block) (advice-add #'org-babel-execute-src-block :around #'+org*babel-execute-src-block)

2
modules/tools/magit/config.el
View file

@ -38,7 +38,7 @@
(def-package! evil-magit (def-package! evil-magit
:when (featurep! :feature evil) :when (featurep! :feature evil)
:after magit :after magit
:init (setq evil-magit-state 'normal)
:config :config
(setq evil-magit-state 'normal)
(map! :map (magit-mode-map magit-blame-read-only-mode-map) (map! :map (magit-mode-map magit-blame-read-only-mode-map)
doom-leader-key nil)) doom-leader-key nil))

5
modules/ui/doom-modeline/config.el
View file

@ -363,7 +363,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
(concat (format-mode-line mode-name) (concat (format-mode-line mode-name)
(when (stringp mode-line-process) (when (stringp mode-line-process)
mode-line-process) mode-line-process)
(and (featurep 'face-remap) (and (boundp 'text-scale-mode-amount)
(/= text-scale-mode-amount 0) (/= text-scale-mode-amount 0)
(format " (%+d)" text-scale-mode-amount))) (format " (%+d)" text-scale-mode-amount)))
'face (if (active) 'doom-modeline-buffer-major-mode))) 'face (if (active) 'doom-modeline-buffer-major-mode)))
@ -495,8 +495,7 @@ lines are selected, or the NxM dimensions of a block selection."
(format "%dL" lines)) (format "%dL" lines))
((> lines 1) ((> lines 1)
(format "%dC %dL" (- end beg) lines)) (format "%dC %dL" (- end beg) lines))
(t ((format "%dC" (- end beg))))
(format "%dC" (- end beg))))
(when +doom-modeline-enable-word-count (when +doom-modeline-enable-word-count
(format " %dW" (count-words beg end))))) (format " %dW" (count-words beg end)))))
'face 'doom-modeline-highlight)))) 'face 'doom-modeline-highlight))))

6
modules/ui/popup/autoload.el
View file

@ -591,11 +591,11 @@ and may be called only if no window on SIDE exists yet."
;; Initialize `window-side' parameter of new window to SIDE and ;; Initialize `window-side' parameter of new window to SIDE and
;; make that parameter persistent. ;; make that parameter persistent.
(set-window-parameter window 'window-side side) (set-window-parameter window 'window-side side)
(add-to-list 'window-persistent-parameters '(window-side . writable)) (map-put window-persistent-parameters 'window-side 'writable)
;; Install `window-slot' parameter of new window and make that ;; Install `window-slot' parameter of new window and make that
;; parameter persistent. ;; parameter persistent.
(set-window-parameter window 'window-slot slot) (set-window-parameter window 'window-slot slot)
(add-to-list 'window-persistent-parameters '(window-slot . writable)) (map-put window-persistent-parameters 'window-slot 'writable)
;; Auto-adjust height/width of new window unless a size has been ;; Auto-adjust height/width of new window unless a size has been
;; explicitly requested. ;; explicitly requested.
(unless (if left-or-right (unless (if left-or-right
@ -671,7 +671,7 @@ Accepts the same arguments as `display-buffer-in-side-window'. You must set
(lambda (_side) (frame-root-window (selected-frame))))) (lambda (_side) (frame-root-window (selected-frame)))))
(when-let* ((window (window--make-major-side-window buffer side slot alist))) (when-let* ((window (window--make-major-side-window buffer side slot alist)))
(set-window-parameter window 'window-vslot vslot) (set-window-parameter window 'window-vslot vslot)
(add-to-list 'window-persistent-parameters '(window-vslot . writable)) (map-put window-persistent-parameters 'window-vslot 'writable)
window))) window)))
(t (t
;; Scan windows on SIDE. ;; Scan windows on SIDE.