From fa59e12b4338dd169ca49aa256dd82847e8cdab2 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 12 Jun 2021 01:20:50 -0400
Subject: Avoid some now obsolete things

---
 init.el        | 14 ++++++--------
 lisp/km-org.el |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/init.el b/init.el
index 3ab26a9..b4985dc 100644
--- a/init.el
+++ b/init.el
@@ -155,7 +155,7 @@
         org-refile-cache nil)
 
   (setq org-link-search-must-match-exact-headline nil)
-  (setq org-email-link-description-format "Email %c: %s")
+  (setq org-link-email-description-format "Email %c: %s")
 
   (setq org-src-fontify-natively t)
 
@@ -352,7 +352,7 @@
     (setq org-refile-target-verify-function #'km/org-refile-verify-target)
     (add-hook 'org-after-refile-insert-hook #'km/org-maybe-sort-parent)
 
-    (org-add-link-type "pmid" #'km/org-pmid-open))
+    (org-link-set-parameters "pmid" :follow #'km/org-pmid-open))
   (with-eval-after-load 'org-keys
     (add-to-list 'org-speed-commands
                  '("m" . (progn (forward-char 1)
@@ -818,7 +818,7 @@
     "Run grep on project."
     (call-interactively #'projectile-grep))
 
-  (projectile-global-mode))
+  (projectile-mode))
 
 (use-package km-projectile
   :chords ("gp" . km/projectile-switch-project)
@@ -1547,8 +1547,8 @@
 
 (use-package select
   :config
-  (setq x-select-enable-clipboard t
-        x-select-enable-primary t))
+  (setq select-enable-clipboard t
+        select-enable-primary t))
 
 (use-package man
   :init
@@ -1980,12 +1980,10 @@
   (define-key km/r-prefix-map "," #'ess-eval-region-or-function-or-paragraph)
 
   (setq ess-smart-S-assign-key ";")
-  (ess-toggle-S-assign nil)
-  (ess-toggle-S-assign nil)
   (setq ess-use-ido nil)
 
   (setq ess-r-package-auto-activate nil
-        ess-r-package-auto-set-evaluation-env nil)
+        ess-r-package-auto-enable-namespaced-evaluation nil)
 
   (define-abbrev-table 'ess-mode-abbrev-table
     '(("true" "TRUE")
diff --git a/lisp/km-org.el b/lisp/km-org.el
index 0a628a3..683dc3c 100644
--- a/lisp/km-org.el
+++ b/lisp/km-org.el
@@ -504,7 +504,7 @@ global value. A numeric prefix sets MAXLEVEL (defaults to 2)."
   "URL to search for PMID.")
 
 ;;;###autoload
-(defun km/org-pmid-open (path)
+(defun km/org-pmid-open (path _arg)
   "Search for PMID at `km/org-pmid-search-url'."
   (browse-url (format km/org-pmid-search-url path)))
 
-- 
cgit v1.2.3