Auto commit by The Sugar System.

[sugar.git] / dot-files / _emacs_el

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 98ab408092c9916c644f12ce8ccfdbd40fa06076..e8508e6620220a91c1a19bd937ec846d4de348f1 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -196,6 +196,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 +644,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 +659,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)))