move ess configuration out and load it

diff --git a/.emacs b/.emacs
index 672e569c2058286d6fd12a8a2ada2c170a3fabb8..30b1f557b4e49b7f23e44c844336165d70d1b7b5 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -356,14 +356,6 @@ Argument DESCRIPTION MIME description."
  ;; If there is more than one, they won't work right.
  '(menu ((((type x-toolkit)) (:background "black" :foreground "grey90")))))
 
-(defun ess-change-directory (path)
-  "Set the current working directory to PATH for both *R* and Emacs."
-  (interactive "DDirectory to change to: ")
-
-  (when (file-exists-p path)
-    (ess-command (concat "setwd(\"" path "\")\n"))
-    ;; use file-name-as-directory to ensure it has trailing /
-    (setq default-directory (file-name-as-directory path))))
 
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
@@ -376,23 +368,11 @@ Argument DESCRIPTION MIME description."
 (add-hook 'c-mode-common-hook 'flyspell-prog-mode)
 (add-hook 'cperl-mode-hook 'flyspell-prog-mode)
 (add-hook 'tcl-mode-hook 'flyspell-prog-mode)
-(add-hook 'ess-mode-hook 'flyspell-prog-mode)
 (defun turn-on-flyspell ()
    "Force flyspell-mode on using a positive arg.  For use in hooks."
    (interactive)
    (flyspell-mode 1))
 
-;;; outlining support for ess modes
-(add-hook 'ess-mode-hook
-      '(lambda ()
-         (outline-minor-mode)
-         (setq outline-regexp "\\(^#\\{4,5\\} \\)\\|\\(^[a-zA-Z0-9_\.]+ ?<- ?function\\)")
-         (defun outline-level ()
-           (cond ((looking-at "^##### ") 1)
-             ((looking-at "^#### ") 2)
-             ((looking-at "^[a-zA-Z0-9_\.]+ ?<- ?function(.*{") 3)
-             (t 1000)))
-         ))
 
  ; Outline-minor-mode key map
  (define-prefix-command 'cm-map nil "Outline-")
@@ -559,6 +539,9 @@ Argument DESCRIPTION MIME description."
 
 ; require org mode
 (load "org-mode-configuration")
+; ess configuration
+(load "ess_remote_eval")
+(load "ess_configuration")
 
 ; apparently things like to step on C-;, so we'll use a hack from
 ; http://stackoverflow.com/questions/683425/globally-override-key-binding-in-emacs/5340797#5340797 to fix this