Minor edits.

This commit is contained in:
Derek Taylor
2020-11-05 13:27:52 -06:00
parent 8fbacc6392
commit 35112d3f8c
170 changed files with 1304 additions and 756 deletions

View File

@@ -14,7 +14,7 @@
"Emacs will remember that."
"Emacs, Emacs never changes."
"Hey! Hey, M-x listen!"
"I'm the man who's going to burn your house down! With lemons!"
"I'm the man who's going to burn your house down! With the lemons!"
"It's not like I'll miss you or anything, b-baka!"
"Okay, look. We've both said a lot of things you're going to regret..."
"Wake up, Mr. Stallman. Wake up and smell the ashes."

View File

@@ -62,7 +62,7 @@
;; HACK The fringe cannot have a buffer-local remapping on Emacs <= 26, so
;; we jump through hoops to reset it (globally) whenever it is likely
;; that the fringe will have lost its background color.
(add-hook! '(doom-load-theme-hook doom-reload-hook) :append
(add-hook! '(doom-load-theme-hook doom-after-reload-hook) :append
#'solaire-mode-reset)
;; fringe can become unstyled when deleting or focusing frames

View File

@@ -1,5 +1,5 @@
;; -*- no-byte-compile: t; -*-
;;; ui/doom/packages.el
(package! doom-themes :pin "24023de3c80c9f3afc3d012762d1ef0f8dbd326e")
(package! solaire-mode :pin "cd63b675140232f399e7733d7ce95a0b931b1058")
(package! doom-themes :pin "5c12834e724869993e1fa62cb3be29fda994a0d6")
(package! solaire-mode :pin "c697925f7e03819a4046a233f6ab31664aca9d6a")

View File

@@ -1,9 +1,15 @@
;;; ui/fill-column/autoload.el -*- lexical-binding: t; -*-
;; DEPRECATED Replaced by `display-fill-column-indicator-mode' in Emacs 27+
;;;###autoload
(defalias '+fill-column/toggle
(if (fboundp 'display-fill-column-indicator-mode)
#'display-fill-column-indicator-mode ; Emacs 27 only
(autoload 'hl-fill-column-mode "hl-fill-column" nil t)
#'hl-fill-column-mode))
;;;###autoload (autoload 'hl-fill-column-mode "hl-fill-column" nil t)
;;;###autoload
(defalias '+fill-column-enable-h #'+fill-column/toggle)
;;;###autoload
(add-hook! '(text-mode-hook prog-mode-hook conf-mode-hook)
#'hl-fill-column-mode)
#'+fill-column-enable-h)

View File

@@ -1,4 +1,6 @@
;; -*- no-byte-compile: t; -*-
;;; ui/fill-column/packages.el
(package! hl-fill-column :pin "5782a91ba0182c4e562fa0db6379ff9dd472856b")
;; `hl-fill-column' is only used on Emacs versions before 27
(unless (fboundp 'display-fill-column-indicator-mode)
(package! hl-fill-column :pin "5782a91ba0182c4e562fa0db6379ff9dd472856b"))

View File

@@ -23,7 +23,7 @@ major-modes.
This module provides no flags
** Plugins
+ [[https://github.com/tarius/hl-todo][hl-todo]]
+ [[https://github.com/tarsius/hl-todo][hl-todo]]
* Prerequisites
This module has no prerequisites

View File

@@ -5,7 +5,7 @@
:init
(setq highlight-indent-guides-method 'character)
:config
(defun +indent-guides-init-faces-h ()
(defun +indent-guides-init-faces-h (&rest _)
(when (display-graphic-p)
(highlight-indent-guides-auto-set-faces)))
@@ -13,10 +13,9 @@
;; but is unable to do so properly in terminal Emacs, where it only has
;; access to 256 colors. So if the user uses a daemon we must wait for
;; the first graphical frame to be available to do.
(add-hook (if (daemonp)
'server-after-make-frame-hook
'doom-load-theme-hook)
#'+indent-guides-init-faces-h)
(add-hook 'doom-load-theme-hook #'+indent-guides-init-faces-h)
(when doom-init-theme-p
(+indent-guides-init-faces-h))
;; `highlight-indent-guides' breaks when `org-indent-mode' is active
(add-hook! 'org-mode-local-vars-hook

View File

@@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; ui/indent-guides/packages.el
(package! highlight-indent-guides :pin "a4f771418e4eed1f3f7879a43af28cf97747d41c")
(package! highlight-indent-guides :pin "cf352c85cd15dd18aa096ba9d9ab9b7ab493e8f6")

View File

@@ -32,6 +32,13 @@
(when (daemonp)
(setq doom-modeline-icon t))
:config
;; HACK Fix #4102 due to empty all-the-icons return value (caused by
;; `doom--disable-all-the-icons-in-tty-a' advice) in tty daemon frames.
(defadvice! +modeline-disable-icon-in-daemon-a (orig-fn &rest args)
:around #'doom-modeline-propertize-icon
(when (display-graphic-p)
(apply orig-fn args)))
;; Fix an issue where these two variables aren't defined in TTY Emacs on MacOS
(defvar mouse-wheel-down-event nil)
(defvar mouse-wheel-up-event nil)

View File

@@ -2,7 +2,7 @@
;;; ui/modeline/packages.el
(unless (featurep! +light)
(package! doom-modeline :pin "ffbaaee832f1c97ff608bc4959b408997d959b7d"))
(package! doom-modeline :pin "538017a399cb7b499853bdaf50928ca8b270693d"))
(package! anzu :pin "7b8688c84d6032300d0c415182c7c1ad6cb7f819")
(when (featurep! :editor evil)
(package! evil-anzu :pin "d3f6ed4773b48767bd5f4708c7f083336a8a8a86"))

View File

@@ -161,7 +161,8 @@ prevent the popup(s) from messing up the UI (or vice versa)."
("^\\*Backtrace" :vslot 99 :size 0.4 :quit nil)
("^\\*CPU-Profiler-Report " :side bottom :vslot 100 :slot 1 :height 0.4 :width 0.5 :quit nil)
("^\\*Memory-Profiler-Report " :side bottom :vslot 100 :slot 2 :height 0.4 :width 0.5 :quit nil)
("^\\*\\(?:Proced\\|timer-list\\|Process List\\|Abbrevs\\|Output\\|Occur\\|unsent mail\\)\\*" :ignore t)))
("^\\*Process List\\*" :side bottom :vslot 101 :size 0.25 :select t :quit t)
("^\\*\\(?:Proced\\|timer-list\\|Abbrevs\\|Output\\|Occur\\|unsent mail\\)\\*" :ignore t)))
(add-hook 'doom-init-ui-hook #'+popup-mode 'append)

View File

@@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; ui/tabs/packages.el
(package! centaur-tabs :pin "7e0332b138f836b9d0b6d2134310f53369598cfd")
(package! centaur-tabs :pin "5453317b6b9f68bfbd934eee3b883207bfa331e0")

View File

@@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*-
;;; ui/treemacs/packages.el
(package! treemacs :pin "027e03b6fac5c0a870440d27c35d53bbe0215d81")
(package! treemacs :pin "6c00fe74079a057ad4efc772eab9d73e4f09fa10")
;; These packages have no :pin because they're in the same repo
(when (featurep! :editor evil +everywhere)
(package! treemacs-evil))

View File

@@ -2,7 +2,7 @@
;;; ui/window-select/packages.el
(if (featurep! +switch-window)
(package! switch-window :pin "8710f6304d843365fb59b6efe7e1f729d14e557c")
(package! switch-window :pin "277706b863c05b3931925ee9dae8970d605bf061")
(package! ace-window :pin "c7cb315c14e36fded5ac4096e158497ae974bec9"))
(when (featurep! +numbers)

View File

@@ -294,7 +294,7 @@ workspace to delete."
(defun +workspace/new (&optional name clone-p)
"Create a new workspace named NAME. If CLONE-P is non-nil, clone the current
workspace, otherwise the new workspace is blank."
(interactive "iP")
(interactive (list nil current-prefix-arg))
(unless name
(setq name (format "#%s" (+workspace--generate-id))))
(condition-case e

View File

@@ -45,9 +45,7 @@ stored in `persp-save-dir'.")
;; Remove default buffer predicate so persp-mode can put in its own
(delq! 'buffer-predicate default-frame-alist 'assq)
(require 'persp-mode)
(if (daemonp)
(add-hook 'after-make-frame-functions #'persp-mode-start-and-remove-from-make-frame-hook)
(persp-mode +1)))))
(persp-mode +1))))
:config
(setq persp-autokill-buffer-on-remove 'kill-weak
persp-reset-windows-on-nil-window-conf nil
@@ -144,6 +142,16 @@ stored in `persp-save-dir'.")
(cadr prev-buffers)
head)))
;; HACK Fixes #4196, #1525: selecting deleted buffer error when quitting Emacs
;; or on some buffer listing ops.
(defadvice! +workspaces-remove-dead-buffers-a (persp)
:before #'persp-buffers-to-savelist
(when (perspective-p persp)
;; HACK Can't use `persp-buffers' because of a race condition with its gv
;; getter/setter not being defined in time.
(setf (aref persp 2)
(cl-delete-if-not #'persp-get-buffer-or-null (persp-buffers persp)))))
;; Delete the current workspace if closing the last open window
(define-key! persp-mode-map
[remap delete-window] #'+workspace/close-window-or-workspace
@@ -238,8 +246,9 @@ stored in `persp-save-dir'.")
(defun +workspaces-reload-indirect-buffers-h (&rest _)
(dolist (ibc +workspaces--indirect-buffers-to-restore)
(cl-destructuring-bind (buffer-name . base-buffer-name) ibc
(when (buffer-live-p (get-buffer base-buffer-name))
(when (get-buffer buffer-name)
(setq buffer-name (generate-new-buffer-name buffer-name)))
(make-indirect-buffer bb buffer-name t))))
(let ((base-buffer (get-buffer base-buffer-name)))
(when (buffer-live-p base-buffer)
(when (get-buffer buffer-name)
(setq buffer-name (generate-new-buffer-name buffer-name)))
(make-indirect-buffer base-buffer buffer-name t)))))
(setq +workspaces--indirect-buffers-to-restore nil))))

View File

@@ -1,4 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; ui/workspaces/packages.el
(package! persp-mode :pin "14325c11f7a347717d7c3780f29b24a38c68fbfc")
(package! persp-mode :pin "c132efe3094ce1368f54195028b29b82c65a64dc")