add autocomplete, enable server-use-tcp

This commit is contained in:
Ivan Malison 2014-10-08 04:02:27 -07:00
parent f60b39bb4e
commit f6c9f8c638
2 changed files with 14 additions and 18 deletions

3
.gitignore vendored
View File

@ -13,4 +13,5 @@ elpa/*
.dir-locals.el .dir-locals.el
.mc-lists.el .mc-lists.el
.python-environments/ .python-environments/
tramp tramp
server

29
init.el
View File

@ -43,7 +43,8 @@
paredit inf-ruby undo-tree rainbow-delimiters paredit inf-ruby undo-tree rainbow-delimiters
smex solarized-theme zenburn-theme smex solarized-theme zenburn-theme
scala-mode2 ensime monokai-theme scala-mode2 ensime monokai-theme
gitconfig-mode jedi flymake-cursor pytest) gitconfig-mode jedi flymake-cursor pytest
auto-complete)
"Packages that must be installed at launch.") "Packages that must be installed at launch.")
(defun ensure-package-installed (packages) (defun ensure-package-installed (packages)
@ -74,6 +75,9 @@ Return a list of installed packages or nil for every package not installed."
;; Fuck auto fill mode ;; Fuck auto fill mode
(auto-fill-mode -1) (auto-fill-mode -1)
;; This makes it so that emacs --daemon creates server files in ~/.emacs.d/server
(setq server-use-tcp t)
;; Enable ido mode. ;; Enable ido mode.
(require 'ido) (require 'ido)
(ido-mode t) (ido-mode t)
@ -191,7 +195,6 @@ Return a list of installed packages or nil for every package not installed."
;; Multi-lining for python. ;; Multi-lining for python.
(require 'multi-line-it) (require 'multi-line-it)
(require 'emacs-testify)
(require 'pytest) (require 'pytest)
(add-hook 'python-mode-hook (lambda () (setq show-trailing-whitespace t))) (add-hook 'python-mode-hook (lambda () (setq show-trailing-whitespace t)))
@ -211,6 +214,11 @@ Return a list of installed packages or nil for every package not installed."
(fset 'ipdb "import ipdb; ipdb.set_trace()") (fset 'ipdb "import ipdb; ipdb.set_trace()")
(fset 'main "if __name__ == '__main__':") (fset 'main "if __name__ == '__main__':")
(global-auto-complete-mode)
;; Macros
(fset 'ipdb "import ipdb; ipdb.set_trace()")
;; ============================================================================= ;; =============================================================================
;; JavaScript ;; JavaScript
;; ============================================================================= ;; =============================================================================
@ -224,12 +232,6 @@ Return a list of installed packages or nil for every package not installed."
(add-hook 'scala-mode-hook (lambda () (subword-mode 1))) (add-hook 'scala-mode-hook (lambda () (subword-mode 1)))
;; =============================================================================
;; Starter Kits
;; =============================================================================
;;(load-file "~/.emacs.d/emacs-for-python/epy-init.el")
;; ============================================================================= ;; =============================================================================
;; Custom Key Bindings ;; Custom Key Bindings
;; ============================================================================= ;; =============================================================================
@ -242,7 +244,8 @@ Return a list of installed packages or nil for every package not installed."
;; Miscellaneous ;; Miscellaneous
(global-set-key (kbd "C-x C-b") 'buffer-menu) (global-set-key (kbd "C-x C-b") 'buffer-menu)
(global-set-key (kbd "C-c w") 'whitespace-mode) (global-unset-key (kbd "C-o"))
(global-set-key (kbd "C-x w") 'whitespace-mode)
(global-set-key (kbd "C-x C-r") (lambda () (interactive) (revert-buffer t t))) (global-set-key (kbd "C-x C-r") (lambda () (interactive) (revert-buffer t t)))
(global-set-key (kbd "M-g") 'goto-line) (global-set-key (kbd "M-g") 'goto-line)
(global-set-key (kbd "C-c C-c") 'comment-dwim) (global-set-key (kbd "C-c C-c") 'comment-dwim)
@ -250,8 +253,6 @@ Return a list of installed packages or nil for every package not installed."
(global-set-key (kbd "C-c C-o") 'testify-run-case) (global-set-key (kbd "C-c C-o") 'testify-run-case)
(global-set-key (kbd "C-c e") 'os-copy) (global-set-key (kbd "C-c e") 'os-copy)
(global-set-key (kbd "C-x O") (lambda () (interactive) (other-window -1))) (global-set-key (kbd "C-x O") (lambda () (interactive) (other-window -1)))
(global-set-key (kbd "C-c t") 'testify-run-test)
(global-set-key (kbd "C-c C-t") 'testify-run-case)
(global-set-key (kbd "C-x C-c") 'kill-emacs) (global-set-key (kbd "C-x C-c") 'kill-emacs)
(global-set-key (kbd "C-c +") 'message-buffer-name) (global-set-key (kbd "C-c +") 'message-buffer-name)
@ -259,9 +260,6 @@ Return a list of installed packages or nil for every package not installed."
(global-unset-key (kbd "C-o")) (global-unset-key (kbd "C-o"))
;; Macros
(fset 'ipdb "import ipdb; ipdb.set_trace()")
;; Multiple Cursors ;; Multiple Cursors
(global-set-key (kbd "C-x r t") 'mc/edit-lines) (global-set-key (kbd "C-x r t") 'mc/edit-lines)
@ -335,6 +333,3 @@ Return a list of installed packages or nil for every package not installed."
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(reb-re-syntax (quote string)) '(reb-re-syntax (quote string))
'(safe-local-variable-values (quote ((use-python-tabs . t) (python-indent . 4) (whitespace-line-column . 80) (lexical-binding . t))))) '(safe-local-variable-values (quote ((use-python-tabs . t) (python-indent . 4) (whitespace-line-column . 80) (lexical-binding . t)))))
(load-file "~/.emacs.d/emacs-for-python/epy-init.el")