Permalink
Browse files

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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information...
2 parents f29a69a + 04eb139 commit 40d114e65749e732652b53523d0db2903072c9c4 @candera committed Mar 10, 2013
Showing with 11 additions and 6 deletions.
  1. +1 −1 clojure-mode
  2. +2 −2 colors.el
  3. +7 −2 init.el
  4. +1 −1 nrepl.el
View
@@ -33,10 +33,10 @@
:width normal))
((or (eq system-type 'cygwin))
'(:foundry "outline"
- :family "Bitstream Vera Sans Mono"
+ :family "Consolas"
:weight normal
:width normal
- :height 120))
+ :height 130))
((or (eq system-type 'gnu/linux))
'(:foundry "unknown"
:family "Courier 10 Pitch"
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))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -713,6 +713,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)
@@ -1089,8 +1090,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 40d114e

Please sign in to comment.