Переглянути джерело

indent html with 2 spaces, add buffer list leader key, move os specific config to load last

Josh Bicking 8 роки тому
батько
коміт
dd52b119f2
1 змінених файлів з 25 додано та 14 видалено
  1. 25 14
      emacs

+ 25 - 14
emacs

@@ -20,20 +20,12 @@
 (savehist-mode 1)
 (setq savehist-additional-variables '(kill-ring search-ring regexp-search-ring))
 
-;; system-specific configs
-(defun win-setup ()
-    (add-to-list 'exec-path "C:/Program Files (x86)/Aspell/bin/")
-    (setq ispell-program-name "aspell"))
-
-(defun linux-setup ()
-    ;; Magit
-    (require 'magit)
-    (require 'evil-magit)
-    (global-magit-file-mode))
-
-(cond ((eq system-type 'windows-nt) (win-setup))
-      ((eq system-type 'gnu/linux) (linux-setup))
-      (t (message "")))
+;; Indent HTML with 2 spaces
+    (add-hook 'sgml-mode-hook
+        (lambda ()
+          ;; Default indentation to 2, but let SGML mode guess, too.
+          (set (make-local-variable 'sgml-basic-offset) 2)
+          (sgml-guess-indent)))
 
 
 ;;;; Packages
@@ -210,6 +202,7 @@
 ;; Leader keybinds
 (evil-leader/set-key
  "d" 'diff-buffer-with-file
+ "b" 'buffer-menu
  "u" 'undo-tree-visualize
  "m" 'recentf-open-files
  "l" 'auto-fill-mode
@@ -217,6 +210,24 @@
  "g" 'magit-status
  "M-g" 'magit-dispatch-popup)
 
+
+;; System-specific configs
+(defun win-setup ()
+    (add-to-list 'exec-path "C:/Program Files (x86)/Aspell/bin/")
+    (setq ispell-program-name "aspell"))
+
+(defun linux-setup ()
+    ;; Magit
+    (require 'magit)
+    (setq evil-magit-state 'normal)
+    (require 'evil-magit)
+    (global-magit-file-mode))
+
+(cond ((eq system-type 'windows-nt) (win-setup))
+      ((eq system-type 'gnu/linux) (linux-setup))
+      (t (message "")))
+
+
 ;; TODO:
 ;; Go through the tutorials, skim the manuals
 ;; learning elisp