From ca7f771f846e09e9d2d3dbd9368602b66d532bed Mon Sep 17 00:00:00 2001 From: oblique Date: Sun, 9 Nov 2014 10:50:53 +0200 Subject: [PATCH] emacs: remove irony-mode --- .emacs.d/init.el | 24 ------------------------ .emacs.d/install_el-get.el | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 79707b9..0674766 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -41,28 +41,6 @@ (setq temporary-file-directory (format "/tmp/emacs-tmp-%s/" (user-real-login-name))) (make-directory temporary-file-directory t) -;; irony-mode -; Note: hit `C-c C-b' to open build menu -(when (and (require 'auto-complete nil t) - (require 'yasnippet nil t) - (require 'irony nil t)) - ;; the ac plugin will be activated in each buffer using irony-mode - (irony-enable 'ac) ; hit C-RET to trigger completion - - (defun c-hook-enable-irony () - "Enable the hooks in the preferred order: 'yas -> auto-complete -> irony'." - ;; be cautious, if yas is not enabled before (auto-complete-mode 1), overlays - ;; *may* persist after an expansion. - (yas/minor-mode-on) - (auto-complete-mode 1) - - ;; avoid enabling irony-mode in modes that inherits c-mode, e.g: php-mode - (when (member major-mode irony-known-modes) - (irony-mode 1))) - - (add-hook 'c++-mode-hook 'c-hook-enable-irony) - (add-hook 'c-mode-hook 'c-hook-enable-irony)) - ;; linum mode (global-linum-mode 1) (setq linum-disabled-modes-list @@ -494,8 +472,6 @@ or just one char if that's not possible" ) ; key bindings -(when (require 'auto-complete nil t) - (global-set-key (kbd "M-/") 'auto-complete)) (global-set-key (kbd "C-k") 'kill-whole-line) (global-set-key (kbd "M->") 'shifttext-tab-right) (global-set-key (kbd "M-<") 'shifttext-tab-left) diff --git a/.emacs.d/install_el-get.el b/.emacs.d/install_el-get.el index b1a8eb2..d5a4da5 100644 --- a/.emacs.d/install_el-get.el +++ b/.emacs.d/install_el-get.el @@ -1,4 +1,4 @@ -(setq my-packages '(irony-mode ggtags go-mode arduino-mode rainbow-mode markdown-mode)) +(setq my-packages '(ggtags go-mode arduino-mode rainbow-mode markdown-mode)) (add-to-list 'load-path "~/.emacs.d/el-get/el-get")