From 1758266ce4720e431c7af52951982fbaad7d9310 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 24 Feb 2019 20:40:16 -0500 Subject: [PATCH] Fix doom/describe-setters --- core/autoload/help.el | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/autoload/help.el b/core/autoload/help.el index 75d4d1a69..793a114f3 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -80,19 +80,18 @@ ;; TODO Could be cleaner (refactor me!) (cl-loop with maxwidth = (apply #'max (mapcar #'length (mapcar #'symbol-name settings))) for def in (sort settings #'string-lessp) - if (or (get def 'doom-module) - (doom-module-from-path (symbol-file def))) + if (get def 'doom-module) collect (format (format "%%-%ds%%s" (+ maxwidth 4)) def (propertize (format "%s %s" (car it) (cdr it)) 'face 'font-lock-comment-face)) - else if (file-in-directory-p (symbol-file def) doom-core-dir) + else if (and (string-match-p "^set-.+!$" (symbol-name def)) + (symbol-file def) + (file-in-directory-p (symbol-file def) doom-core-dir)) collect (format (format "%%-%ds%%s" (+ maxwidth 4)) - def (propertize (format "%s %s" :core (file-name-sans-extension (file-relative-name (symbol-file def) doom-core-dir))) - 'face 'font-lock-comment-face)) - else - collect (symbol-name def)) + def (propertize (format "core/%s.el" (file-name-sans-extension (file-relative-name (symbol-file def) doom-core-dir))) + 'face 'font-lock-comment-face))) nil t (when (and (symbolp sym) (string-match-p "!$" (symbol-name sym)))