Added auto-complete-clang and threw out some old stuff

This commit is contained in:
Tom Willemsen 2011-02-16 10:34:07 +01:00
parent c9d208a78d
commit f2356bef41
3 changed files with 13 additions and 11 deletions

3
.gitmodules vendored
View file

@ -7,3 +7,6 @@
[submodule "emacs.d/naquadah-theme"] [submodule "emacs.d/naquadah-theme"]
path = emacs.d/naquadah-theme path = emacs.d/naquadah-theme
url = git://git.naquadah.org/naquadah-theme.git url = git://git.naquadah.org/naquadah-theme.git
[submodule "emacs.d/auto-complete-clang"]
path = emacs.d/auto-complete-clang
url = git://github.com/brianjcj/auto-complete-clang.git

20
emacs
View file

@ -1,6 +1,7 @@
;; -*- mode: Emacs-Lisp; -*- ;; -*- mode: Emacs-Lisp; -*-
(add-to-list 'load-path "~/.emacs.d") (add-to-list 'load-path "~/.emacs.d")
(add-to-list 'load-path "~/.emacs.d/naquadah-theme") (add-to-list 'load-path "~/.emacs.d/naquadah-theme")
(add-to-list 'load-path "~/.emacs.d/auto-complete-clang")
;; Requires ;; Requires
(require 'uniquify) (require 'uniquify)
@ -8,10 +9,10 @@
(require 'color-theme) (require 'color-theme)
(require 'flymake) (require 'flymake)
(require 'color-theme-gruber-darker) (require 'color-theme-gruber-darker)
(require 'tabbar)
(require 'minimap) (require 'minimap)
(require 'column-marker) (require 'column-marker)
(require 'color-theme-weirdness) (require 'color-theme-weirdness)
(require 'auto-complete-clang)
;; Auto complete ;; Auto complete
(require 'auto-complete-config) (require 'auto-complete-config)
@ -52,8 +53,6 @@
; autosave file location ; autosave file location
inhibit-default-init t) inhibit-default-init t)
(setq-default indent-tabs-mode nil) ; spaces, no tabs (setq-default indent-tabs-mode nil) ; spaces, no tabs
;;(setq whitespace-line-column 80)
;;(setq whitespace-style '(face lines))
(fset 'yes-or-no-p 'y-or-n-p) ; switch yes or no answers to y or n (fset 'yes-or-no-p 'y-or-n-p) ; switch yes or no answers to y or n
; answers ; answers
@ -74,8 +73,6 @@
;; Keybindings ;; Keybindings
(global-set-key "\C-m" 'newline-and-indent) ; Automatically indent on newline (global-set-key "\C-m" 'newline-and-indent) ; Automatically indent on newline
(global-set-key (kbd "C-x n r") 'narrow-to-region ) (global-set-key (kbd "C-x n r") 'narrow-to-region )
(global-set-key [C-next] 'tabbar-forward )
(global-set-key [C-prior] 'tabbar-backward )
(global-set-key [C-tab] 'hs-toggle-hiding ) (global-set-key [C-tab] 'hs-toggle-hiding )
(global-set-key (kbd "<f9>") 'compile) (global-set-key (kbd "<f9>") 'compile)
@ -84,6 +81,7 @@
(add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode))
(add-to-list 'auto-mode-alist '("\\.cs$" . csharp-mode)) (add-to-list 'auto-mode-alist '("\\.cs$" . csharp-mode))
(add-to-list 'auto-mode-alist '("\\.bat$" . batch-mode)) (add-to-list 'auto-mode-alist '("\\.bat$" . batch-mode))
(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
(add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8)) (add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8))
(add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8)) (add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))
@ -91,8 +89,6 @@
(add-to-list 'compilation-finish-functions 'my-comp-finish-function) (add-to-list 'compilation-finish-functions 'my-comp-finish-function)
;; Color theme ;; Color theme
;(color-theme-weirdness2)
;(require 'naquadah-theme)
(require 'naquadah-theme) (require 'naquadah-theme)
;; Test for frame fonts ;; Test for frame fonts
@ -124,7 +120,10 @@
(add-hook 'c-mode-hook (add-hook 'c-mode-hook
(lambda () (lambda ()
(hs-minor-mode t) (hs-minor-mode t)
(column-marker-1 80))) (column-marker-1 80)
; (auto-complete-mode)
; (setq ac-sources '(ac-source-clang))
))
;;; CSS ;;; CSS
(add-hook 'css-mode-hook (add-hook 'css-mode-hook
(lambda () (lambda ()
@ -149,14 +148,13 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(tabbar-mode t nil (tabbar))) )
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(tabbar-selected ((t (:inherit tabbar-default :background "#1E2320" :foreground "#F0DFAF")))) )
'(tabbar-unselected ((nil (:background "#3F3F3F" :foreground "#DCDCCC")))))
;;; This was installed by package-install.el. ;;; This was installed by package-install.el.

@ -0,0 +1 @@
Subproject commit 9db79f4a88e22041c6cc1acfa834bb7ff8bec459