Skip to content

Commit

Permalink
emacs: remove irony-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
oblique committed Nov 9, 2014
1 parent 08ae057 commit ca7f771
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 25 deletions.
24 changes: 0 additions & 24 deletions .emacs.d/init.el
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .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")

Expand Down

0 comments on commit ca7f771

Please sign in to comment.