emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/ess: conform to code conventions; no-byte-compile packages.el

Browse source
This commit is contained in:
Henrik Lissner 2018-02-10 02:11:42 -05:00
parent eb685d7cc4
commit 8796a7407a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 48 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

86
modules/lang/ess/config.el
View file

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

3
modules/lang/ess/packages.el
View file

@ -1,3 +1,6 @@
;; -*- no-byte-compile: t; -*-
;;; lang/ess/packages.el
(package! ess) (package! ess)
(package! ess-smart-equals) (package! ess-smart-equals)
(package! ess-R-data-view) (package! ess-R-data-view)