Permalink
Browse files

Merge branch 'master' of github.com:candera/emacs

  • Loading branch information...
2 parents c6c3f49 + 40d114e commit 1a399572d551dd3c0556ade268ac82b4592dd555 Craig Andera committed Mar 12, 2013
Showing with 8 additions and 2 deletions.
  1. +1 −0 colors.el
  2. +7 −2 init.el
View
@@ -28,6 +28,7 @@
((or (eq system-type 'darwin) (eq system-type 'windows-nt))
'(:foundry "outline"
:family "Courier New"
+ :height 160
:weight normal
:width normal))
((or (eq system-type 'cygwin))
View
@@ -19,8 +19,8 @@
(require 'server)
(unless (or (eq system-type 'windows-nt)
(if (fboundp 'server-running-p)
- (server-running-p)
- server-process))
+ (server-running-p)
+ server-process))
(server-start))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -714,6 +714,7 @@ if the major mode is one of 'delete-trailing-whitespace-modes'"
; (highlight-parentheses-mode 1)
(linum-mode 1)
(paredit-mode 1)
+ (setq show-trailing-whitespace t)
(flyspell-mode 0)
(define-key clojure-mode-map "\C-c\C-e" 'lisp-eval-last-sexp)
(define-key clojure-mode-map "\C-x\C-e" 'lisp-eval-last-sexp)
@@ -1090,8 +1091,12 @@ if the major mode is one of 'delete-trailing-whitespace-modes'"
(add-to-list 'ac-dictionary-directories "~/.emacs.d.custom/auto-complete/dict")
(ac-config-default)
+;; Turn off automatic start of auto-complete
+(setq ac-auto-start nil)
+
(add-hook 'auto-complete-mode-hook
(lambda ()
+ (local-set-key (kbd "M-/") 'auto-complete)
(define-key ac-completing-map (kbd "C-n") 'ac-next)
(define-key ac-completing-map (kbd "C-p") 'ac-previous)
(define-key ac-completing-map (kbd "C-g") 'ac-stop)

0 comments on commit 1a39957

Please sign in to comment.