summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2013-01-28 00:43:57 +0100
committerGravatar Tom Willemsen2013-01-28 00:43:57 +0100
commit7d719f694b745151093db7da3ad9ee9c63483368 (patch)
treecb59d313f582f79d1d11a8904ea3cd4e353aeef1 /.emacs.d/init.el
parent5a1e9f2ea8ec2b7e625539ee2bd4006dce269eb2 (diff)
downloaddotfiles-7d719f694b745151093db7da3ad9ee9c63483368.tar.gz
dotfiles-7d719f694b745151093db7da3ad9ee9c63483368.zip
Move eshell settings to org
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el6
1 files changed, 0 insertions, 6 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index ac10520..979c0f5 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -23,7 +23,6 @@
"Face for the supposedly empty line in commit messages."
:group 'local)
-(eval-after-load "em-term" '(add-to-list 'eshell-visual-commands "unison"))
(eval-after-load "emms-source-file" '(oni:emms-init))
(eval-after-load "flymake" '(oni:flymake-init))
(eval-after-load "ido" '(oni:ido-init))
@@ -107,9 +106,6 @@
(setq erc-nick "ryuslash")
(setq erc-timestamp-format "[%H:%M] ")
(setq erc-timestamp-only-if-changed-flag nil)
-(setq eshell-highlight-prompt nil)
-(setq eshell-prompt-function 'oni:eshell-prompt-function)
-(setq eshell-prompt-regexp "^[#$]> ")
(setq fci-rule-color "darkred")
(setq flymake-gui-warnings-enabled nil)
(setq flymake-info-line-regexp
@@ -235,7 +231,6 @@
(add-hook 'diary-display-hook 'oni:diary-display-func)
(add-hook 'emacs-lisp-mode-hook 'oni:emacs-lisp-mode-func)
(add-hook 'erc-mode-hook 'oni:erc-mode-func)
-(add-hook 'eshell-mode-hook 'oni:eshell-mode-func)
(add-hook 'flymake-mode-hook 'oni:flymake-mode-func)
(add-hook 'go-mode-hook 'oni:go-mode-func)
(add-hook 'gtags-mode-hook 'oni:gtags-mode-func)
@@ -275,7 +270,6 @@
(global-set-key (kbd "<f5>") 'ext:reload-buffer)
(global-set-key (kbd "<f6>") 'jabber-switch-to-roster-buffer)
(global-set-key (kbd "<f7>") 'magit-status)
-(global-set-key (kbd "<f8>") 'oni:raise-eshell)
(global-set-key (kbd "C-<") 'oni:indent-shift-left)
(global-set-key (kbd "C->") 'oni:indent-shift-right)
(global-set-key (kbd "C-M-4") 'split-window-vertically)