compatibility tweaks

1 files changed, 20 insertions, 12 deletions

diff --git a/init.el b/init.el
index 09c4bd3..3a55830 100644
--- a/init.el
+++ b/init.el
@@ -109,11 +109,16 @@
 
 ;;;; custom location of custom.el and co.
 (setq custom-file (jao-site-el "custom"))
-(load custom-file)
+(when (file-exists-p custom-file) (load custom-file))
 (setq custom-unlispify-tag-names nil)
 (setq custom-buffer-done-kill t)
 (setq custom-raised-buttons nil)
 
+;;;; compatibility
+(when (< emacs-major-version 30)
+  (use-package compat :ensure t :demand t)
+  (require 'jao-multisession))
+
 ;;; Preamble
 (jao-load-site-el "pre")
 
@@ -164,7 +169,7 @@
 (put 'list-timers 'disabled nil)
 
 ;;;; tramp
-(inhibit-remote-files)
+(when (> emacs-major-version 29) (inhibit-remote-files))
 
 ;;;; sleep/awake
 (use-package jao-sleep
@@ -354,10 +359,11 @@
   `(jao-call-with-auth ,host (lambda (,usr ,pwd) ,@body)))
 
 ;;;; pass
-(use-package password-store-menu
-  :ensure t
-  :config (password-store-menu-enable)
-  :custom (password-store-menu-key "C-c p"))
+(when (> emacs-major-version 28)
+  (use-package password-store-menu
+   :ensure t
+   :config (password-store-menu-enable)
+   :custom (password-store-menu-key "C-c p")))
 
 ;;; Fonts and color themes
 ;;;; widgets
@@ -903,8 +909,8 @@
 ;;;; cursor and mark
 (transient-mark-mode -1)
 (blink-cursor-mode -1)
-(setopt cursor-in-non-selected-windows nil
-        visible-cursor nil) ;; stop blinking in xterm
+(setq cursor-in-non-selected-windows nil
+      visible-cursor nil) ;; stop blinking in xterm
 
 ;;;; uniquifiy
 (require 'uniquify)
@@ -1207,7 +1213,8 @@
 (require 'jao-custom-org)
 
 ;;;; blog
-(require 'jao-custom-blog)
+(when (file-directory-p (expand-file-name "www" jao-doc-dir))
+  (require 'jao-custom-blog))
 
 ;;;; text-ish mode settings
 ;; SENTENCES separated by just one space
@@ -1585,7 +1592,7 @@
         magit-process-connection-type nil
         magit-push-always-verify nil
         magit-save-repository-buffers 'dontask
-        magit-section-visibility-indicator '("…" . t)
+        magit-section-visibility-indicators '(("…" . t))
         magit-status-buffer-switch-function 'switch-to-buffer
         magit-status-show-hashes-in-headers t))
 
@@ -1874,8 +1881,9 @@
  (defun jao-river-enabled-p () nil))
 
 (jao-d-l
- (progn (setq jao-minibuffer-info-face 'jao-themes-dimm)
-        (jao-mode-line-add-to-minibuffer-left 90))
+ (when (display-graphic-p)
+   (setq jao-minibuffer-info-face 'jao-themes-dimm)
+   (jao-mode-line-add-to-minibuffer-left 90))
  (require 'jao-custom-x11))
 
 ;;; Global transients