Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
larstvei 2014-09-18 00:37:17 +02:00
commit 95ceb0dcf5
2 changed files with 2 additions and 6 deletions

View File

@ -137,6 +137,7 @@ PACKAGE is installed and the current version is deleted."
elscreen ; window session manager elscreen ; window session manager
expand-region ; Increase selected region by semantic units expand-region ; Increase selected region by semantic units
flx-ido ; flx integration for ido flx-ido ; flx integration for ido
idle-require ; load elisp libraries while Emacs is idle
ido-vertical-mode ; Makes ido-mode display vertically. ido-vertical-mode ; Makes ido-mode display vertically.
geiser ; GNU Emacs and Scheme talk to each other geiser ; GNU Emacs and Scheme talk to each other
haskell-mode ; A Haskell editing mode haskell-mode ; A Haskell editing mode
@ -761,9 +762,6 @@ the languages in ISPELL-LANGUAGES when invoked."
(defun c-setup () (defun c-setup ()
(local-set-key (kbd "C-c C-c") 'compile)) (local-set-key (kbd "C-c C-c") 'compile))
(require 'auto-complete-c-headers)
(add-to-list 'ac-sources 'ac-source-c-headers)
(add-hook 'c-mode-common-hook 'c-setup) (add-hook 'c-mode-common-hook 'c-setup)
;; Some statements in Java appear often, and become tedious to write ;; Some statements in Java appear often, and become tedious to write

View File

@ -198,6 +198,7 @@
elscreen ; window session manager elscreen ; window session manager
expand-region ; Increase selected region by semantic units expand-region ; Increase selected region by semantic units
flx-ido ; flx integration for ido flx-ido ; flx integration for ido
idle-require ; load elisp libraries while Emacs is idle
ido-vertical-mode ; Makes ido-mode display vertically. ido-vertical-mode ; Makes ido-mode display vertically.
geiser ; GNU Emacs and Scheme talk to each other geiser ; GNU Emacs and Scheme talk to each other
haskell-mode ; A Haskell editing mode haskell-mode ; A Haskell editing mode
@ -942,9 +943,6 @@
(defun c-setup () (defun c-setup ()
(local-set-key (kbd "C-c C-c") 'compile)) (local-set-key (kbd "C-c C-c") 'compile))
(require 'auto-complete-c-headers)
(add-to-list 'ac-sources 'ac-source-c-headers)
(add-hook 'c-mode-common-hook 'c-setup) (add-hook 'c-mode-common-hook 'c-setup)
#+END_SRC #+END_SRC