summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el15
1 files changed, 10 insertions, 5 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 9331504..00f4e78 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -163,7 +163,16 @@
'(("ryuslash@gmail.com"
(:network-server . "talk.google.com")
(:connection-type . ssl))))
-
+
+;;; X11
+(when window-system
+ (setq linum-format " %d")
+ (global-unset-key "\C-z"))
+
+;;; CLI
+(when (not window-system)
+ (setq linum-format "%d "))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; AUTOLOADS ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -218,10 +227,6 @@
(setq initial-frame-alist ; initial frame settings
(append '((font . "DejaVu Sans Mono-11:antialias=true"))))
-(if window-system
- (x-init)
- (cli-init))
-
(fset 'yes-or-no-p 'y-or-n-p) ; switch yes or no to y or n
(tool-bar-mode -1) ; no toolbar