Remove doom//x naming convention

This naming convention was meant to be for batch commands, but it grew
to include "commands that were helpful with managing Doom", but many of
these commands shouldn't be interactive in the first place!
This commit is contained in:
Henrik Lissner 2018-06-17 21:35:58 +02:00
parent 648f4bb585
commit 03022d09f9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
11 changed files with 85 additions and 97 deletions

View file

@ -217,12 +217,16 @@ whose car is the list of faces and cadr is the list of overlay faces."
(list faces overlays))))))
;;;###autoload
(defun doom//open-manual ()
(defalias 'doom/help 'doom/open-manual)
;;;###autoload
(defun doom/open-manual ()
"TODO"
(interactive)
(find-file (expand-file-name "index.org" doom-docs-dir)))
;;;###autoload
(defun doom//reload (&optional force-p)
(defun doom/reload (&optional force-p)
"Reloads your config. This is experimental!
If called from a noninteractive session, this will try to communicate with a
@ -236,15 +240,16 @@ init.el and config.el. Then runs `doom-reload-hook'."
(cond ((and noninteractive (not (daemonp)))
(require 'server)
(if (not (server-running-p))
(doom//reload-autoloads force-p)
(doom-reload-autoloads force-p)
(print! "Reloading active Emacs session...")
(print!
(bold "%%s")
(if (server-eval-at server-name '(doom//reload))
(if (server-eval-at server-name '(doom/reload))
(green "Done!")
(red "There were issues!")))))
((let ((load-prefer-newer t))
(doom//reload-autoloads force-p)
((progn
(require 'core-packages)
(doom-reload-autoloads force-p)
(doom-initialize 'force)
(with-demoted-errors "PRIVATE CONFIG ERROR: %s"
(doom-initialize-modules 'force))

View file

@ -230,7 +230,7 @@ containing (PACKAGE-SYMBOL OLD-VERSION-LIST NEW-VERSION-LIST).
If INCLUDE-FROZEN-P is non-nil, check frozen packages as well.
Used by `doom//packages-update'."
Used by `doom-packages-update'."
(doom-initialize-packages t)
(doom-refresh-packages-maybe doom-debug-mode)
(require 'async)
@ -279,7 +279,7 @@ Used by `doom//packages-update'."
"Return a list of symbols representing packages that are no longer needed or
depended on.
Used by `doom//packages-autoremove'."
Used by `doom-packages-autoremove'."
(let ((package-selected-packages
(mapcar #'car (doom-get-packages :ignored nil :disabled nil))))
(append (package--removable-packages)
@ -298,7 +298,7 @@ the package symbol, and whose CDR is a plist taken from that package's
If INCLUDE-IGNORED-P is non-nil, includes missing packages that are ignored,
i.e. they have an :ignore property.
Used by `doom//packages-install'."
Used by `doom-packages-install'."
(doom-initialize-packages)
(cl-loop for (name . plist)
in (doom-get-packages :ignored (if include-ignored-p 'any) :disabled nil)
@ -450,9 +450,8 @@ calls."
;;
;;;###autoload
(defun doom//packages-install (&optional auto-accept-p)
(defun doom-packages-install (&optional auto-accept-p)
"Interactive command for installing missing packages."
(interactive "P")
(print! "Looking for packages to install...")
(let ((packages (reverse (doom-get-missing-packages))))
(cond ((not packages)
@ -511,9 +510,8 @@ calls."
success)))))
;;;###autoload
(defun doom//packages-update (&optional auto-accept-p)
(defun doom-packages-update (&optional auto-accept-p)
"Interactive command for updating packages."
(interactive "P")
(print! "Looking for outdated packages...")
(let ((packages (cl-sort (cl-copy-list (doom-get-outdated-packages)) #'string-lessp
:key #'car)))
@ -555,9 +553,8 @@ calls."
success)))))
;;;###autoload
(defun doom//packages-autoremove (&optional auto-accept-p)
(defun doom-packages-autoremove (&optional auto-accept-p)
"Interactive command for auto-removing orphaned packages."
(interactive "P")
(print! "Looking for orphaned packages...")
(let ((packages (doom-get-orphaned-packages)))
(cond ((not packages)
@ -609,7 +606,8 @@ calls."
;; Replace with Doom variants
;;;###autoload
(advice-add #'package-autoremove :override #'doom//packages-autoremove)
;;;###autoload
(advice-add #'package-install-selected-packages :override #'doom//packages-install)
(advice-add #'package-autoremove :override (λ! (doom-packages-autoremove current-prefix-arg)))
;;;###autoload
(advice-add #'package-install-selected-packages :override (λ! (doom-packages-install current-prefix-arg)))

View file

@ -95,7 +95,7 @@ presentations."
(set-frame-font doom-font t t)))
;;;###autoload
(defun doom//reload-theme ()
(defun doom/reload-theme ()
"Reset the current color theme and fonts."
(interactive)
(let ((theme (or (car-safe custom-enabled-themes) doom-theme)))