Cleanup, reorganize

diff --git a/init.el b/init.el
index c6687c3d74bf92ba02bf3eb6fe6c42c6b66c5080..ebeb16cc7048dbf3d999fabc6b765b1c2caab41c 100644 (file)
--- a/init.el
+++ b/init.el
@@ -28,18 +28,18 @@
 (add-hook 'c-mode-hook (lambda () (require 're-c-style)))
 \f
 ;; Tabs
-(setq-default indent-tabs-mode 'only
+(setq-default indent-tabs-mode t
              tab-width 8)
+
 (defvaralias 'c-basic-offset 'tab-width)
 (defvaralias 'cperl-indent-level 'tab-width)
 
 (add-hook 'prog-mode-hook
-         (lambda () (keymap-local-set "<TAB>" #'tab-to-tab-stop)))
+         (lambda () (keymap-local-set "<TAB>" #'self-insert-command)))
 
 (add-hook 'text-mode-hook
          (lambda ()
            (keymap-set text-mode-map "<TAB>" 'self-insert-command)))
-
 \f
 ;; Buffer dealiŋ
 (setq-default indicate-empty-lines t
@@ -50,14 +50,20 @@
 (size-indication-mode t)
 
 (setq delete-by-moving-to-trash t
-      delete-pair-blink-delay 0
-      delete-active-region nil
-      next-line-add-newlines t
-      scroll-conservatively 101)
-
-(setq disabled-command-function nil
-      save-interprogram-paste-before-kill t
-      confirm-kill-processes nil)
+         delete-pair-blink-delay 0
+         delete-active-region nil
+         next-line-add-newlines t
+         scroll-conservatively 101
+         ring-bell-function 'ignore
+         use-short-answers t
+         use-file-dialog nil
+         echo-keystrokes 0.1
+         eldoc-idle-delay 0
+         read-buffer-completion-ignore-case t
+         history-delete-duplicates t
+         disabled-command-function nil
+         save-interprogram-paste-before-kill t
+         confirm-kill-processes nil)
 \f
 ;; Recent Files/Buffers
 (midnight-mode t)
@@ -83,15 +89,6 @@
 \f
 ;; Bookmarks
 (setq bookmark-save-flag 1)
-
-(setq ring-bell-function 'ignore
-      use-short-answers t
-      use-file-dialog nil
-      echo-keystrokes 0.1
-      eldoc-idle-delay 0
-      eldoc-echo-area-use-multiline-p nil
-      read-buffer-completion-ignore-case t
-      history-delete-duplicates t)
 \f
 ;; GUI Settings
 (load-theme 'wobow-bow t)
@@ -105,13 +102,12 @@
       focus-follows-mouse t
       mouse-autoselect-window -0.25)
 
-(setq prettify-symbols-alist
-      '(("lambda" . 955)
-       ("delta" . 120517)
-       ("epsilon" . 120518)
-       ("->" . 8594)
-       ("<=" . 8804)
-       (">=" . 8805)))
+(setq prettify-symbols-alist '(("lambda" . 955)
+                              ("delta" . 120517)
+                              ("epsilon" . 120518)
+                              ("->" . 8594)
+                              ("<=" . 8804)
+                              (">=" . 8805)))
 
 (global-prettify-symbols-mode t)
 \f
@@ -119,12 +115,6 @@
 (setq show-paren-delay 0
       show-paren-style 'expression)
 
-(setq electric-pair-pairs '((?\" . ?\")
-                           (?\‘ . ?\’)
-                           (?\“ . ?\”)
-                           (?\{ . ?\})
-                           (?\< . ?\>)))
-
 (set-face-attribute 'show-paren-match
                    nil
                    :foreground
@@ -133,6 +123,12 @@
                    'unspecified
                    :underline
                    t)
+
+(setq electric-pair-pairs '((?\" . ?\")
+                           (?\‘ . ?\’)
+                           (?\“ . ?\”)
+                           (?\{ . ?\})
+                           (?\< . ?\>)))
 \f
 ;; Transient mark mode temp enabling
 (setq transient-mark-mode nil)
@@ -190,9 +186,7 @@
       vc-git-log-switches '("--oneline" "--all" "--graph")
       vc-git-log-edit-summary-target-len 50
       vc-git-log-edit-summary-max-len 70
-      vc-find-revision-no-save t
-      backup-by-copying t
-      backup-directory-alist `((".*" . "~/emacs-backups/")))
+      vc-find-revision-no-save t)
 
 (setq vc-git-root-log-format
       `("%d %h %ai %an: %s"
@@ -208,7 +202,9 @@
         (3 'change-log-name)
         (4 'change-log-date))))
 
-(setq delete-old-versions t
+(setq backup-directory-alist `((".*" . "~/emacs-backups/"))
+      backup-by-copying t
+      delete-old-versions t
       kept-new-versions 5
       kept-old-versions 5)
 \f