2 files changed, 43 insertions, 12 deletions

@@ -44,6 +44,10 @@
            ;; "C-x 3" #'+split-window-right-then
            ;; "C-x C-3" #'+split-window-right-then
            )
+  ;; Font-lock keywords
+  (font-lock-add-keywords
+   nil
+   '(("\\<\\(TODO\\|XXX\\|FIXME\\|BUG\\):" 1 font-lock-warning-face t)))
   ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults
   (global-set-key (kbd "C-h") 'delete-backward-char)
   (keyboard-translate ?\C-h ?\C-?)
@@ -521,7 +525,11 @@
     ;; Horizontal lines
     (font-lock-add-keywords
      'org-mode
-     '(("^-----+" . form-feed--font-lock-face)))))
+     '(("^-----+" . form-feed--font-lock-face))))
+  (put 'browse-url-browser-function 'safe-local-variable
+       (lambda (val)
+         (eq (function-get val 'browse-url-browser-kind :autoload)
+             'external))))
 
 (setup org-agenda
   (:option org-agenda-skip-deadline-if-done t
@@ -843,6 +851,7 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
          "C-l" #'lui-track-jump-to-indicator
          "C-<return>" #'+circe-chat@set-prompt)
 
+  ;; XXX: this doesn't quite work right.
   (advice-add #'circe-command-PART :after #'+circe-kill-buffer)
   (advice-add #'circe-command-QUIT :after #'+circe-quit@kill-buffer)
   (advice-add #'circe-command-GQUIT :after #'+circe-gquit@kill-buffer)
@@ -1301,6 +1310,22 @@ See also `crux-reopen-as-root-mode'."
               (define-key isearch-mb-minibuffer-map (kbd key) command)))))))
   (isearch-mb-mode +1))
 
+(setup (:straight (jabber :repo "https://tildegit.org/wgreenhouse/emacs-jabber"
+                          :host nil
+                          :files ("*.el" "*.texi"
+                                  ("jabber-fallback-lib"
+                                   "jabber-fallback-lib/hexrgb.el"
+                                   "jabber-fallback-lib/srv.el"
+                                   "jabber-fallback-lib/fsm.el")
+                                  "jabber-pkg.el")
+                          :fork (:repo "https://tildegit.org/acdw/emacs-jabber"
+                                       :host nil)))
+  (dolist (mode '(jabber-chat-mode
+                  jabber-browse-mode
+                  jabber-roster-mode
+                  jabber-console-mode))
+    (add-hook (intern (format "%s-hook" mode)) #'visual-fill-column-mode)))
+
 (setup (:straight-when keychain-environment
          (executable-find "keychain"))
   (keychain-refresh-environment))
@@ -1328,6 +1353,12 @@ See also `crux-reopen-as-root-mode'."
            "m" #'link-hint-open-multiple-links
            "M-c" #'link-hint-copy-link "c" #'link-hint-copy-link)))
 
+(setup (:straight (machine
+                   :host github :repo "duckwork/machine.el"))
+  (:option machine-default-font "DejaVu Sans Mono"
+           machine-variable-pitch-font "DejaVu Sans")
+  (machine-settings-load))
+
 (setup (:straight macrostep)
   (:require macrostep)
   (:with-mode emacs-lisp-mode
@@ -1747,9 +1778,3 @@ See also `crux-reopen-as-root-mode'."
   (:require +zzz-to-char)
   (:option zzz-to-char-reach (+bytes 1 :kib))
   (:global "M-z" #'+zzz-to-char))
-
-(setup (:straight (machine
-                   :host github :repo "duckwork/machine.el"))
-  (:option machine-default-font "DejaVu Sans Mono"
-           machine-variable-pitch-font "DejaVu Sans")
-  (machine-settings-load))
@@ -314,12 +314,18 @@ instead of the true count."
 
 ;;; Hooks & Advice
 
+(defvar +org-before-save-prettify-buffer t
+  "Prettify org buffers before saving.")
+
+(put '+org-before-save-prettify-buffer 'safe-local-variable #'booleanp)
+
 (defun +org-before-save@prettify-buffer ()
-  (save-mark-and-excursion
-    (mark-whole-buffer)
-    ;;(org-fill-paragraph nil t)
-    (+org-fix-blank-lines t)
-    (org-align-tags t)))
+  (when +org-before-save-prettify-buffer
+    (save-mark-and-excursion
+     (mark-whole-buffer)
+     ;;(org-fill-paragraph nil t)
+     (+org-fix-blank-lines t)
+     (org-align-tags t))))
 
 (defun +org-delete-backward-char (N)
   "Keep tables aligned while deleting N characters backward.