 ;;       (cons '("\\.m$" . octave-mode) auto-mode-alist))
 
 (load-library "matlab-load")
-(custom-set-variables
- '(matlab-shell-command-switches '("-nodesktop -nosplash")))
+
 (add-hook 'matlab-mode
           (lambda ()
             (auto-complete-mode 1)


;; ;; python ;;
;; ;; ipython as shell
;; (require 'ipython)
;; ;; python-mode
;; (require 'python-mode)
;; (autoload 'python-mode "python-mode" "Python editing mode." t)
;; ;; jedi completion
;; (add-hook 'python-mode-hook 'jedi:setup)
(autoload 'python-mode "python-mode")
(elpy-enable)
(elpy-use-ipython)
(setq elpy-rpc-python-command "/usr/bin/ipython")
;; Sometimes you have to
(require 'php-mode)


(define-key yas-minor-mode-map [(shift tab)] 'yas-next-field)
(define-key yas-minor-mode-map [(control tab)] 'yas-prev-field)
(yas-global-mode 1)

; auto-yasnippet
(require 'auto-yasnippet)
(global-set-key (kbd "C-c ~") 'aya-create)
(global-set-key (kbd "C-c C-~") 'aya-expand)


;; text completion

