diff options
| -rw-r--r-- | doom/.config/doom/config.el | 20 | ||||
| -rw-r--r-- | doom/.config/doom/config.org | 20 |
2 files changed, 24 insertions, 16 deletions
diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el index 32ef260..a3636e5 100644 --- a/doom/.config/doom/config.el +++ b/doom/.config/doom/config.el @@ -357,14 +357,18 @@ emms-cache-file (concat doom-cache-dir "emms-cache")) (message "vc-jj: push FAILED, output below") (let ((display-buffer-alist nil)) (pop-to-buffer buf))))))))) -(defvar vc--inhibit-async-window) - -(defun my/vc-jj--push-no-window (orig &rest args) - (let ((vc--inhibit-async-window t)) - (apply orig args))) - -(advice-add 'vc-jj-push :around #'my/vc-jj--push-no-window) - (advice-add 'vc-jj-push :after #'my/vc-jj--report-push)) + (defvar vc--inhibit-async-window) + + (defun my/vc-jj--push-no-window (orig &rest args) + (let ((vc--inhibit-async-window t)) + (apply orig args))) + + (advice-add 'vc-jj-push :around #'my/vc-jj--push-no-window) + (advice-add 'vc-jj-push :after #'my/vc-jj--report-push) + (define-advice ansi-color-filter-region (:around (fn &rest args) my/vc-jj-writable) + (let ((inhibit-read-only (or inhibit-read-only + (string-prefix-p "*vc-jj" (buffer-name))))) + (apply fn args)))) (setq org-directory "~/org/") diff --git a/doom/.config/doom/config.org b/doom/.config/doom/config.org index 0771d0c..ababf22 100644 --- a/doom/.config/doom/config.org +++ b/doom/.config/doom/config.org @@ -647,14 +647,18 @@ A simple fix indeed. (message "vc-jj: push FAILED, output below") (let ((display-buffer-alist nil)) (pop-to-buffer buf))))))))) -(defvar vc--inhibit-async-window) - -(defun my/vc-jj--push-no-window (orig &rest args) - (let ((vc--inhibit-async-window t)) - (apply orig args))) - -(advice-add 'vc-jj-push :around #'my/vc-jj--push-no-window) - (advice-add 'vc-jj-push :after #'my/vc-jj--report-push)) + (defvar vc--inhibit-async-window) + + (defun my/vc-jj--push-no-window (orig &rest args) + (let ((vc--inhibit-async-window t)) + (apply orig args))) + + (advice-add 'vc-jj-push :around #'my/vc-jj--push-no-window) + (advice-add 'vc-jj-push :after #'my/vc-jj--report-push) + (define-advice ansi-color-filter-region (:around (fn &rest args) my/vc-jj-writable) + (let ((inhibit-read-only (or inhibit-read-only + (string-prefix-p "*vc-jj" (buffer-name))))) + (apply fn args)))) #+end_src * Org ~Protesting for Org README support.~ |