1 files changed, 12 insertions, 8 deletions

@@ -1117,7 +1117,7 @@ specific to most general, they are these:
   (:with-mode circe-chat-mode
     (:hook  #'acdw/stop-paren-annoyances
             #'enable-circe-color-nicks
-            #'enable-circe-display-images
+            ;; #'enable-circe-display-images
             #'enable-circe-new-day-notifier
             (defun circe-chat@set-prompt ()
               (lui-set-prompt
@@ -1826,8 +1826,8 @@ browser defined in `browse-url-secondary-browser-function'."
 
 (setup (:straight org
                   org-contrib)
-  (:also-load acdw-org                 ; so I don't clutter up init.el
-              chd)
+  (:also-load acdw-org)
+  (require 'chd nil 'noerror)
   (:option
    org-adapt-indentation nil
    org-agenda-files nil                 ; only until I set this up
@@ -1911,7 +1911,8 @@ browser defined in `browse-url-secondary-browser-function'."
 
   (el-patch-feature org)
   (with-eval-after-load 'org
-    (el-patch-defun org-format-outline-path (path &optional width prefix separator)
+    (el-patch-defun org-format-outline-path (path &optional
+                                                  width prefix separator)
       "Format the outline path PATH for display.
 WIDTH is the maximum number of characters that is available.
 PREFIX is a prefix to be included in the returned string,
@@ -1932,8 +1933,8 @@ the default is \"/\"."
                                            for n from 0
                                            collect (el-patch-swap
                                          (org-add-props
-                                                          head nil '`face
-                                                          (nth (% n org-n-level-faces) org-level-faces))
+                                                             head nil 'face
+                                                             (nth (% n org-n-level-faces) org-level-faces))
                                          head))
                               separator))))
         (when (> (length fpath) width)
@@ -2064,8 +2065,11 @@ the default is \"/\"."
          left
          (propertize " "
                      'display (el-patch-swap
-                                `(space :align-to (- right ,reserve))
-                                `(space :align-to (- right (- 0 right-margin) ,reserve)))
+                                `((space :align-to (- right ,reserve)))
+                                `((space :align-to
+                                         (- right
+                                            (- 1 right-fringe right-margin)
+                                            ,reserve))))
                      'face '(:inherit simple-modeline-space))
          right))))