From ae6d106dcee3c4d431b72d5d7429f5e888349a03 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 10 Sep 2018 22:36:37 -0400
Subject: [PATCH] lang/ess: update to reflect changes upstream #880

---
 modules/lang/ess/config.el | 49 ++++++++++----------------------------
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el
index a4e7a3467..2e1444b8e 100644
--- a/modules/lang/ess/config.el
+++ b/modules/lang/ess/config.el
@@ -1,34 +1,7 @@
 ;;; lang/ess/config.el -*- lexical-binding: t; -*-
 
-(def-package! ess-mode
-  :commands (R stata julia SAS)
-  :mode (("\\.sp\\'"           . S-mode)
-         ("/R/.*\\.q\\'"       . R-mode)
-         ("\\.[qsS]\\'"        . S-mode)
-         ("\\.ssc\\'"          . S-mode)
-         ("\\.SSC\\'"          . S-mode)
-         ("\\.[rR]\\'"         . R-mode)
-         ("\\.[rR]nw\\'"       . Rnw-mode)
-         ("\\.[sS]nw\\'"       . Snw-mode)
-         ("\\.[rR]profile\\'"  . R-mode)
-         ("NAMESPACE\\'"       . R-mode)
-         ("CITATION\\'"        . R-mode)
-         ("\\.omg\\'"          . omegahat-mode)
-         ("\\.hat\\'"          . omegahat-mode)
-         ("\\.lsp\\'"          . XLS-mode)
-         ("\\.do\\'"           . STA-mode)
-         ("\\.ado\\'"          . STA-mode)
-         ("\\.[Ss][Aa][Ss]\\'" . SAS-mode)
-         ("\\.[Ss]t\\'"        . S-transcript-mode)
-         ("\\.Sout"            . S-transcript-mode)
-         ("\\.[Rr]out"         . R-transcript-mode)
-         ("\\.Rd\\'"           . Rd-mode)
-         ("\\.[Bb][Uu][Gg]\\'" . ess-bugs-mode)
-         ("\\.[Bb][Oo][Gg]\\'" . ess-bugs-mode)
-         ("\\.[Bb][Mm][Dd]\\'" . ess-bugs-mode)
-         ("\\.[Jj][Aa][Gg]\\'" . ess-jags-mode)
-         ("\\.[Jj][Oo][Gg]\\'" . ess-jags-mode)
-         ("\\.[Jj][Mm][Dd]\\'" . ess-jags-mode))
+(def-package! ess
+  :commands (stata SAS)
   :init
   (setq ess-smart-S-assign-key nil)
   (unless (featurep! :lang julia)
@@ -41,14 +14,16 @@
         ess-default-style 'DEFAULT)
   (set-repl-handler! 'ess-mode #'+ess/r-repl)
   (set-lookup-handlers! 'ess-mode :documentation #'ess-display-help-on-object)
-  (define-key! ess-doc-map
-    "h" #'ess-display-help-on-object
-    "p" #'ess-R-dv-pprint
-    "t" #'ess-R-dv-ctable)
-  (define-key! ess-doc-map
-    [s-return] #'ess-eval-line
-    [up]       #'comint-next-input
-    [down]     #'comint-previous-input)
+
+  (after! ess-help
+    (define-key! ess-doc-map
+      "h" #'ess-display-help-on-object
+      "p" #'ess-R-dv-pprint
+      "t" #'ess-R-dv-ctable)
+    (define-key! ess-doc-map
+      [s-return] #'ess-eval-line
+      [up]       #'comint-next-input
+      [down]     #'comint-previous-input))
   (map! :map ess-mode-map
         :localleader
         :nv ","        #'ess-eval-region-or-function-or-paragraph-and-step