mirror of
https://github.com/doomemacs/doomemacs
synced 2025-09-20 16:11:07 -05:00
PRAISE BE TO THE BYTE COMPILER FOR THY SHARP QUOTES
This commit is contained in:
@@ -53,7 +53,7 @@ the current workspace."
|
||||
(buffer-list)))
|
||||
(project-root (and project-p (doom-project-root t))))
|
||||
(if project-root
|
||||
(funcall (if (eq project-p 'not) 'cl-remove-if 'cl-remove-if-not)
|
||||
(funcall (if (eq project-p 'not) #'cl-remove-if #'cl-remove-if-not)
|
||||
(lambda (b) (projectile-project-buffer-p b project-root))
|
||||
buffers)
|
||||
buffers)))
|
||||
@@ -62,7 +62,7 @@ the current workspace."
|
||||
(defun doom-real-buffers-list (&optional buffer-list)
|
||||
"Get a list of all buffers (in the current workspace OR in BUFFER-LIST) that
|
||||
`doom-real-buffer-p' returns non-nil for."
|
||||
(cl-remove-if-not 'doom-real-buffer-p (or buffer-list (doom-buffer-list))))
|
||||
(cl-remove-if-not #'doom-real-buffer-p (or buffer-list (doom-buffer-list))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-buffers-in-mode (modes &optional buffer-list)
|
||||
@@ -76,19 +76,19 @@ the current workspace."
|
||||
(defun doom-visible-windows (&optional window-list)
|
||||
"Get a list of the visible windows in the current frame (that aren't popups),
|
||||
OR return only the visible windows in WINDOW-LIST."
|
||||
(cl-remove-if 'doom-popup-p (or window-list (window-list))))
|
||||
(cl-remove-if #'doom-popup-p (or window-list (window-list))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-visible-buffers (&optional buffer-list)
|
||||
"Get a list of unburied buffers in the current project and workspace, OR
|
||||
return only the unburied buffers in BUFFER-LIST (a list of BUFFER-OR-NAMEs)."
|
||||
(cl-remove-if-not 'get-buffer-window (or buffer-list (doom-buffer-list))))
|
||||
(cl-remove-if-not #'get-buffer-window (or buffer-list (doom-buffer-list))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-buried-buffers (&optional buffer-list)
|
||||
"Get a list of buried buffers in the current project and workspace, OR return
|
||||
only the buried buffers in BUFFER-LIST (a list of BUFFER-OR-NAMEs)."
|
||||
(cl-remove-if 'get-buffer-window (or buffer-list (doom-buffer-list))))
|
||||
(cl-remove-if #'get-buffer-window (or buffer-list (doom-buffer-list))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-matching-buffers (pattern &optional buffer-list)
|
||||
@@ -109,7 +109,7 @@ buffers. If there's nothing left, switch to `doom-fallback-buffer'. See
|
||||
((= (length buffers) 1)
|
||||
(set-window-buffer nil (car buffers)))
|
||||
(t
|
||||
(let ((move-func (if (> n 0) 'switch-to-next-buffer 'switch-to-prev-buffer)))
|
||||
(let ((move-func (if (> n 0) #'switch-to-next-buffer #'switch-to-prev-buffer)))
|
||||
;; Why this instead of switching straight to the Nth buffer in
|
||||
;; BUFFERS? Because `switch-to-next-buffer' and
|
||||
;; `switch-to-prev-buffer' properly update buffer list order.
|
||||
@@ -202,7 +202,7 @@ See `doom-real-buffer-p' for what 'real' means."
|
||||
"Kill all buffers (in current workspace OR in BUFFER-LIST) that match the
|
||||
regex PATTERN. Returns the number of killed buffers."
|
||||
(let ((buffers (doom-matching-buffers pattern buffer-list)))
|
||||
(mapc 'doom-kill-buffer buffers)
|
||||
(mapc #'doom-kill-buffer buffers)
|
||||
(length buffers)))
|
||||
|
||||
;;;###autoload
|
||||
@@ -218,7 +218,7 @@ regex PATTERN. Returns the number of killed buffers."
|
||||
belong to the current project in this workspace."
|
||||
(interactive "P")
|
||||
(let ((buffers (doom-buffer-list project-p)))
|
||||
(mapc 'doom-kill-buffer-and-windows buffers)
|
||||
(mapc #'doom-kill-buffer-and-windows buffers)
|
||||
(when (called-interactively-p 'interactive)
|
||||
(message "Killed %s buffers" (length buffers)))))
|
||||
|
||||
@@ -250,7 +250,7 @@ exclude buffers that aren't part of the current project."
|
||||
"Clean up buried and process buffers in the current workspace."
|
||||
(interactive "P")
|
||||
(let ((buffers (doom-buried-buffers (if all-p (buffer-list)))))
|
||||
(mapc 'kill-buffer buffers)
|
||||
(mapc #'kill-buffer buffers)
|
||||
(setq n (+ (doom-kill-process-buffers) (length buffers)))
|
||||
(when (called-interactively-p 'interactive)
|
||||
(message "Cleaned up %s buffers" n))))
|
||||
|
@@ -37,7 +37,7 @@ If already there, do nothing."
|
||||
(skip-chars-backward " " bol)
|
||||
(point))))
|
||||
eol))
|
||||
(goto-char-fn (if (featurep 'evil) 'evil-goto-char 'goto-char)))
|
||||
(goto-char-fn (if (featurep 'evil) #'evil-goto-char #'goto-char)))
|
||||
(if (= eoc point)
|
||||
(funcall goto-char-fn eol)
|
||||
(unless (= eol point)
|
||||
@@ -64,7 +64,7 @@ If already there, do nothing."
|
||||
"Dedents the current line."
|
||||
(interactive)
|
||||
(if indent-tabs-mode
|
||||
(call-interactively 'backward-delete-char)
|
||||
(call-interactively #'backward-delete-char)
|
||||
(save-excursion
|
||||
(unless (looking-back "^[\s\t]*" (line-beginning-position))
|
||||
(doom--goto-first-non-blank))
|
||||
@@ -78,7 +78,7 @@ If already there, do nothing."
|
||||
afterwards, kill line to column 1."
|
||||
(interactive)
|
||||
(let ((empty-line (save-excursion (beginning-of-line) (looking-at-p "[ \t]*$"))))
|
||||
(funcall (if (featurep 'evil) 'evil-delete 'delete-region)
|
||||
(funcall (if (featurep 'evil) #'evil-delete #'delete-region)
|
||||
(point-at-bol) (point))
|
||||
(unless empty-line
|
||||
(indent-according-to-mode))))
|
||||
@@ -113,9 +113,9 @@ possible, or just one char if that's not possible."
|
||||
(if (string-match "\\w*\\(\\s-+\\)$"
|
||||
(buffer-substring-no-properties (max (point-min) (- p movement)) p))
|
||||
(delete-char (- 0 (- (match-end 1) (match-beginning 1))))
|
||||
(call-interactively 'delete-backward-char)))))
|
||||
(call-interactively #'delete-backward-char)))))
|
||||
;; Otherwise do a regular delete
|
||||
(t (call-interactively 'delete-backward-char)))))
|
||||
(t (call-interactively #'delete-backward-char)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/inflate-space-maybe ()
|
||||
@@ -123,9 +123,9 @@ possible, or just one char if that's not possible."
|
||||
space on either side of the point if so."
|
||||
(interactive)
|
||||
(if (doom--surrounded-p)
|
||||
(progn (call-interactively 'self-insert-command)
|
||||
(save-excursion (call-interactively 'self-insert-command)))
|
||||
(call-interactively 'self-insert-command)))
|
||||
(progn (call-interactively #'self-insert-command)
|
||||
(save-excursion (call-interactively #'self-insert-command)))
|
||||
(call-interactively #'self-insert-command)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/deflate-space-maybe ()
|
||||
@@ -137,12 +137,12 @@ spaces on either side of the point if so. Resorts to
|
||||
(if (doom--surrounded-p)
|
||||
(let ((whitespace-match (match-string 1)))
|
||||
(cond ((not whitespace-match)
|
||||
(call-interactively 'delete-backward-char))
|
||||
(call-interactively #'delete-backward-char))
|
||||
((string-match "\n" whitespace-match)
|
||||
(funcall (if (featurep 'evil) 'evil-delete 'delete-region)
|
||||
(funcall (if (featurep 'evil) #'evil-delete #'delete-region)
|
||||
(point-at-bol) (point))
|
||||
(call-interactively 'delete-backward-char)
|
||||
(save-excursion (call-interactively 'delete-char)))
|
||||
(call-interactively #'delete-backward-char)
|
||||
(save-excursion (call-interactively #'delete-char)))
|
||||
(t (just-one-space 0))))
|
||||
(doom/backward-delete-whitespace-to-column))))
|
||||
|
||||
@@ -155,7 +155,7 @@ from a commented line."
|
||||
(newline))
|
||||
((sp-point-in-comment)
|
||||
(cond ((memq major-mode '(js2-mode rjsx-mode))
|
||||
(call-interactively 'js2-line-break))
|
||||
(call-interactively #'js2-line-break))
|
||||
((memq major-mode '(java-mode php-mode))
|
||||
(c-indent-new-comment-line))
|
||||
((memq major-mode '(c-mode c++-mode objc-mode css-mode scss-mode js2-mode))
|
||||
|
@@ -44,7 +44,7 @@ interactive session."
|
||||
(lambda (rule)
|
||||
`(,(car rule)
|
||||
(lambda (message &rest args)
|
||||
(apply 'doom-ansi-apply ',(car rule) message args))))
|
||||
(apply #'doom-ansi-apply ',(car rule) message args))))
|
||||
(append doom-message-fg doom-message-bg doom-message-fx))
|
||||
(color (symbol-function 'doom-ansi-apply)))
|
||||
(format ,message ,@args)))
|
||||
@@ -73,6 +73,6 @@ interactive session."
|
||||
(assq code doom-message-fx))))
|
||||
(format "\e[%dm%s\e[%dm"
|
||||
(cdr rule)
|
||||
(apply 'format format args)
|
||||
(apply #'format format args)
|
||||
0)))
|
||||
|
||||
|
@@ -76,14 +76,14 @@ Be careful not to use it in a loop."
|
||||
(or (assq pkgsym doom-packages)
|
||||
(list (car (assq pkgsym package-alist)))))
|
||||
(cl-delete-duplicates
|
||||
(append doom-core-packages (mapcar 'car doom-packages))))))
|
||||
(append doom-core-packages (mapcar #'car doom-packages))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-get-depending-on (name)
|
||||
"Return a list of packages that depend on the package named NAME."
|
||||
(doom-initialize)
|
||||
(when-let (desc (cadr (assq name package-alist)))
|
||||
(mapcar 'package-desc-name (package--used-elsewhere-p desc nil t))))
|
||||
(mapcar #'package-desc-name (package--used-elsewhere-p desc nil t))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-get-dependencies-for (name &optional only)
|
||||
@@ -97,7 +97,7 @@ Be careful not to use it in a loop."
|
||||
containing (PACKAGE-SYMBOL OLD-VERSION-LIST NEW-VERSION-LIST).
|
||||
|
||||
Used by `doom/packages-update'."
|
||||
(delq nil (mapcar 'doom-package-outdated-p (mapcar 'car (doom-get-packages)))))
|
||||
(delq nil (mapcar #'doom-package-outdated-p (mapcar #'car (doom-get-packages)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-get-orphaned-packages ()
|
||||
@@ -107,7 +107,7 @@ depended on.
|
||||
Used by `doom/packages-autoremove'."
|
||||
(doom-initialize-packages t)
|
||||
(let ((package-selected-packages
|
||||
(append (mapcar 'car doom-packages) doom-core-packages)))
|
||||
(append (mapcar #'car doom-packages) doom-core-packages)))
|
||||
(cl-set-difference (package--removable-packages)
|
||||
doom-protected-packages)))
|
||||
|
||||
@@ -158,7 +158,7 @@ example; the package name can be omitted)."
|
||||
(recipe (plist-get plist :recipe)))
|
||||
(cond (recipe (quelpa recipe))
|
||||
(t (package-install name))))
|
||||
(cl-pushnew (cons name plist) doom-packages :test 'eq :key 'car)
|
||||
(cl-pushnew (cons name plist) doom-packages :test #'eq :key #'car)
|
||||
(package-installed-p name))
|
||||
|
||||
(defun doom-update-package (name)
|
||||
@@ -219,7 +219,7 @@ appropriate."
|
||||
(if (plist-get (cdr pkg) :recipe)
|
||||
"QUELPA"
|
||||
"ELPA")))
|
||||
(sort (cl-copy-list packages) 'doom--sort-alpha)
|
||||
(sort (cl-copy-list packages) #'doom--sort-alpha)
|
||||
"\n")))))
|
||||
(message! (yellow "Aborted!")))
|
||||
|
||||
@@ -249,7 +249,7 @@ appropriate."
|
||||
(defun doom/packages-update ()
|
||||
"Interactive command for updating packages."
|
||||
(interactive)
|
||||
(let ((packages (sort (doom-get-outdated-packages) 'doom--sort-alpha)))
|
||||
(let ((packages (sort (doom-get-outdated-packages) #'doom--sort-alpha)))
|
||||
(cond ((not packages)
|
||||
(message! (green "Everything is up-to-date")))
|
||||
|
||||
@@ -299,7 +299,7 @@ appropriate."
|
||||
(format "%s packages will be deleted:\n\n%s\n\nProceed?"
|
||||
(length packages)
|
||||
(mapconcat (lambda (sym) (format "+ %s" (symbol-name sym)))
|
||||
(sort (cl-copy-list packages) 'string-lessp)
|
||||
(sort (cl-copy-list packages) #'string-lessp)
|
||||
"\n")))))
|
||||
(message! (yellow "Aborted!")))
|
||||
|
||||
@@ -319,7 +319,7 @@ appropriate."
|
||||
(doom/reload)))))
|
||||
|
||||
;;;###autoload
|
||||
(defalias 'doom/install-package 'package-install)
|
||||
(defalias 'doom/install-package #'package-install)
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/delete-package (package)
|
||||
@@ -332,7 +332,7 @@ Use this interactively. Use `doom-delete-package' for direct calls."
|
||||
"Delete package: "
|
||||
(delq nil
|
||||
(mapcar (lambda (p) (unless (package-built-in-p p) p))
|
||||
(mapcar 'car package-alist)))
|
||||
(mapcar #'car package-alist)))
|
||||
nil t))))
|
||||
(if (package-installed-p package)
|
||||
(if (y-or-n-p (format "%s will be deleted. Confirm?" package))
|
||||
@@ -352,7 +352,7 @@ calls."
|
||||
(let ((packages (doom-get-outdated-packages)))
|
||||
(list
|
||||
(if packages
|
||||
(completing-read "Update package: " (mapcar 'symbol-name (mapcar 'car packages)))
|
||||
(completing-read "Update package: " (mapcar #'symbol-name (mapcar #'car packages)))
|
||||
(user-error "All packages are up-to-date")))))
|
||||
(if-let (desc (doom-package-outdated-p (intern package)))
|
||||
(if (y-or-n-p (format "%s will be updated from %s to %s. Update?"
|
||||
|
@@ -35,7 +35,7 @@ possible rules."
|
||||
;;;###autoload
|
||||
(defun doom-popup-windows ()
|
||||
"Get a list of open poups."
|
||||
(cl-remove-if-not 'doom-popup-p (window-list)))
|
||||
(cl-remove-if-not #'doom-popup-p (window-list)))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom/popup-restore ()
|
||||
@@ -54,7 +54,7 @@ Returns t if popups were restored, nil otherwise."
|
||||
(rules (plist-get (cdr spec) :rules)))
|
||||
(when (and (not buffer) path)
|
||||
(setq buffer (find-file-noselect path t)))
|
||||
(when (and buffer (apply 'doom-popup-buffer buffer rules) (not any-p))
|
||||
(when (and buffer (apply #'doom-popup-buffer buffer rules) (not any-p))
|
||||
(setq any-p t))))
|
||||
(when any-p
|
||||
(setq doom-popup-history '()))
|
||||
@@ -90,7 +90,7 @@ only close popups that have an :autoclose property in their rule (see
|
||||
(interactive)
|
||||
(let ((orig-win (selected-window)))
|
||||
(when-let (popups (doom-popup-windows))
|
||||
(setq doom-popup-history (mapcar 'doom--popup-data popups))
|
||||
(setq doom-popup-history (mapcar #'doom--popup-data popups))
|
||||
(let (doom-popup-remember-history)
|
||||
(dolist (window popups)
|
||||
(let ((rules (window-parameter window 'popup)))
|
||||
@@ -107,8 +107,8 @@ only close popups that have an :autoclose property in their rule (see
|
||||
(let ((window (selected-window)))
|
||||
(if (window-parameter window :noesc)
|
||||
(call-interactively (if (featurep 'evil)
|
||||
'evil-force-normal-state
|
||||
'keyboard-escape-quit))
|
||||
#'evil-force-normal-state
|
||||
#'keyboard-escape-quit))
|
||||
(delete-window window))))
|
||||
|
||||
;;;###autoload
|
||||
|
@@ -22,13 +22,13 @@
|
||||
"Runs a shell command and prints any output to the DOOM buffer."
|
||||
(let ((cmd-list (split-string command " ")))
|
||||
(cond ((equal (car cmd-list) "sudo")
|
||||
(apply 'doom-sudo (s-join " " (cdr cmd-list)) args))
|
||||
(apply #'doom-sudo (string-join (cdr cmd-list) " ") args))
|
||||
((let ((bin (executable-find "npm")))
|
||||
(and (file-exists-p bin)
|
||||
(not (file-writable-p bin))))
|
||||
(apply 'doom-sudo (s-join " " cmd-list) args))
|
||||
(apply #'doom-sudo (string-join cmd-list " ") args))
|
||||
(t
|
||||
(princ (shell-command-to-string (apply 'format command args)))))))
|
||||
(princ (shell-command-to-string (apply #'format command args)))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-sudo (command &rest args)
|
||||
@@ -37,7 +37,7 @@
|
||||
(with-current-buffer (get-buffer-create "*doom-sudo*")
|
||||
(unless (string-prefix-p "/sudo::/" default-directory)
|
||||
(cd "/sudo::/"))
|
||||
(princ (shell-command-to-string (apply 'format command args))))))
|
||||
(princ (shell-command-to-string (apply #'format command args))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun doom-fetch (fetcher location dest)
|
||||
|
@@ -21,7 +21,7 @@
|
||||
(interactive)
|
||||
(let ((theme (car-safe custom-enabled-themes)))
|
||||
(when theme
|
||||
(mapc 'disable-theme custom-enabled-themes))
|
||||
(mapc #'disable-theme custom-enabled-themes))
|
||||
(load-theme theme t)))
|
||||
|
||||
;;;###autoload
|
||||
|
Reference in New Issue
Block a user