summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
authorSimeon Simeonov2016-03-03 10:45:20 +0100
committerSimeon Simeonov2016-03-03 10:45:20 +0100
commita6a2922c75fa06fb2496d2ba59520a121205fd26 (patch)
tree88216e56eef5574249eb7debdfadf4cf494d3947 /.emacs
parent481decd28b7940d1dae11fd0ff2dc06143c46ee8 (diff)
Handle .ino files with c++-mode. Upgrade yasnippet and yaml.
Diffstat (limited to '.emacs')
-rw-r--r--.emacs11
1 files changed, 7 insertions, 4 deletions
diff --git a/.emacs b/.emacs
index a962b73..d7bfecc 100644
--- a/.emacs
+++ b/.emacs
@@ -57,6 +57,9 @@
57;; Don't attempt to guess the Python-indent 57;; Don't attempt to guess the Python-indent
58(setq python-indent-guess-indent-offset nil) 58(setq python-indent-guess-indent-offset nil)
59 59
60;; Bind .ino (Arduino project) extension to C++ mode
61(add-to-list 'auto-mode-alist '("\\.ino\\'" . c++-mode))
62
60;; Enable which-function-mode for C, C++ and Python 63;; Enable which-function-mode for C, C++ and Python
61(setq which-func-modes '(c-mode c++-mode java-mode python-mode)) 64(setq which-func-modes '(c-mode c++-mode java-mode python-mode))
62(which-function-mode t) 65(which-function-mode t)
@@ -65,12 +68,12 @@
65(add-to-list 'load-path "~/.emacs.d/lisp/") 68(add-to-list 'load-path "~/.emacs.d/lisp/")
66 69
67;; PHP 70;; PHP
68;; (autoload 'php-mode "php-mode" "Mode for editing PHP source files") 71(autoload 'php-mode "php-mode" "Mode for editing PHP source files")
69;; (add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode)) 72(add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode))
70 73
71;; YAML 74;; YAML
72;; (require 'yaml-mode) 75(require 'yaml-mode)
73;; (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) 76(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
74 77
75;; yasnippet 78;; yasnippet
76(require 'yasnippet) 79(require 'yasnippet)