diff options
Diffstat (limited to '.emacs.d/init.el')
| -rw-r--r-- | .emacs.d/init.el | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 210d2a9..cf602ab 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,5 +1,6 @@ ;; -*- mode: Emacs-Lisp; -*- (load "~/.emacs.d/ryuslash-load-path") +(load-file "~/.emacs.d/functions.el") ;;; Autopair (require 'autopair) @@ -118,11 +119,18 @@ (gtags-mode t) (djcb-gtags-create-or-update))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; REQUIRES ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; PHP +(autoload 'php-mode "php-mode" "Major mode for PHP" t) +(setq-default php-warn-if-mumamo-off nil) ; don't warn me about this +(setq php-mode-force-pear t) +(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode)) +(add-hook 'php-mode-hook + (lambda () + (c-set-offset 'arglist-intro '+) + (c-set-offset 'arglist-close '0) + (local-set-key [f6] 'comment-line))) +(add-php-keywords) -(load-file "~/.emacs.d/functions.el") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; AUTOLOADS ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -131,7 +139,6 @@ (autoload 'sqlplus-mode "sqlplus" "Major mode for PL/SQL" t) (autoload 'batch-mode "batch-mode" "Major mode for Batch" t) (autoload 'lua-mode "lua-mode" "A Major mode for Lua" t) -(autoload 'php-mode "pi-php-mode" "Major mode for PHP" t) (autoload 'graphviz-dot-mode "graphviz-dot-mode" "Major mode for dot" t) (autoload 'cmake-mode "cmake-mode" "Major mode for CMake" t) (autoload 'rainbow-mode "rainbow-mode" "Minor mode for colors" t) @@ -156,7 +163,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (setq-default indent-tabs-mode nil) ; spaces, no tabs (setq-default truncate-lines t) ; don't wrap -(setq-default php-warn-if-mumamo-off nil) ; don't warn me about this (setq-default tab-width 4) (setq inhibit-startup-message t) ; Don't show welcome screen @@ -213,7 +219,6 @@ (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\\)?$" . js-mode)) (add-to-list 'auto-mode-alist '("CMakeLists\\.txt$" . cmake-mode)) (add-to-list 'auto-mode-alist '("\\.cmake$" . cmake-mode)) @@ -253,7 +258,6 @@ (add-hook 'c-mode-hook 'on-c-mode) (add-hook 'html-mode-hook 'on-html-mode) -(add-hook 'php-mode-hook 'on-php-mode) (add-hook 'message-mode-hook 'on-mail-mode) (add-hook 'git-commit-mode-hook 'auto-fill-mode) (add-hook 'css-mode-hook 'rainbow-mode) @@ -342,7 +346,6 @@ '(indent-region (point-min) (point-max))) (ad-activate 'server-create-window-system-frame) -(add-php-keywords) (add-html-keywords) (make-face 'font-lock-operator-face) (make-face 'font-lock-end-statement) |