Skip to content

Commit

Permalink
update configs
Browse files Browse the repository at this point in the history
  • Loading branch information
alexott committed Oct 26, 2012
1 parent 4fb19e9 commit 7aad181
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 23 deletions.
3 changes: 2 additions & 1 deletion rc/emacs-rc-autocomplete.el
Expand Up @@ -4,7 +4,8 @@
;;
;; Author: Alex Ott <alexott@gmail.com>


(require 'auto-complete-config)
(ac-config-default)
(setq ac-auto-start nil)
(define-key ac-mode-map (kbd "C-TAB") 'auto-complete)

Expand Down
2 changes: 0 additions & 2 deletions rc/emacs-rc-cedet.el
Expand Up @@ -215,5 +215,3 @@

(require 'cedet-java)
(require 'semantic/db-javap)
(add-to-list 'semanticdb-javap-classpath (cedet-java-find-jdk))

10 changes: 10 additions & 0 deletions rc/emacs-rc-erlang.el
Expand Up @@ -27,4 +27,14 @@
(progn
(setq erlang-skel-mail-address "alexott@gmail.com")))

(when (locate-library "distel")
(require 'distel)
(distel-setup))

(setq alexott/wrangler-path (file-name-as-directory (expand-file-name "~/projects/wrangler")))
(when (file-exists-p alexott/wrangler-path)
(add-to-list 'load-path (concat alexott/wrangler-path "elisp"))
(require 'wrangler)
)

;;; emacs-rc-erlang.el ends here
6 changes: 2 additions & 4 deletions rc/emacs-rc-jabber.el
Expand Up @@ -30,7 +30,8 @@
(add-hook 'jabber-post-connect-hooks 'alexott/jabber-connect-hook)

(defun alexott/jabber-chat-hook ()
(auto-fill-mode -1))
(auto-fill-mode -1)
(flyspell-mode -1))
(add-hook 'jabber-chat-mode-hook 'alexott/jabber-chat-hook)

(require 'jabber-chatbuffer)
Expand Down Expand Up @@ -58,9 +59,6 @@
"home")))

(setq jabber-chat-buffer-show-avatar nil)
;; (setq jabber-vcard-avatars-retrieve nil
;; jabber-vcard-avatars-publish nil
;; )

(custom-set-variables
'(jabber-auto-reconnect t)
Expand Down
6 changes: 4 additions & 2 deletions rc/emacs-rc-javascript.el
Expand Up @@ -16,7 +16,9 @@
(setq js2-basic-offset 2)
(setq js2-use-font-lock-faces t)

(add-to-list 'load-path "~/emacs/ejacs")
(autoload 'js-console "js-console" nil t)
(defun alexott/js2-mode-hook ()
(local-set-key [return] 'newline-and-indent)
)
(add-hook 'js2-mode-hook 'alexott/js2-mode-hook)

;;; emacs-rc-javascript.el ends here
2 changes: 1 addition & 1 deletion rc/emacs-rc-org-mode.el
Expand Up @@ -60,7 +60,7 @@
(add-hook 'org-mode-hook 'turn-on-font-lock)

;; blorg mode
(require 'blorg)
;;(require 'blorg)

;; diary setup
(require 'diary-lib)
Expand Down
1 change: 1 addition & 0 deletions rc/emacs-rc-vcs-misc.el
Expand Up @@ -14,5 +14,6 @@

;;(setq vc-handled-backends nil)

(setq vc-follow-symlinks t)

;;; emacs-rc-vcs-misc.el ends here
19 changes: 6 additions & 13 deletions rc/emacs-rc-yasnippet.el
Expand Up @@ -3,24 +3,17 @@
;; Copyright (C) Alex Ott
;;
;; Author: Alex Ott <alexott@gmail.com>
;; Keywords:
;; Requirements:
;; Status: not intended to be distributed yet

;(add-to-list 'load-path "~/emacs/yasnippet")
;(require 'yasnippet) ;; not yasnippet-bundle
(yas/initialize)
(eval-after-load 'yasnippet
'(progn
(add-to-list 'yas/snippet-dirs "~/emacs/snippets/")
(yas/load-snippet-dirs)))

(require 'yasnippet)
(setq yas/snippet-dirs (append '("~/emacs/snippets/") yas/snippet-dirs))
(yas/global-mode 1)
;;(yas/reload-all)

;; hook for automatic reloading of changed snippets
(defun alexott/update-yasnippets-on-save ()
(when (string-match "/snippets/" buffer-file-name)
(yas/load-snippet-dirs)
;; (yas/reload-all)
;; (yas/load-snippet-dirs)
(yas/reload-all)
))
(add-hook 'after-save-hook 'alexott/update-yasnippets-on-save)

Expand Down

0 comments on commit 7aad181

Please sign in to comment.