X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=51180d719596504afe2e12743366806868b9e82d;hb=d83ff3012a0e117d8245c412804fdab56f261f21;hp=a5f47f821bc0a4445b1fa5d341c56c9d0570ff1a;hpb=530fdcb15a1fea55198cb2aae298f7d510c61dfb;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index a5f47f8..51180d7 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -21,6 +21,7 @@
 
 (global-set-key (kbd "C-\\" ) 'toggle-input-method)
 (global-set-key (kbd "C-RET") 'completion-at-point)
+(global-set-key (kbd "C-<return>") 'completion-at-point)
 
 (unless window-system
   (normal-erase-is-backspace-mode t))
@@ -141,6 +142,11 @@
       (color-theme-initialize)
       (color-theme-subtle-hacker)))
 
+;; multi-term
+(autoload 'multi-term "multi-term"
+  "Create new term buffer.
+Will prompt you shell name when you type `C-u' before this command." t)
+
 ;; auto-complete
 (require-if-present 'auto-complete-config)
 (if (featurep 'auto-complete-config)
@@ -196,6 +202,10 @@
 (autoload 'lua-mode "lua-mode" "Lua editing mode." t)
 (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
 
+;; protobuf-mode
+(autoload 'protobuf-mode "protobuf-mode")
+(add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
+
 ;; scala-mode2
 (add-to-list 'load-path "~/sandbox/_scala/scala-mode2")
 (require-if-present 'scala-mode2)
@@ -640,6 +650,7 @@
  '(tramp-default-method "sshx")
  '(uniquify-buffer-name-style (quote forward) nil (uniquify))
  '(uniquify-trailing-separator-p t)
+ '(vc-cvs-diff-switches (quote ("-u")))
  '(vc-cvs-stay-local nil)
  '(w3m-bookmark-file-coding-system (quote utf-8))
  '(w3m-coding-system (quote utf-8))
@@ -654,6 +665,7 @@
  '(w3m-output-coding-system (quote utf-8))
  '(w3m-terminal-coding-system (quote utf-8))
  '(w3m-use-cookies t)
+ '(whitespace-global-modes (quote (not mew-draft-mode mew-summary-mode)))
  '(whitespace-style
    (quote
     (face tabs trailing space-before-tab newline indentation empty space-after-tab)))
@@ -675,6 +687,7 @@
  '(textile-ol-bullet-face ((t (:foreground "dark orange"))))
  '(textile-ul-bullet-face ((t (:foreground "deep sky blue"))))
  '(which-func-face ((t (:background "black" :foreground "dark orange"))))
+ '(whitespace-empty ((t (:background "gray20" :foreground "firebrick"))))
  '(whitespace-indentation ((t (:foreground "dimgray" :underline t))))
  '(whitespace-line ((t (:background "gray20"))))
  '(whitespace-tab ((t (:background "grey22" :foreground "dim gray" :underline (:color foreground-color :style wave))))))