From 8796a7407ae2778744b4ef3805f059918aeacab8 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 10 Feb 2018 02:11:42 -0500
Subject: [PATCH] lang/ess: conform to code conventions; no-byte-compile
 packages.el

---
 modules/lang/ess/config.el   | 86 +++++++++++++++++++-----------------
 modules/lang/ess/packages.el |  3 ++
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el
index 3ee10e398..47a612082 100644
--- a/modules/lang/ess/config.el
+++ b/modules/lang/ess/config.el
@@ -1,6 +1,7 @@
-;; ** ESS
-(setq ess-path (car (file-expand-wildcards "~/.emacs.d/.local/packages/elpa/ess*/lisp")))
-(def-package! ess-site :load-path ess-path
+;;; lang/ess/config.el -*- lexical-binding: t; -*-
+
+(def-package! ess-site
+  :init (load "ess-autoloads" nil t)
   :mode (("\\.sp\\'"           . S-mode)
          ("/R/.*\\.q\\'"       . R-mode)
          ("\\.[qsS]\\'"        . S-mode)
@@ -18,7 +19,6 @@
          ("\\.do\\'"           . STA-mode)
          ("\\.ado\\'"          . STA-mode)
          ("\\.[Ss][Aa][Ss]\\'" . SAS-mode)
-         ("\\.jl\\'"           . ess-julia-mode)
          ("\\.[Ss]t\\'"        . S-transcript-mode)
          ("\\.Sout"            . S-transcript-mode)
          ("\\.[Rr]out"         . R-transcript-mode)
@@ -30,6 +30,9 @@
          ("\\.[Jj][Oo][Gg]\\'" . ess-jags-mode)
          ("\\.[Jj][Mm][Dd]\\'" . ess-jags-mode))
   :commands (R stata julia SAS)
+  :init
+  (unless (featurep! :lang julia)
+    (push (cons "\\.jl\\'" 'ess-julia-mode) auto-mode-alist))
   :config
   (setq ess-first-continued-statement-offset 2
         ess-continued-statement-offset 0
@@ -38,43 +41,44 @@
         ess-default-style 'DEFAULT)
   (ess-toggle-underscore t)
   (set! :repl 'ess-mode #'+r/repl)
-  (map!
-   (:map ess-doc-map
-     "h"             #'ess-display-help-on-object
-     "p"             #'ess-R-dv-pprint
-     "t"             #'ess-R-dv-ctable)
-   (:map ess-mode-map
-     "<s-return>"    #'ess-eval-line
-     "<up>"          #'comint-next-input
-     "<down>"        #'comint-previous-input
-     (:localleader
-      :nv ","        #'ess-eval-region-or-function-or-paragraph-and-step
-      :n "'"         #'R
-      :n "<tab>"     #'ess-switch-to-inferior-or-script-buffer
-      :n "<backtab>" #'ess-switch-process
-      :n ;; REPL
-      :n "B"         #'ess-eval-buffer-and-go
-      :n "b"         #'ess-eval-buffer
-      :nv "d"        #'ess-eval-region-or-line-and-step
-      :n "D"         #'ess-eval-function-or-paragraph-and-step
-      :n "L"         #'ess-eval-line-and-go
-      :n "l"         #'ess-eval-line
-      :nv "R"        #'ess-eval-region-and-go
-      :nv "r"        #'ess-eval-region
-      :n "F"         #'ess-eval-function-and-go
-      :n "f"         #'ess-eval-function
-      ;; predefined keymaps
-      :n "h"         #'ess-doc-map
-      :n "x"         #'ess-extra-map
-      :n "p"         #'ess-r-package-dev-map
-      :n "v"         #'ess-dev-map
-      ;; noweb
-      :n "cC"        #'ess-eval-chunk-and-go
-      :n "cc"        #'ess-eval-chunk
-      :n "cd"        #'ess-eval-chunk-and-step
-      :n "cm"        #'ess-noweb-mark-chunk
-      :n "cp"        #'ess-noweb-previous-chunk
-      :n "cn"        #'ess-noweb-next-chunk))))
+  (set! :lookup 'ess-mode :documentation #'ess-display-help-on-object)
+  (map! (:map ess-doc-map
+          "h"             #'ess-display-help-on-object
+          "p"             #'ess-R-dv-pprint
+          "t"             #'ess-R-dv-ctable)
+        (:map ess-mode-map
+          "<s-return>"    #'ess-eval-line
+          "<up>"          #'comint-next-input
+          "<down>"        #'comint-previous-input
+          (:localleader
+            :nv ","        #'ess-eval-region-or-function-or-paragraph-and-step
+            :n "'"         #'R
+            :n "<tab>"     #'ess-switch-to-inferior-or-script-buffer
+            :n "<backtab>" #'ess-switch-process
+            :n ;; REPL
+            :n "B"         #'ess-eval-buffer-and-go
+            :n "b"         #'ess-eval-buffer
+            :nv "d"        #'ess-eval-region-or-line-and-step
+            :n "D"         #'ess-eval-function-or-paragraph-and-step
+            :n "L"         #'ess-eval-line-and-go
+            :n "l"         #'ess-eval-line
+            :nv "R"        #'ess-eval-region-and-go
+            :nv "r"        #'ess-eval-region
+            :n "F"         #'ess-eval-function-and-go
+            :n "f"         #'ess-eval-function
+            ;; predefined keymaps
+            :n "h"         #'ess-doc-map
+            :n "x"         #'ess-extra-map
+            :n "p"         #'ess-r-package-dev-map
+            :n "v"         #'ess-dev-map
+            ;; noweb
+            :n "cC"        #'ess-eval-chunk-and-go
+            :n "cc"        #'ess-eval-chunk
+            :n "cd"        #'ess-eval-chunk-and-step
+            :n "cm"        #'ess-noweb-mark-chunk
+            :n "cp"        #'ess-noweb-previous-chunk
+            :n "cn"        #'ess-noweb-next-chunk))))
+
 
 (def-package! ess-smart-equals
   :hook ((ess-mode . ess-smart-equals-mode)
diff --git a/modules/lang/ess/packages.el b/modules/lang/ess/packages.el
index 5b8a3f3b0..066bca909 100644
--- a/modules/lang/ess/packages.el
+++ b/modules/lang/ess/packages.el
@@ -1,3 +1,6 @@
+;; -*- no-byte-compile: t; -*-
+;;; lang/ess/packages.el
+
 (package! ess)
 (package! ess-smart-equals)
 (package! ess-R-data-view)