From eb2f8b1a6dccd17e31bc486439bf72ee3e81e050 Mon Sep 17 00:00:00 2001
From: Simeon Simeonov
Date: Mon, 26 Oct 2015 12:08:33 +0100
Subject: Upgrade php-mode and yasnippet. Introduce which-function support in
 .emacs

---
 .emacs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to '.emacs')

diff --git a/.emacs b/.emacs
index fc619f9..c1e37f3 100644
--- a/.emacs
+++ b/.emacs
@@ -48,8 +48,8 @@
 ;; Programming section
 
 ;; Indentation
-;;(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil)
-(setq-default c-basic-offset 4 tab-width 4)
+(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil)
+;;(setq-default c-basic-offset 4 tab-width 4)
 
 ;; Default coding style
 (setq c-default-style "bsd")
@@ -57,13 +57,16 @@
 ;; Don't attempt to guess the Python-indent
 (setq python-indent-guess-indent-offset nil)
 
+;; Enable which-function-mode for C, C++ and Python
+(setq which-func-modes '(python-mode c-mode c++-mode))
+(which-function-mode t)
 
 ;; Custom plugins
 (add-to-list 'load-path "~/.emacs.d/lisp/")
 
 ;;PHP
-(autoload 'php-mode "php-mode" "Mode for editing PHP source files")
-(add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode))
+;; (autoload 'php-mode "php-mode" "Mode for editing PHP source files")
+;; (add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)" . php-mode))
 
 ;; YAML
 (require 'yaml-mode)
-- 
cgit v1.3