Stop PVS from clobbering some of our keybindings

emacs/init.el

@@ -175,7 +175,6 @@
   :bind
   (("C-j" . avy-goto-char-timer)
    ("M-l" . avy-goto-line)
-   ([remap goto-line] . avy-goto-line)
    :map isearch-mode-map
    ("C-j" . avy-isearch)
    :map lisp-interaction-mode-map
@@ -599,14 +598,9 @@
 ;; Don't clobber the OS clipboard completely
 (setq save-interprogram-paste-before-kill t)
 
-;; automatically cleanup whitespace on save
+(use-package ws-butler
-(defun my-whitespace-cleanup ()
+  :ensure t
-  "Run `whitespace-cleanup' except for TSV files."
+  :hook (prog-mode . ws-butler-mode))
-  (unless (or (derived-mode-p 'text-mode) ; Adjust this check if necessary
-              (string-match "\\.tsv\\'" buffer-file-name))
-    (whitespace-cleanup)))
-
-(add-hook 'before-save-hook 'my-whitespace-cleanup)
 
 ;; clean up backup file spam
 (setq backup-directory-alist `(("." . "~/.saves")
@@ -1036,3 +1030,7 @@ any directory proffered by `consult-dir'."
   :hook (eat-mode . (lambda ()
                       (setq display-line-numbers nil)
                       (hl-line-mode -1))))
+
+;;; PVS
+
+(setq ilisp-*use-fsf-compliant-keybindings* t)