Support Julia and Haskell.

diff --git a/emacs/.emacs b/emacs/.emacs
index dc80310786c114deb9dc2e9496a55c56f02aa242..a72a0167888902c0141816b44aa55eba550ac21a 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -11,6 +11,7 @@
 (autoload 'R-mode "ess-site.el" "Major mode for editing R source." t)
 (setq load-path (cons "/usr/share/emacs/site-lisp/ess" load-path))
 (load "/usr/share/emacs/site-lisp/ess/lisp/ess-site")
 (autoload 'R-mode "ess-site.el" "Major mode for editing R source." t)
 (setq load-path (cons "/usr/share/emacs/site-lisp/ess" load-path))
 (load "/usr/share/emacs/site-lisp/ess/lisp/ess-site")

+(setq inferior-julia-program-name "/usr/bin/julia")

 
 ;; enable autocomplete
 (add-hook 'after-init-hook 'global-company-mode)
 
 ;; enable autocomplete
 (add-hook 'after-init-hook 'global-company-mode)


@@ -48,7 +49,8 @@
       ("\\.py\\'" . python-mode)
       ("\\.R\\'" . R-mode)
       ("\\.org\\'" . org-mode)
       ("\\.py\\'" . python-mode)
       ("\\.R\\'" . R-mode)
       ("\\.org\\'" . org-mode)

-      ("\\.sh\\'" . shell-script-mode)))
+      ("\\.sh\\'" . shell-script-mode)
+      ("\\.hs\\'" . haskell-mode)))

 
 ;; Enable the melpa archive for packages
 (require 'package)
 
 ;; Enable the melpa archive for packages
 (require 'package)


@@ -66,7 +68,7 @@
  '(browse-url-browser-function 'browse-url-firefox)
  '(org-export-backends '(ascii html icalendar latex md odt))
  '(package-selected-packages
  '(browse-url-browser-function 'browse-url-firefox)
  '(org-export-backends '(ascii html icalendar latex md odt))
  '(package-selected-packages

-   '(elfeed-protocol ack company magit auctex lsp-mode elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess)))
+   '(haskell-mode julia-mode elfeed-protocol ack company magit auctex lsp-mode elpy ## org htmlize leuven-theme lua-mode ess-smart-underscore ess-R-data-view ess)))

 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.


@@ -115,4 +117,4 @@
 (setq mu4e-sent-folder   "/Sent"
       mu4e-drafts-folder "/Drafts"
       mu4e-trash-folder  "/Trash")
 (setq mu4e-sent-folder   "/Sent"
       mu4e-drafts-folder "/Drafts"
       mu4e-trash-folder  "/Trash")

-              
\ No newline at end of file
+