Permalink
Browse files

Cleaned up more errors.

  • Loading branch information...
Enrico Franchi Enrico Franchi
Enrico Franchi authored and Enrico Franchi committed Jan 31, 2011
1 parent bbc581a commit 03dacbc89043966be20db283cd8d610727eeb9e1
Showing with 18 additions and 19 deletions.
  1. +8 −8 emacs
  2. +10 −11 emacs.d/more-libraries.el
View
16 emacs
@@ -38,9 +38,9 @@
;; (global-set-key (kbd "M-z") 'undo) ;UNDO
;; (global-set-key (kbd "M-y") 'repeat) ;REPEAT
;; (global-set-key (kbd "M-o") 'find-file) ;OPEN
-;; (global-set-key (kbd "M-s") 'save-buffer) ;SAVE
+;; (global-set-key (kbd "M-s") 'save-buffer) ;SAVE
;; (global-set-key (kbd "<f1>") 'execute-extended-command) ;;M-x
-;; (global-set-key (kbd "M-a") 'mark-whole-buffer)
+;; (global-set-key (kbd "M-a") 'mark-whole-buffer)
;; (global-set-key (kbd "<f2>") 'ns-toggle-fullscreen)))
;; ;LINUX SPECIFIC SETTINGS
@@ -57,10 +57,10 @@
;; (global-set-key (kbd "C-z") 'undo) ;UNDO
;; (global-set-key (kbd "C-y") 'repeat) ;REPEAT
;; (global-set-key (kbd "C-o") 'find-file) ;OPEN
-;; (global-set-key (kbd "C-s") 'save-buffer) ;SAVE
+;; (global-set-key (kbd "C-s") 'save-buffer) ;SAVE
;; (global-set-key (kbd "<f1>") 'execute-extended-command) ;;M-x
-;; (global-set-key (kbd "C-a") 'mark-whole-buffer) ;SELECT ALL
-;; (global-set-key (kbd "<f2>") 'my-toggle-fullscreen))) ;FULLSCREEN
+;; (global-set-key (kbd "C-a") 'mark-whole-buffer) ;SELECT ALL
+;; (global-set-key (kbd "<f2>") 'my-toggle-fullscreen))) ;FULLSCREEN
; ** ERGO EMACS
@@ -256,7 +256,7 @@
(setq load-path (cons "~/.emacs.d/" load-path))
(when (macosx-p)
- (load-library "apple-cus"))
+ (load-library "apple-cus"))
(load-library "more-libraries")
@@ -274,8 +274,8 @@
(my-color)
(hl-line-mode)
(if (boundp 'riko-preferred-font)
- (set-face-font
- 'default
+ (set-face-font
+ 'default
riko-preferred-font)))
(if window-system
View
@@ -526,14 +526,13 @@
;; ERLANG
;; FIXME this should use paths!
-(when macosx-p
- (setq *base-erlang* "/usr/local/lib/erlang/")
- (setq *erlang-tools-version* "2.6.5")
- (push (concat *base-erlang*
- "lib/tools-" *erlang-tools-version*
- "/emacs/")
- load-path)
- (setq erlang-root-dir *base-erlang*)
- (push (concat *base-erlang* "bin")
- exec-path)
- (require 'erlang-start))
+(setq *base-erlang* "/usr/local/lib/erlang/")
+(setq *erlang-tools-version* "2.6.5")
+(push (concat *base-erlang*
+ "lib/tools-" *erlang-tools-version*
+ "/emacs/")
+ load-path)
+(setq erlang-root-dir *base-erlang*)
+(push (concat *base-erlang* "bin")
+ exec-path)
+(ignore-errors (require 'erlang-start))

0 comments on commit 03dacbc

Please sign in to comment.