Merge branch 'main' of tildegit.org:acdw/emacs

1 files changed, 14 insertions, 8 deletions

@@ -301,7 +301,8 @@
          #'hl-line-mode
          #'lin-mode
          #'+dired-dim-git-ignores)
-  (:+key "C-x C-j" #'dired-jump)
+  (+with-ensure-after-init              ; Necessary because jabber loads later
+      (:+key "C-x C-j" #'dired-jump))
   (dolist (refresh-after-func '(dired-do-flagged-delete))
     (advice-add refresh-after-func :after #'revert-buffer))
   (with-eval-after-load 'frowny
@@ -369,7 +370,7 @@
     ;; Bind keys
     (dolist (binding '(("C-d" . +eshell-quit-or-delete-char)))
       (define-key eshell-mode-map
-        (kbd (car binding)) (cdr binding)))
+                  (kbd (car binding)) (cdr binding)))
     ;; Environment variables
     (dolist (environment '(("PAGER" . "cat")))
       (setenv (car environment) (cdr environment)))))
@@ -436,6 +437,8 @@
     (add-to-list 'Info-additional-directory-list dir))
   (:with-mode Info-mode                 ; -_-
     (:hook #'reading-mode)
+    (:local-set +modeline-buffer-position #'+Info-modeline-breadcrumbs
+                +modeline-position-function #'ignore)
     (:bind "c" #'+Info-copy-current-node-name
            "w" #'+Info-copy-current-node-name)))
 
@@ -1561,7 +1564,6 @@
            t)))
 
 (setup (:straight epithet)
-  (add-hook 'epithet-suggesters #'epithet-for-eww-url)
   (dolist (hook '(Info-selection-hook
                   ;; eww-after-render-hook
                   help-mode-hook
@@ -1758,6 +1760,8 @@
 (setup (:straight info+)
   (:load-after info)
   (:option Info-fontify-isolated-quote-flag nil
+           Info-breadcrumbs-in-mode-line-mode nil
+           Info-fontify-emphasis-flag nil
            Info-fontify-quotations nil
            Info-saved-history-file (.etc "info-history"))
   (add-hook 'Info-mode-hook #'Info-variable-pitch-text-mode))
@@ -1844,6 +1848,7 @@
                                               (cond
                                                ((string-match-p "hmm@" (buffer-name))
                                                 "🤔 ")))
+                file-percentage-mode nil
                 wrap-prefix (make-string +jabber-ws-prefix ?\ )))
   (:+leader "C-j" jabber-global-keymap)
   (advice-add 'jabber-activity-add :after #'+jabber-tracking-add)
@@ -2172,7 +2177,7 @@
              (executable-find "g++")))
   (setf (alist-get "\\.pdf\\'" auto-mode-alist nil nil #'equal)
         #'pdf-view-mode)
-  (pdf-tools-install t))
+  (pdf-tools-install :no-query))
 
 (setup (:straight (plancat
                    :host github
@@ -2219,7 +2224,7 @@
                                            (readonly . "=")
                                            (modified . "+")
                                            (t . "-"))
-           +modeline-minions-icon ";"
+           +modeline-minions-icon "&"
            +modeline-buffer-name-max-length 0.35)
   ;; Segments
   (:option simple-modeline-segments
@@ -2228,9 +2233,6 @@
               +modeline-modified
               +modeline-buffer-name
               (lambda () (+modeline-vc " : "))
-              ,(+modeline-concat
-                '(+modeline-minions
-                  +modeline-major-mode))
               +modeline-anzu
               )
              (                          ; right
@@ -2249,6 +2251,10 @@
                 ",")
               +modeline-input-method
               +modeline-position
+              ,(+modeline-concat
+                '(+modeline-minions
+                  +modeline-major-mode))
+              +modeline-file-percentage
               )))
   (simple-modeline-mode +1))