Gah, so many changes

1 files changed, 26 insertions, 24 deletions

@@ -37,41 +37,43 @@ are sorted lexigraphically."
        nil
        ;; Sort function
        (lambda (s1 s2)
-         (let ((s1 (cdr s1)) (s2 (cdr s2)))
-           (cond
+     (let ((s1 (cdr s1)) (s2 (cdr s2)))
+       (cond
             ;; Sort everything /not/ `setup' /before/ `setup'
             ((and (+init--sexp-setup-p s1)
-                  (not (+init--sexp-setup-p s2)))
+          (not (+init--sexp-setup-p s2)))
              nil)
             ((and (+init--sexp-setup-p s2)
-                  (not (+init--sexp-setup-p s1)))
+          (not (+init--sexp-setup-p s1)))
              t)
             ;; otherwise...
             (t (let ((s1-straight (+init--sexp-setup-p s1 :straight))
                      (s2-straight (+init--sexp-setup-p s2 :straight))
                      (s1-require (+init--sexp-setup-p s1 :require))
                      (s2-require (+init--sexp-setup-p s2 :require)))
-                 (cond
-                  ;; `:straight' setups have extra processing
-                  ((and s1-straight s2-straight)
-                   (let* ((r (rx (: ":straight" (? "-when") (* space) (? "("))))
-                          (s1 (replace-regexp-in-string r "" s1))
-                          (s2 (replace-regexp-in-string r "" s2)))
+         (cond
+          ;; `:straight' setups have extra processing
+          ((and s1-straight s2-straight)
+           (let* ((r (rx (: ":straight" (? "-when") (* space) (? "("))))
+              (s1 (replace-regexp-in-string r "" s1))
+              (s2 (replace-regexp-in-string r "" s2)))
                      (string< s1 s2)))
-                  ;; `:require' setups go first
-                  ((and s1-require (not s2-require)) t)
-                  ((and s2-require (not s1-require)) nil)
-                  ;; `:straight' setups go last
-                  ((and s1-straight (not s2-straight)) nil)
-                  ((and s2-straight (not s1-straight)) t)
-                  ;; otherwise, sort lexigraphically
-                  (t (string< s1 s2))))))))))))
+          ;; `:require' setups go first
+          ((and s1-require (not s2-require)) t)
+          ((and s2-require (not s1-require)) nil)
+          ;; `:straight' setups go last
+          ((and s1-straight (not s2-straight)) nil)
+          ((and s2-straight (not s1-straight)) t)
+          ;; otherwise, sort lexigraphically
+          (t (string< s1 s2))))))))))))
 
 (defun +init-sort-then-save ()
   "Sort init.el, then save it."
   (interactive)
   (+init-sort)
-  (save-buffer))
+  (if (fboundp #'user-save-buffer)
+      (user-save-buffer)
+    (save-buffer)))
 
 ;;; Add `setup' forms to `imenu-generic-expression'
 
@@ -79,11 +81,11 @@ are sorted lexigraphically."
   "Recognize `setup' forms in `imenu'."
   ;; `imenu-generic-expression' automatically becomes buffer-local when set
   (setf (alist-get "Setup" imenu-generic-expression nil nil 'string-equal)
-        (list
-         (rx (: bol (* space)
-                "(setup" (+ space)
-                (group (? "(") (* nonl))))
-         1)))
+    (list
+     (rx (: bol (* space)
+        "(setup" (+ space)
+        (group (? "(") (* nonl))))
+     1)))
 
 ;;; Major mode