1 files changed, 36 insertions, 44 deletions

diff --git a/.emacs b/.emacs
index b6b1f57..3f7c28b 100644
--- a/.emacs
+++ b/.emacs
@@ -3,78 +3,70 @@
 ;; under X, instead of the default, backspace behavior.
 (global-set-key [delete] 'delete-char)
 (global-set-key [kp-delete] 'delete-char)
-;;(global-set-key (read-kbd-macro "C-c <") 'end-of-buffer)
-(global-set-key [f1] 'comment-region)
-(global-set-key [f2] 'uncomment-region)
-;;(global-set-key "C-<<" 'end-of-buffer)
-
 
 ;; My own key bindings ;;
 ;;(global-set-key [f1] 'compile)
-;;(global-set-key [f2] 'delete-other-windows)
-
 
 ;; Turn on font-lock mode for Emacs
 (global-font-lock-mode t)
 
+;; custom-set-faces was added by Custom.
+;; If you edit it by hand, you could mess it up, so be careful.
+;; Your init file should contain only one such instance.
+;; If there is more than one, they won't work right.
+(custom-set-faces
+ '(font-lock-comment-face ((nil (:foreground "red")))))
 
-
-;; Always end a file with a newline
 ;;(setq require-final-newline t)
 (setq require-final-newline nil)
-
-
-(setq auto-save-default nil)
-(setq default-tab-width 4)
-(setq make-backup-files nil)
+;; Stop at the end of the file, not just add lines
+(setq next-line-add-newlines nil)
 
 ;; Display columns
 (setq column-number-mode t)
-
 (setq inhibit-splash-screen t)
 
-;; indent to spaces only
-(setq-default indent-tabs-mode nil)
-
-;; Stop at the end of the file, not just add lines
-(setq next-line-add-newlines nil)
-
-
-;; Customized font-lock-comment-face
-(custom-set-variables
-  ;; custom-set-variables was added by Custom.
-  ;; If you edit it by hand, you could mess it up, so be careful.
-  ;; Your init file should contain only one such instance.
-  ;; If there is more than one, they won't work right.
- )
-(custom-set-faces
-  ;; custom-set-faces was added by Custom.
-  ;; If you edit it by hand, you could mess it up, so be careful.
-  ;; Your init file should contain only one such instance.
-  ;; If there is more than one, they won't work right.
- '(font-lock-comment-face ((nil (:foreground "red")))))
+;; vim-Scroll 
+(setq scroll-conservatively 1)
 
+;; Various
+(setq auto-save-default nil)
+(setq make-backup-files nil)
 
-;; Needed in Ubuntu
+;; UTF-8 support (legacy workaround for Ubuntu)
 (set-default-coding-systems 'utf-8)
 (set-terminal-coding-system 'utf-8)
 (set-keyboard-coding-system 'utf-8)
 
-;; vim-Scroll 
-(setq scroll-conservatively 1)
 
+;; Programming section
 
-;; (require 'pymacs)   
-;; (pymacs-load "ropemacs" "rope-")   
-;; (setq ropemacs-enable-autoimport t)
+;; Indentation
+(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil)
 
+;; Default coding style
+(setq c-default-style "bsd")
 
-;; (yas/initialize)
+;; yasnippet
+(yas/initialize)
 ;; (setq yas/root-directory '("~/.emacs.d/mysnippets"
 ;;                            "/usr/share/emacs/site-lisp/yasnippet/snippets"))
 ;; (mapc 'yas/load-directory yas/root-directory)
 (yas/load-directory "~/.emacs.d/mysnippets")
 
 
-(setq c-default-style "bsd"
-          c-basic-offset 2)
+;; Python stuff
+
+;; Don't attempt to guess the indent
+(setq python-indent-guess-indent-offset nil)
+
+;; (require 'pymacs)   
+;; (pymacs-load "ropemacs" "rope-")   
+;; (setq ropemacs-enable-autoimport t)
+
+
+;; CUA mode
+;;(cua-mode t)
+;;(setq cua-auto-tabify-rectangles nil)
+;;(transient-mark-mode 1)
+;;(cua-selection-mode t)