From 962c643badc209256c455a25d6168b8313db5438 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 7 Oct 2022 17:28:36 +0200 Subject: [PATCH] fix(literate,mu4e): revert recent, unintended changes Reverts changes that snuck into 5ac2a52. Amend: 5ac2a5258b58 Ref: #6873 --- modules/config/literate/autoload.el | 17 +++-------------- modules/email/mu4e/autoload/email.el | 2 +- modules/email/mu4e/autoload/mu-lock.el | 3 ++- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/modules/config/literate/autoload.el b/modules/config/literate/autoload.el index be9ef2da3..0da5f0867 100644 --- a/modules/config/literate/autoload.el +++ b/modules/config/literate/autoload.el @@ -24,9 +24,6 @@ (org-startup-indented nil) (org-startup-folded nil) (vc-handled-backends nil) - ;; Emit more information about the tangle process: - (org-babel-pre-tangle-hook org-babel-pre-tangle-hook) ; before file tangle - (org-babel-tangle-body-hook org-babel-tangle-body-hook) ; after src block ;; Prevent unwanted entries in recentf, or formatters, or ;; anything that could be on these hooks, really. Nothing else ;; should be touching these files (particularly in interactive @@ -41,17 +38,9 @@ ;; Allow evaluation of src blocks at tangle-time (would abort ;; them otherwise). This is a security hazard, but Doom will ;; trust that you know what you're doing! - (org-confirm-babel-evaluate nil)) - (push (lambda () (print! (start "Tangling file: %s...") buffer-file-name)) - org-babel-pre-tangle-hook) - (print-group! - (push (lambda () - (let ((element (org-element-at-point))) - (when (eq 'src-block (org-element-type element)) - (org-element-property :language element) - (print! (start "Tangling %s block...") - (org-element-property :language element))))) - org-babel-tangle-body-hook)) + (org-confirm-babel-evaluate nil) + ;; Say a little more + (doom-print-message-level 'info)) (if-let (files (org-babel-tangle-file target dest)) (always (print! (success "Done tangling %d file(s)!" (length files)))) (print! (error "Failed to tangle any blocks from your config.")) diff --git a/modules/email/mu4e/autoload/email.el b/modules/email/mu4e/autoload/email.el index 1923d785b..dc99a6c72 100644 --- a/modules/email/mu4e/autoload/email.el +++ b/modules/email/mu4e/autoload/email.el @@ -132,7 +132,7 @@ will also be the width of all other printable characters." (setq mu4e-use-fancy-chars t mu4e-headers-draft-mark (cons "D" (+mu4e-normalised-icon "pencil")) mu4e-headers-flagged-mark (cons "F" (+mu4e-normalised-icon "flag")) - mu4e-headers-new-mark (cons "N" (+mu4e-normalised-icon "eye-slash" :v-adjust 0.05 :height 0.7)) + mu4e-headers-new-mark (cons "N" (+mu4e-normalised-icon "sync" :set "material" :height 0.8 :v-adjust -0.10)) mu4e-headers-passed-mark (cons "P" (+mu4e-normalised-icon "arrow-right")) mu4e-headers-replied-mark (cons "R" (+mu4e-normalised-icon "reply")) mu4e-headers-seen-mark (cons "S" "") ;(+mu4e-normalised-icon "eye" :height 0.6 :v-adjust 0.07 :color "dsilver")) diff --git a/modules/email/mu4e/autoload/mu-lock.el b/modules/email/mu4e/autoload/mu-lock.el index 9578fc7ed..14cf1b01d 100644 --- a/modules/email/mu4e/autoload/mu-lock.el +++ b/modules/email/mu4e/autoload/mu-lock.el @@ -34,6 +34,7 @@ If STRICT only accept an unset lock file." (pid (car lock-info))) (when (or strict (/= (emacs-pid) pid)) t)))) +;;;###autoload (defun +mu4e-lock-file-delete-maybe () "Check `+mu4e-lock-file', and delete it if this process is responsible for it." (when (+mu4e-lock-available) @@ -53,7 +54,7 @@ Else, write to this process' PID to the lock file" (user-error "Unfortunately another Emacs is already doing stuff with Mu4e, and you can only have one at a time") (write-region (number-to-string (emacs-pid)) nil +mu4e-lock-file) (delete-file +mu4e-lock-request-file) - ;; (call-process "touch" nil nil nil +mu4e-lock-request-file) + (call-process "touch" nil nil nil +mu4e-lock-request-file) (funcall orig-fun callback) (when +mu4e-lock--request-watcher (file-notify-rm-watch +mu4e-lock--request-watcher))