diff --git a/emacs.d/00-paths.el b/emacs.d/00-paths.el index 722b8c8..41f9a31 100644 --- a/emacs.d/00-paths.el +++ b/emacs.d/00-paths.el @@ -1,3 +1,4 @@ (add-to-list 'load-path "~/.emacs.d/elisp") (add-to-list 'load-path "~/.emacs.d/naquadah-theme") (add-to-list 'load-path "~/.emacs.d/auto-complete-clang") +(add-to-list 'load-path "~/.emacs.d/nxhtml") diff --git a/emacs.d/10-file-associations.el b/emacs.d/10-file-associations.el index 00084f4..52a7e23 100644 --- a/emacs.d/10-file-associations.el +++ b/emacs.d/10-file-associations.el @@ -3,6 +3,8 @@ (add-to-list 'auto-mode-alist '("\\.cs$" . csharp-mode)) (add-to-list 'auto-mode-alist '("\\.bat$" . batch-mode)) (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode)) +(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode)) +(add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . javascript-mode)) (add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8)) (add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8)) diff --git a/emacs.d/10-modules.el b/emacs.d/10-modules.el index 3db81b7..61c2533 100644 --- a/emacs.d/10-modules.el +++ b/emacs.d/10-modules.el @@ -1,6 +1,7 @@ (require 'minimap) (require 'naquadah-theme) ;(require 'auto-complete-clang) +(load "autostart.el") (autoload 'vala-mode "vala-mode" "A Major mode for editing Vala files" t) @@ -14,3 +15,5 @@ "batch-mode" "A Major mode for editing Batch files" t) (autoload 'lua-mode "lua-mode" "A Major mode for editing Lua files" t) +(autoload 'php-mode + "php-mode" "A Major mode for editing PHP files" t) diff --git a/emacs.d/20-org.el b/emacs.d/20-org.el index ccface5..6aa5b0a 100644 --- a/emacs.d/20-org.el +++ b/emacs.d/20-org.el @@ -1,12 +1,25 @@ (require 'org-crypt) -(setq org-todo-keywords '((sequence "TODO" "IN PROGRESS" "|" "DONE"))) +(setq org-todo-keywords '((sequence "TODO(t)" + "IN PROGRESS(p)" + "WAITING(w@/!)" + "|" + "DONE(d!/!)" + "CANCELLED(c@/!)"))) (setq org-ditaa-jar-path "/usr/share/java/ditaa/ditaa-0_9.jar") (setq org-babel-load-languages '((ditaa . t))) (setq org-confirm-babel-evaluate nil) (setq org-tags-exclude-from-inheritance '("crypt")) (setq org-crypt-key "33E8CC1CC4") ; GPG key used for encryption +(setq org-use-fast-todo-selection t) + +(setq org-todo-keyword-faces + '(("TODO" :foreground "red" :weight bold) + ("IN PROGRESS" :foreground "yellow" :weight bold) + ("DONE" :foreground "forest green" :weight bold) + ("WAITING" :foreground "orange" :weight bold) + ("CANCELLED" :foreground "orangered" :weight bold))) (global-set-key "\C-cl" 'org-store-link) (global-set-key "\C-cc" 'org-capture) diff --git a/emacs.d/30-django-mumamo.el b/emacs.d/30-django-mumamo.el new file mode 100644 index 0000000..456eea4 --- /dev/null +++ b/emacs.d/30-django-mumamo.el @@ -0,0 +1 @@ +(setq mumamo-background-colors nil) diff --git a/emacs.d/elisp/php-mode.el b/emacs.d/elisp/php-mode.el new file mode 100644 index 0000000..a8e34bf --- /dev/null +++ b/emacs.d/elisp/php-mode.el @@ -0,0 +1,291 @@ + + + + + + +
++File + + + + | ++Rev. + + | ++Age + + | ++Author + + | + ++Last log entry + + | + +|
---|---|---|---|---|---|
+ + + + +branches/ + + | + + + +3 | + +7 years | +turadg | + + +Initial import. + | + + + +|
+ + + + +tags/ + + | + + + +94 | + +2 years | +ashawley | + + +Remove typo tag. | + + + +|
+ + + + +trunk/ + + | + + + +97 | + +2 years | +ashawley | + + +Require add-log to avoid byte compilation warning +for add-log-current-defun-head… | + + + +
Copyright © 2010 Geeknet, Inc. All rights reserved. Terms of Use
+