Simplify doom/info output

This commit is contained in:
Henrik Lissner 2020-10-20 23:21:11 -04:00
parent b4e66bffeb
commit 9b4fd806bb
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 10 additions and 14 deletions

View file

@ -212,16 +212,12 @@ branch and commit."
;;;###autoload ;;;###autoload
(defun doom/info (&optional raw) (defun doom/info (&optional raw)
"Collects some debug information about your Emacs session, formats it into "Collects some debug information about your Emacs session, formats it and
markdown and copies it to your clipboard, ready to be pasted into bug reports!" copies it to your clipboard, ready to be pasted into bug reports!"
(interactive "P") (interactive "P")
(let ((buffer (get-buffer-create "*doom-info*")) (let ((buffer (get-buffer-create "*doom info*"))
(info (doom-info))) (info (doom-info)))
(with-current-buffer buffer (with-current-buffer buffer
(or (not doom-interactive-p)
(eq major-mode 'markdown-mode)
(not (fboundp 'markdown-mode))
(markdown-mode))
(erase-buffer) (erase-buffer)
(if raw (if raw
(progn (progn
@ -235,7 +231,7 @@ markdown and copies it to your clipboard, ready to be pasted into bug reports!"
(let ((sexp (prin1-to-string (sexp-at-point)))) (let ((sexp (prin1-to-string (sexp-at-point))))
(delete-region beg end) (delete-region beg end)
(insert sexp)))))) (insert sexp))))))
(insert "<details>\n\n```\n") (insert "```\n")
(dolist (group info) (dolist (group info)
(insert! "%-8s%-10s %s\n" (insert! "%-8s%-10s %s\n"
((upcase (symbol-name (car group))) ((upcase (symbol-name (car group)))
@ -244,12 +240,12 @@ markdown and copies it to your clipboard, ready to be pasted into bug reports!"
(dolist (spec (cddr group)) (dolist (spec (cddr group))
(insert! (indent 8 "%-10s %s\n") (insert! (indent 8 "%-10s %s\n")
((car spec) (cdr spec))))) ((car spec) (cdr spec)))))
(insert "```\n</details>")) (insert "```\n"))
(if (not doom-interactive-p) (if (not doom-interactive-p)
(print! (buffer-string)) (print! (buffer-string))
(switch-to-buffer buffer) (pop-to-buffer buffer)
(kill-new (buffer-string)) (kill-new (buffer-string))
(print! (green "Copied markdown to clipboard")))))) (print! (green "Copied your doom info to clipboard"))))))
;;;###autoload ;;;###autoload
(defun doom/am-i-secure () (defun doom/am-i-secure ()

View file

@ -15,10 +15,10 @@
(insert (json-encode (doom-info))) (insert (json-encode (doom-info)))
(json-pretty-print-buffer) (json-pretty-print-buffer)
(print! (buffer-string)))) (print! (buffer-string))))
("--md" ("--lisp"
(doom/info))
((or `nil "--lisp")
(doom/info 'raw)) (doom/info 'raw))
(`nil
(doom/info))
(_ (_
(user-error "I don't understand %S. Did you mean --json, --md/--markdown or --lisp?" (user-error "I don't understand %S. Did you mean --json, --md/--markdown or --lisp?"
format))) format)))