summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
Diffstat (limited to '.emacs')
-rw-r--r--.emacs18
1 files changed, 5 insertions, 13 deletions
diff --git a/.emacs b/.emacs
index f0526be..594c445 100644
--- a/.emacs
+++ b/.emacs
@@ -54,6 +54,8 @@
54(set-terminal-coding-system 'utf-8) 54(set-terminal-coding-system 'utf-8)
55(set-keyboard-coding-system 'utf-8) 55(set-keyboard-coding-system 'utf-8)
56 56
57(put 'downcase-region 'disabled nil)
58
57 59
58;; Programming section 60;; Programming section
59 61
@@ -74,6 +76,7 @@
74(setq which-func-modes '(c-mode c++-mode java-mode python-mode)) 76(setq which-func-modes '(c-mode c++-mode java-mode python-mode))
75(which-function-mode t) 77(which-function-mode t)
76 78
79
77;; Custom plugins 80;; Custom plugins
78(add-to-list 'load-path "~/.emacs.d/lisp/") 81(add-to-list 'load-path "~/.emacs.d/lisp/")
79 82
@@ -82,8 +85,8 @@
82(add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode)) 85(add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode))
83 86
84;; Lua 87;; Lua
85;; (autoload 'lua-mode "lua-mode" "Lua editing mode." t) 88(autoload 'lua-mode "lua-mode" "Lua editing mode." t)
86;; (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode)) 89(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
87;;(add-to-list 'interpreter-mode-alist '("lua" . lua-mode)) 90;;(add-to-list 'interpreter-mode-alist '("lua" . lua-mode))
88 91
89;; YAML 92;; YAML
@@ -94,14 +97,3 @@
94(require 'yasnippet) 97(require 'yasnippet)
95(yas-global-mode 1) 98(yas-global-mode 1)
96(yas/load-directory "~/.emacs.d/snippets") 99(yas/load-directory "~/.emacs.d/snippets")
97
98;; Python stuff
99;; (pymacs-load "ropemacs" "rope-")
100;; (setq ropemacs-enable-autoimport t)
101
102;; CUA mode
103;;(cua-mode t)
104;;(setq cua-auto-tabify-rectangles nil)
105;;(transient-mark-mode 1)
106;;(cua-selection-mode t)
107(put 'downcase-region 'disabled nil)