summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2011-05-27 21:41:12 +0200
committerGravatar Tom Willemsen2011-05-27 21:41:12 +0200
commit913844f26fbde56d9cfe180f19abe720709f427b (patch)
tree2b92e5c31af81607bcd7a22f8fbaff1afa031ad1
parentef439c0f3254b42ddea9589e64fc2c579facc0f0 (diff)
downloaddotfiles-913844f26fbde56d9cfe180f19abe720709f427b.tar.gz
dotfiles-913844f26fbde56d9cfe180f19abe720709f427b.zip
Only show ide-skel when X is running
-rw-r--r--emacs2
-rw-r--r--emacs.d/20-ide-skel.el16
2 files changed, 10 insertions, 8 deletions
diff --git a/emacs b/emacs
index 9d02acb..f3e280e 100644
--- a/emacs
+++ b/emacs
@@ -36,7 +36,7 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(org-agenda-files (quote ("~/documents/org/main.org")))
- '(safe-local-variable-values (quote ((ispell-local-dictionary . nl)))))
+ '(safe-local-variable-values (quote ((Mode . shell-script) (ispell-local-dictionary . nl)))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs.d/20-ide-skel.el b/emacs.d/20-ide-skel.el
index 32c9682..f1c06d4 100644
--- a/emacs.d/20-ide-skel.el
+++ b/emacs.d/20-ide-skel.el
@@ -1,8 +1,10 @@
-(require 'tabbar)
-(require 'ide-skel)
+(if window-system
+ (progn
+ (require 'tabbar)
+ (require 'ide-skel)
-(global-set-key [f10] 'ide-skel-toggle-left-view-window)
-(global-set-key [f11] 'ide-skel-toggle-bottom-view-window)
-(global-set-key [f12] 'ide-skel-toggle-right-view-window)
-(global-set-key [C-prior] 'tabbar-backward)
-(global-set-key [C-next] 'tabbar-forward)
+ (global-set-key [f10] 'ide-skel-toggle-left-view-window)
+ (global-set-key [f11] 'ide-skel-toggle-bottom-view-window)
+ (global-set-key [f12] 'ide-skel-toggle-right-view-window)
+ (global-set-key [C-prior] 'tabbar-backward)
+ (global-set-key [C-next] 'tabbar-forward)))