@jtr On the line-wrap thing, I do the follwing instead (visual-fill-column package).

When I tested your setup, the first line was indented poperly, but subequent ones sill went to column 1. visual-fill-column seems to handle it correctly (not going back to column 1 for subequent lines:

(remove-hook ’text-mode-hook #’turn-on-auto-fill)

(require ’visual-fill-column)

;; Add visual-line-mode and visual-fill-column-mode to text-mode-hook
(add-hook ’text-mode-hook (lambda ()
(visual-line-mode 1)
(visual-fill-column-mode 1)
;; (visual-fill-column-toggle-center-text)
)
)

;; Set the desired wrap width
(setq-default visual-fill-column-width 120) ;; because 80 character terminals were a thing?
#+end_src