emacs: fix some deprecation warnings

Signed-off-by: Kenny Ballou <kb@devnulllabs.io>

3 files changed, 12 insertions, 23 deletions

diff --git a/config/emacs/emacs.d/lisp/init-html.el b/config/emacs/emacs.d/lisp/init-html.el
index f8bf7094..4c5e6c08 100644
--- a/config/emacs/emacs.d/lisp/init-html.el
+++ b/config/emacs/emacs.d/lisp/init-html.el
@@ -8,7 +8,7 @@
 (with-eval-after-load 'sgml-mode
   (add-hook 'sgml-mode-hook (lambda () (tagedit-mode 1))))
 
-(add-to-list 'auto-mode-alist '("\\.\\(jsp\\|tpml\\)\\'" . 'html-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(jsp\\|tpml\\)\\'" . html-mode))
 
 ;; Note: ERB is configured in init-ruby-mode
 
diff --git a/config/emacs/emacs.d/lisp/init-javascript.el b/config/emacs/emacs.d/lisp/init-javascript.el
index 20c233e4..a0f71a9f 100644
--- a/config/emacs/emacs.d/lisp/init-javascript.el
+++ b/config/emacs/emacs.d/lisp/init-javascript.el
@@ -28,22 +28,9 @@
     (lsp-deferred))
   :hook (typescript-mode . kb/typescript--mode))
 
-(defcustom preferred-javascript-mode
-  (first (remove-if-not #'fboundp '(js2-mode js-mode)))
-  "Javascript mode to use for .js files."
-  :type 'symbol
-  :group 'programming
-  :options '(js2-mode js-mode))
-
 (defconst preferred-javascript-indent-level 4)
 
-;; Need to first remove from list if present, since elpa adds entries too, which
-;; may be in an arbitrary order
-(eval-when-compile (require 'cl-lib))
-(setq auto-mode-list (cons `("\\.\\(js\\|es6\\)\\(\\.erb\\)?\\'" . ,preferred-javascript-mode)
-                           (loop for entry in auto-mode-alist
-                                 unless (eq preferred-javascript-mode (cdr entry))
-                                 collect entry)))
+(add-to-list 'auto-mode-alist '("\\.\\(js\\|es6\\)\\(\\.erb\\)?\\'" . js2-mode))
 
 ;; js-2 mode
 ;; change some defaults
@@ -68,7 +55,7 @@
 ;; js-mode
 (setq-default js-indent-level preferred-javascript-indent-level)
 
-(add-to-list 'interpreter-mode-alist (cons "node" preferred-javascript-mode))
+(add-to-list 'interpreter-mode-alist '("node" . js2-mode))
 
 (use-package xref-js2
   :after js2-mode
@@ -93,7 +80,9 @@
 
   (define-minor-mode inferior-js-keys-mode
     "Bindings for communicating with inferior js interpreter."
-    nil "InfJS" inferior-js-minor-mode-map)
+    :init-value nil
+    :lighter "InfJS"
+    :keymap inferior-js-minor-mode-map)
 
   (dolist (hook '(js2-mode-hook js-mode-hook))
     (add-hook hook 'inferior-js-keys-mode)))
diff --git a/config/emacs/emacs.d/lisp/init-tramp.el b/config/emacs/emacs.d/lisp/init-tramp.el
index 14c54e56..98530435 100644
--- a/config/emacs/emacs.d/lisp/init-tramp.el
+++ b/config/emacs/emacs.d/lisp/init-tramp.el
@@ -16,13 +16,13 @@
 (setq tramp-default-method "ssh")
 (setq tramp-verbose 1)
 
-(add-hook 'helm-tramp-pre-command-hook '(lambda ()
-                                          (projectile-mode 0)
-                                          (editorconfig-mode 0)))
+(add-hook 'helm-tramp-pre-command-hook #'(lambda ()
+                                           (projectile-mode 0)
+                                           (editorconfig-mode 0)))
 
-(add-hook 'helm-tramp-quit-hook '(lambda ()
-                                   (projectile-mode 1)
-                                   (editorconfig-mode 1)))
+(add-hook 'helm-tramp-quit-hook #'(lambda ()
+                                    (projectile-mode 1)
+                                    (editorconfig-mode 1)))
 
 (provide 'init-tramp)
 ;;; init-tramp.el ends here