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

1 files changed, 14 insertions, 5 deletions

@@ -996,6 +996,15 @@ specific to most general, they are these:
              (:bind "C-;" #'flyspell-correct-wrapper)
              (:unbind "C-," "C-." "C-M-i")))))
 
+(setup (:straight forge)
+  ;; make sure to read Info manual with Forge (and Ghub) for setup
+  ;; instructions.
+  (with-eval-after-load 'magit
+    (require 'forge)
+    (add-to-list 'forge-alist           ; tildegit is a gitea server
+                 '("tildegit.org" "tildegit.org/api/v1" "tildegit.org"
+                   forge-gitea-repository))))
+
 (setup frames
   (:option frame-title-format '("%b@"
                                 (:eval
@@ -1715,14 +1724,14 @@ browser defined in `browse-url-secondary-browser-function'."
                   minions)
   (:also-load acdw-modeline)
   (:option simple-modeline-segments
-           '(;; left
-             (acdw-modeline/modified
+           '((;; left
+              acdw-modeline/winum
+              acdw-modeline/modified
               acdw-modeline/buffer-name
               acdw-modeline/vc-branch
-              acdw-modeline/winum
               acdw-modeline/position)
-             ;; right
-             (acdw-modeline/track
+             (;; right
+              acdw-modeline/track
               simple-modeline-segment-misc-info
               acdw-modeline/wc
               acdw-modeline/text-scale