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

Insult byte-compiler's mom

Browse source 
Yeah, that shut him up.
This commit is contained in:
Henrik Lissner 2019-09-20 23:10:53 -04:00
parent 5f7add8360
commit e10cd8cf2e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
14 changed files with 126 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

135
core/autoload/help.el
View file

@ -147,7 +147,7 @@ selection of all minor-modes, active or not."
(list (or (+org-get-property "TITLE")
(file-relative-name buffer-file-name))))
path
(list (replace-regexp-in-string org-any-link-re "\\4" text)))
(list (replace-regexp-in-string org-link-any-re "\\4" text)))
" > ")
tags)
" ")
@ -408,78 +408,77 @@ If prefix arg is present, refresh the cache."
(if guess (symbol-name guess))))))))
(require 'core-packages)
(doom-initialize-packages)
(let ((straight-packages (mapcar #'intern (hash-table-keys straight--build-cache))))
(if (or (package-desc-p package)
(and (symbolp package)
(or (assq package package-alist)
(assq package package--builtins))))
(describe-package package)
(help-setup-xref (list #'doom/help-packages package)
(called-interactively-p 'interactive))
(with-help-window (help-buffer)))
(save-excursion
(with-current-buffer (help-buffer)
(let ((inhibit-read-only t)
(indent (make-string 13 ? )))
(goto-char (point-max))
(if (re-search-forward "^ *Status: " nil t)
(progn
(end-of-line)
(insert "\n"))
(re-search-forward "\n\n" nil t))
(if (or (package-desc-p package)
(and (symbolp package)
(or (assq package package-alist)
(assq package package--builtins))))
(describe-package package)
(help-setup-xref (list #'doom/help-packages package)
(called-interactively-p 'interactive))
(with-help-window (help-buffer)))
(save-excursion
(with-current-buffer (help-buffer)
(let ((inhibit-read-only t)
(indent (make-string 13 ? )))
(goto-char (point-max))
(if (re-search-forward "^ *Status: " nil t)
(progn
(end-of-line)
(insert "\n"))
(re-search-forward "\n\n" nil t))
(package--print-help-section "Package")
(insert (symbol-name package) "\n")
(package--print-help-section "Package")
(insert (symbol-name package) "\n")
(package--print-help-section "Source")
(insert (or (pcase (doom-package-backend package)
(`straight
(format! "Straight (%s)\n%s"
(let ((default-directory (straight--build-dir (symbol-name package))))
(string-trim
(shell-command-to-string "git log -1 --format=\"%D %h %ci\"")))
(indent
13 (string-trim
(pp-to-string
(doom-package-build-recipe package))))))
(`elpa
(format "[M]ELPA %s" (doom--package-url package)))
(`builtin "Built-in")
(_ (abbreviate-file-name (symbol-file package))))
"unknown")
"\n")
(package--print-help-section "Source")
(insert (or (pcase (doom-package-backend package)
(`straight
(format! "Straight (%s)\n%s"
(let ((default-directory (straight--build-dir (symbol-name package))))
(string-trim
(shell-command-to-string "git log -1 --format=\"%D %h %ci\"")))
(indent
13 (string-trim
(pp-to-string
(doom-package-build-recipe package))))))
(`elpa
(format "[M]ELPA %s" (doom--package-url package)))
(`builtin "Built-in")
(_ (abbreviate-file-name (symbol-file package))))
"unknown")
"\n")
(when (gethash (symbol-name package) straight--build-cache)
(package--print-help-section "Modules")
(insert "Declared by the following Doom modules:\n")
(dolist (m (doom-package-get package :modules))
(insert indent)
(doom--help-package-insert-button
(format "%s %s" (car m) (or (cdr m) ""))
(pcase (car m)
(:core doom-core-dir)
(:private doom-private-dir)
(category (doom-module-path category (cdr m)))))
(insert "\n")))
(when (gethash (symbol-name package) straight--build-cache)
(package--print-help-section "Modules")
(insert "Declared by the following Doom modules:\n")
(dolist (m (doom-package-get package :modules))
(insert indent)
(doom--help-package-insert-button
(format "%s %s" (car m) (or (cdr m) ""))
(pcase (car m)
(:core doom-core-dir)
(:private doom-private-dir)
(category (doom-module-path category (cdr m)))))
(insert "\n")))
(package--print-help-section "Configs")
(insert "This package is configured in the following locations:")
(dolist (location (doom--help-package-configs package))
(insert "\n" indent)
(insert-text-button
location
'face 'link
'follow-link t
'action
`(lambda (_)
(cl-destructuring-bind (file line _match)
,(split-string location ":")
(find-file (expand-file-name file doom-emacs-dir))
(goto-char (point-min))
(forward-line (1- line))
(recenter)))))
(package--print-help-section "Configs")
(insert "This package is configured in the following locations:")
(dolist (location (doom--help-package-configs package))
(insert "\n" indent)
(insert-text-button
location
'face 'link
'follow-link t
'action
`(lambda (_)
(cl-destructuring-bind (file line _match)
,(split-string location ":")
(find-file (expand-file-name file doom-emacs-dir))
(goto-char (point-min))
(forward-line (1- line))
(recenter)))))
(insert "\n\n"))))))
(insert "\n\n")))))
(defvar doom--package-cache nil)
(defun doom--package-list ()

2
modules/completion/ivy/autoload/ivy.el
View file

@ -214,7 +214,7 @@ If ARG (universal argument), open selection in other-window."
(defun +ivy--tasks-open-action (x)
"Jump to the file and line of the current task."
(cl-destructuring-bind (label type file line) x
(cl-destructuring-bind (_label type file line) x
(with-ivy-window
(find-file (expand-file-name file (doom-project-root)))
(goto-char (point-min))

5
modules/completion/ivy/config.el
View file

@ -62,8 +62,6 @@ immediately runs it on the current candidate (ending the ivy session)."
projectile-completion-system 'ivy
;; Don't use ^ as initial input
ivy-initial-inputs-alist nil
;; highlight til EOL
ivy-format-function #'ivy-format-function-line
;; disable magic slash on non-match
ivy-magic-slash-non-match-action nil
;; don't show recent files in switch-buffer
@ -75,6 +73,9 @@ immediately runs it on the current candidate (ending the ivy session)."
;; enable ability to select prompt (alternative to `ivy-immediate-done')
ivy-use-selectable-prompt t)
(setf (alist-get 't ivy-format-functions-alist)
#'ivy-format-function-line)
;; REVIEW Move this somewhere else and perhaps generalize this so both
;; ivy/helm users can enjoy it.
(defadvice! +ivy--counsel-file-jump-use-fd-rg-a (args)

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

@ -283,11 +283,11 @@ If prefix ARG is set, prompt for a known project to search from."
((rgrep (regexp-quote symbol))))))
;;;###autoload
(defun +default/search-notes-for-symbol-at-point (&optional arg symbol)
(defun +default/search-notes-for-symbol-at-point (&optional symbol)
"Conduct a text search in the current project for symbol at point. If prefix
ARG is set, prompt for a known project to search from."
(interactive
(list current-prefix-arg (thing-at-point 'symbol t)))
(list (thing-at-point 'symbol t)))
(require 'org)
(let ((default-directory org-directory))
(+default/search-project-for-symbol-at-point

4
modules/editor/evil/autoload/evil.el
View file

@ -200,13 +200,13 @@ See `+evil/next-preproc-directive' for details."
(dotimes (_ (abs count))
(cond ((> count 0)
(while (and (not (eobp)) (sp-point-in-comment))
(next-line))
(forward-line 1))
(unless (comment-search-forward (point-max) 'noerror)
(goto-char orig-pt)
(user-error "No comment after point")))
(t
(while (and (not (bobp)) (sp-point-in-comment))
(previous-line))
(forward-line -1))
(unless (comment-search-backward nil 'noerror)
(goto-char orig-pt)
(user-error "No comment before point")))))))

2
modules/editor/evil/autoload/ex.el
View file

@ -177,7 +177,7 @@ If BANG, search Doom documentation."
'module (list cat mod))))
(module (completing-read "Describe module: " modules nil t query))
(key (get-text-property 0 'module module)))
(doom/help-modules key)))
(doom/help-modules (car key) (cdr key))))
((and (string-match-p "\\(?:SPC\\|[CMsSH]-[^ ]\\|<[^>]+>\\)" query)
(helpful-key (kbd (string-trim query)))))
((apropos query t)))))

16
modules/editor/evil/autoload/unimpaired.el
View file

@ -85,31 +85,31 @@
;;; ]u / [u
;;;###autoload (autoload '+evil:url-encode "editor/evil/autoload/unimpaired" nil t)
(evil-define-operator +evil:url-encode (count &optional beg end type)
(evil-define-operator +evil:url-encode (_count &optional beg end)
"TODO"
(interactive "<c><R>")
(interactive "<c><r>")
(+evil--encode beg end #'url-encode-url))
;;;###autoload (autoload '+evil:url-decode "editor/evil/autoload/unimpaired" nil t)
(evil-define-operator +evil:url-decode (count &optional beg end type)
(evil-define-operator +evil:url-decode (_count &optional beg end)
"TODO"
(interactive "<c><R>")
(interactive "<c><r>")
(+evil--encode beg end #'url-unhex-string))
;;; ]y / [y
;;;###autoload (autoload '+evil:c-string-encode "editor/evil/autoload/unimpaired" nil t)
(evil-define-operator +evil:c-string-encode (count &optional beg end type)
(evil-define-operator +evil:c-string-encode (_count &optional beg end)
"TODO"
(interactive "<c><R>")
(interactive "<c><r>")
(+evil--encode
beg end
(lambda (text)
(replace-regexp-in-string "[\"\\]" (lambda (ch) (concat "\\" ch)) text))))
;;;###autoload (autoload '+evil:c-string-decode "editor/evil/autoload/unimpaired" nil t)
(evil-define-operator +evil:c-string-decode (count &optional beg end type)
(evil-define-operator +evil:c-string-decode (_count &optional beg end)
"TODO"
(interactive "<c><R>")
(interactive "<c><r>")
(+evil--encode
beg end
(lambda (text)

2
modules/editor/snippets/autoload/snippets.el
View file

@ -225,7 +225,7 @@ You will be prompted for a snippet to alias."
"# condition: t}\n"
"# type: command\n"
"# --\n"
"(%alias \"${4:" (or template "uuid") "}\")"))
"(%alias \"${4:" (or template-uuid "uuid") "}\")"))
(when (bound-and-true-p evil-local-mode)
(evil-insert-state)))))

22
modules/lang/org/autoload/contrib-present.el
View file

@ -38,33 +38,37 @@
;;;###autoload
(defun +org-present-detect-slide-h ()
(outline-show-all)
(if (member "title" (org-get-tags-at))
(if (member "title" (org-get-tags))
(text-scale-set 10)
(text-scale-set +org-present-text-scale)))
(defvar cwm-use-vertical-padding)
(defvar cwm-frame-internal-border)
(defvar cwm-left-fringe-ratio)
(defvar cwm-centered-window-width)
;;;###autoload
(defun +org-present-init-org-tree-window-h ()
"Set up the org window for presentation."
(doom/window-maximize-buffer)
(let ((cwm-use-vertical-padding t)
(cwm-frame-internal-border 110)
(cwm-left-fringe-ratio -10)
(cwm-centered-window-width 240)
(arg (if org-tree-slide-mode +1 -1)))
(let ((arg (if org-tree-slide-mode +1 -1)))
(when (fboundp 'centered-window-mode)
(centered-window-mode arg))
(let ((cwm-use-vertical-padding t)
(cwm-frame-internal-border 110)
(cwm-left-fringe-ratio -10)
(cwm-centered-window-width 240))
(centered-window-mode arg)))
(window-divider-mode (* arg -1))
(hide-mode-line-mode arg)
(+org-pretty-mode arg)
(cond (org-tree-slide-mode
(org-indent-mode -1)
(text-scale-set +org-present-text-scale)
(ignore-errors (org-toggle-latex-fragment '(4)))
(ignore-errors (org-latex-preview '(4)))
(set-face-attribute 'org-level-2 nil :height 1.4))
(t
(org-indent-mode +1)
(text-scale-set 0)
(org-remove-latex-fragment-image-overlays)
(org-clear-latex-preview)
(set-face-attribute 'org-level-2 nil :height 1.0)
(+org-present-remove-overlays-h)
(org-remove-inline-images)))))

16
modules/lang/org/autoload/org-attach.el
View file

@ -19,7 +19,7 @@
"A list of all indexed attachments in `org-directory'.")
(defvar +org-attachments-files nil
"A list of all attachments in `org-attach-directory'.")
"A list of all attachments in `org-attach-id-dir'.")
(defun +org-attachments--list (&optional beg end)
"Return a list of all attachment file names in the current buffer between BEG
@ -33,20 +33,20 @@ and END (defaults to `point-min' and `point-max')."
(while (search-forward "[[attach:" end t)
(let* ((context (save-match-data (org-element-context)))
(link (expand-file-name (org-link-unescape (org-element-property :path context))
org-attach-directory)))
org-attach-id-dir)))
(when (and (equal "file" (org-element-property :type context))
(file-in-directory-p link org-attach-directory))
(file-in-directory-p link org-attach-id-dir))
(push (file-name-nondirectory link) attachments))))))
(cl-delete-duplicates attachments :test #'string=)))
;;;###autoload
(defun +org-attach/sync (arg)
"Reindex all attachments in `org-directory' and delete orphaned attachments in
`org-attach-directory'. If ARG (universal arg), conduct a dry run."
`org-attach-id-dir'. If ARG (universal arg), conduct a dry run."
(declare (interactive-only t))
(interactive "P")
(message "Reloading")
(setq +org-attachments-files (directory-files org-attach-directory nil "^[^.]" t))
(setq +org-attachments-files (directory-files org-attach-id-dir nil "^[^.]" t))
(with-temp-buffer
(delay-mode-hooks (org-mode))
(dolist (org-file (directory-files-recursively org-directory "\\.org$"))
@ -59,14 +59,14 @@ and END (defaults to `point-min' and `point-max')."
(message "Deleting orphaned attachment: %s" file)
(cl-incf deleted)
(unless arg
(delete-file (expand-file-name file org-attach-directory))))
(delete-file (expand-file-name file org-attach-id-dir))))
(message "Buffer's attachments synced (%d deleted)" deleted)))
;;;###autoload
(defun +org-attach/find-file ()
"Open a file from `org-attach-directory'."
"Open a file from `org-attach-id-dir'."
(interactive)
(doom-project-browse org-attach-directory))
(doom-project-browse org-attach-id-dir))
;;;###autoload
(defun +org-attach/file (path)

6
modules/lang/org/autoload/org.el
View file

@ -111,8 +111,8 @@ If on a:
'done)))
(t
(+org/refresh-inline-images)
(org-remove-latex-fragment-image-overlays)
(org-toggle-latex-fragment '(4)))))
(org-clear-latex-preview)
(org-latex-preview '(4)))))
(`clock (org-clock-update-time-maybe))
@ -150,7 +150,7 @@ If on a:
(org-babel-execute-src-block))
((or `latex-fragment `latex-environment)
(org-toggle-latex-fragment))
(org-latex-preview))
(`link
(let* ((lineage (org-element-lineage context '(link) t))

27
modules/lang/org/config.el
View file

@ -254,7 +254,7 @@ underlying, modified buffer. This fixes that."
"I believe Org's native attachment system is over-complicated and litters
files with metadata I don't want. So I wrote my own, which:
+ Places attachments in a centralized location (`org-attach-directory' in
+ Places attachments in a centralized location (`org-attach-id-dir' in
`org-directory').
+ Adds attach:* link abbreviation for quick links to these files from anywhere.
+ Use `+org-attach/sync' to index all attachments in `org-directory' that use
@ -268,30 +268,30 @@ Some commands of interest:
+ `+org-attach/file'
+ `+org-attach/url'
+ `+org-attach/sync'"
(setq org-attach-directory (doom-path org-directory org-attach-directory))
(setq org-attach-id-dir (doom-path org-directory org-attach-id-dir))
;; A shorter link to attachments
(add-to-list 'org-link-abbrev-alist
(cons "attach"
(abbreviate-file-name org-attach-directory)))
(abbreviate-file-name org-attach-id-dir)))
(org-link-set-parameters
"attach"
:follow (lambda (link) (find-file (doom-path org-attach-directory link)))
:follow (lambda (link) (find-file (doom-path org-attach-id-dir link)))
:complete (lambda (&optional _arg)
(+org--relpath (+org-link-read-file "attach" org-attach-directory)
org-attach-directory))
(+org--relpath (+org-link-read-file "attach" org-attach-id-dir)
org-attach-id-dir))
:face (lambda (link)
(if (file-exists-p (expand-file-name link org-attach-directory))
(if (file-exists-p (expand-file-name link org-attach-id-dir))
'org-link
'error)))
(after! projectile
(add-to-list 'projectile-globally-ignored-directories org-attach-directory))
(add-to-list 'projectile-globally-ignored-directories org-attach-id-dir))
(after! recentf
(add-to-list 'recentf-exclude
(lambda (file) (file-in-directory-p file org-attach-directory)))))
(lambda (file) (file-in-directory-p file org-attach-id-dir)))))
(defun +org-init-centralized-exports-h ()
@ -455,7 +455,7 @@ eldoc string."
for n from 0
for face = (nth (% n org-n-level-faces) org-level-faces)
collect
(org-add-props (replace-regexp-in-string org-any-link-re "\\4" part)
(org-add-props (replace-regexp-in-string org-link-any-re "\\4" part)
nil 'face `(:foreground ,(face-foreground face nil t) :weight bold)))
separator)))
@ -599,7 +599,7 @@ between the two."
"t" #'org-agenda-todo))
(defun +org-init-keybinds-for-evil-h (&rest args)
(defun +org-init-keybinds-for-evil-h (&rest _)
"TODO"
(when (featurep! :editor evil +everywhere)
(use-package! evil-org
@ -793,7 +793,7 @@ compelling reason, so..."
:preface
;; Change org defaults (should be set before org loads)
(defvar org-directory "~/org/")
(defvar org-attach-directory ".attach/")
(defvar org-attach-id-dir ".attach/")
(setq org-clock-persist-file (concat doom-etc-dir "org-clock-save.el")
org-publish-timestamp-directory (concat doom-cache-dir "org-timestamps/")
@ -848,7 +848,8 @@ compelling reason, so..."
;; In case the user has eagerly loaded org from their configs
(when (and (featurep 'org)
(not doom-reloading-p))
(not doom-reloading-p)
(not byte-compile-current-file))
(message "`org' was already loaded by the time lang/org loaded, this may cause issues")
(run-hooks 'org-load-hook))

2
modules/ui/doom/config.el
View file

@ -45,7 +45,7 @@
:init
(add-hook! 'doom-load-theme-hook :append
(defun +doom-solaire-mode-swap-bg-maybe-h ()
(pcase-let ((`(,theme . ,swap) (assq doom-theme +doom-solaire-themes)))
(pcase-let ((`(,_theme . ,swap) (assq doom-theme +doom-solaire-themes)))
(require 'solaire-mode)
(if swap (solaire-mode-swap-bg)))))
:config

5
modules/ui/workspaces/autoload/workspaces.el
View file

@ -491,10 +491,9 @@ This be hooked to `projectile-after-switch-project-hook'."
(if (and (not (null +workspaces-on-switch-project-behavior))
(or (eq +workspaces-on-switch-project-behavior t)
(+workspace-buffer-list)))
(let* (persp-p
(persp
(let* ((persp
(let ((project-name (doom-project-name +workspaces--project-dir)))
(or (setq persp-p (+workspace-get project-name t))
(or (+workspace-get project-name t)
(+workspace-new project-name))))
(new-name (persp-name persp)))
(+workspace-switch new-name)