mirror of
https://github.com/larstvei/dot-emacs.git
synced 2024-11-26 07:28:31 +00:00
Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
95ceb0dcf5
4
init.el
4
init.el
@ -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
|
||||||
|
4
init.org
4
init.org
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user