lang/ess: fix repl & doc lookup in ESS R/Julia

Also moves history files into doom-cache-dir
This commit is contained in:
Henrik Lissner 2019-02-15 19:38:49 -05:00
parent 33ef90343e
commit a246a90565
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 17 additions and 11 deletions

View file

@ -1,7 +1,11 @@
;;; lang/ess/autoload.el -*- lexical-binding: t; -*- ;;; lang/ess/autoload.el -*- lexical-binding: t; -*-
;;;###autoload ;;;###autoload
(defun +ess/r-repl () (defun +ess-repl-buffer (&optional start-args)
"Open the R REPL." "Returns an R/Julia REPL buffer."
(interactive) (interactive "P")
(inferior-ess nil nil t)) (pcase major-mode
('ess-r-mode (run-ess-r start-args))
((or 'julia-mode 'ess-julia-mode) (run-julia start-args))
(_ (inferior-ess nil nil t)))
(current-buffer))

View file

@ -10,12 +10,14 @@
(setq ess-offset-continued 'straight (setq ess-offset-continued 'straight
ess-expression-offset 2 ess-expression-offset 2
ess-nuke-trailing-whitespace-p t ess-nuke-trailing-whitespace-p t
ess-default-style 'DEFAULT) ess-default-style 'DEFAULT
ess-history-directory (expand-file-name "ess-history/" doom-cache-dir))
(add-hook 'ess-mode-hook #'display-line-numbers-mode) (add-hook 'ess-mode-hook #'display-line-numbers-mode)
(set-repl-handler! 'ess-mode #'+ess/r-repl) (set-repl-handler! '(ess-r-mode ess-julia-mode) #'+ess-repl-buffer)
(set-lookup-handlers! 'ess-mode :documentation #'ess-display-help-on-object) (set-lookup-handlers! '(ess-r-mode ess-julia-mode)
:documentation #'ess-display-help-on-object)
(map! (:after ess-help (map! (:after ess-help
:map ess-doc-map :map ess-doc-map
@ -44,10 +46,10 @@
"F" #'ess-eval-function-and-go "F" #'ess-eval-function-and-go
"f" #'ess-eval-function "f" #'ess-eval-function
;; predefined keymaps ;; predefined keymaps
"h" #'ess-doc-map "h" ess-doc-map
"x" #'ess-extra-map "x" ess-extra-map
"p" #'ess-r-package-dev-map "p" ess-r-package-dev-map
"v" #'ess-dev-map "v" ess-dev-map
;; noweb ;; noweb
:prefix "c" :prefix "c"
"C" #'ess-eval-chunk-and-go "C" #'ess-eval-chunk-and-go