1 files changed, 19 insertions, 11 deletions

diff --git a/.emacs b/.emacs
index 3f7c28b..5ab06e9 100644
--- a/.emacs
+++ b/.emacs
@@ -15,6 +15,10 @@
 ;; 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")))))
 
 ;;(setq require-final-newline t)
@@ -32,6 +36,8 @@
 ;; Various
 (setq auto-save-default nil)
 (setq make-backup-files nil)
+(setq display-time-24hr-format t)
+(display-time-mode 1)
 
 ;; UTF-8 support (legacy workaround for Ubuntu)
 (set-default-coding-systems 'utf-8)
@@ -47,24 +53,26 @@
 ;; Default coding style
 (setq c-default-style "bsd")
 
-;; 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")
+;; Don't attempt to guess the Python-indent
+(setq python-indent-guess-indent-offset nil)
 
 
-;; Python stuff
+;; Custom plugins
+(add-to-list 'load-path "~/.emacs.d/lisp/")
 
-;; Don't attempt to guess the indent
-(setq python-indent-guess-indent-offset nil)
+;;PHP
+(autoload 'php-mode "php-mode" "Mode for editing PHP source files")
+(add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode))
 
-;; (require 'pymacs)   
+;; yasnippet
+(require 'yasnippet)
+(yas-global-mode 1)
+(yas/load-directory "~/.emacs.d/snippets")
+
+;; Python stuff
 ;; (pymacs-load "ropemacs" "rope-")   
 ;; (setq ropemacs-enable-autoimport t)
 
-
 ;; CUA mode
 ;;(cua-mode t)
 ;;(setq cua-auto-tabify-rectangles nil)