From bc696b2f79926d90d1e9859755c37c75df0cb6f4 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Tue, 9 May 2017 17:32:26 +0900
Subject: [PATCH 1/5] Add editorconfig-charset-extras hook

---
 emacs.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/emacs.el b/emacs.el
index 3e86e11..0aaa5bc 100644
--- a/emacs.el
+++ b/emacs.el
@@ -664,6 +664,10 @@ found, otherwise returns nil."
   (add-hook 'editorconfig-custom-hooks
             'editorconfig-custom-majormode))
 
+(when (fboundp 'editorconfig-charset-extras)
+  (add-hook 'editorconfig-custom-hooks
+            'editorconfig-charset-extras))
+
 (setq revert-without-query '(".+"))
 
 ;; save cursor position

From 6c38b88c5f7d8e2119b1ac033425a67bc4366fdb Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Wed, 10 May 2017 15:25:47 +0900
Subject: [PATCH 2/5] Update pack command name

---
 emacs.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs.el b/emacs.el
index 0aaa5bc..5e94b51 100644
--- a/emacs.el
+++ b/emacs.el
@@ -1425,7 +1425,7 @@ the list."
 
   (when (autoload-eval-lazily 'pack '(dired-do-pack-or-unpack pack-pack))
     (with-eval-after-load 'dired
-      (define-key dired-mode-map "P" 'dired-do-pack-or-unpack)))
+      (define-key dired-mode-map "P" 'pack-dired-dwim)))
 
   (when (autoload-eval-lazily 'dired-list-all-mode)
     (setq dired-listing-switches "-lhF")

From c66cfe56579d33d9370b9f44f004d712c413e505 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Tue, 22 Aug 2017 15:08:27 +0900
Subject: [PATCH 3/5] Set term-color faces to default

---
 emacs.el | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/emacs.el b/emacs.el
index 5e94b51..2bc1454 100644
--- a/emacs.el
+++ b/emacs.el
@@ -650,6 +650,15 @@ found, otherwise returns nil."
                       :inherit 'highlight)
   (set-face-foreground 'mode-line-inactive
                        "white")
+
+  (face-spec-set 'term-color-black (face-default-spec 'term-color-black))
+  (face-spec-set 'term-color-red (face-default-spec 'term-color-red))
+  (face-spec-set 'term-color-green (face-default-spec 'term-color-green))
+  (face-spec-set 'term-color-yellow (face-default-spec 'term-color-yellow))
+  (face-spec-set 'term-color-blue (face-default-spec 'term-color-blue))
+  (face-spec-set 'term-color-magenta (face-default-spec 'term-color-magenta))
+  (face-spec-set 'term-color-cyan (face-default-spec 'term-color-cyan))
+  (face-spec-set 'term-color-white (face-default-spec 'term-color-white))
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

From 73861243fa37870283ee0c5bcd97534bb3ac8b60 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Thu, 5 Oct 2017 17:22:16 +0900
Subject: [PATCH 4/5] Disable cyberpunk theme

---
 emacs.el | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/emacs.el b/emacs.el
index 2bc1454..01c03bb 100644
--- a/emacs.el
+++ b/emacs.el
@@ -643,25 +643,25 @@ found, otherwise returns nil."
   (set-variable 'ahs-idle-interval 0.6)
   (global-auto-highlight-symbol-mode 1))
 
-(when (safe-require-or-eval 'cyberpunk-theme)
-  (load-theme 'cyberpunk t)
-  (set-face-attribute 'button
-                      nil
-                      :inherit 'highlight)
-  (set-face-foreground 'mode-line-inactive
-                       "white")
-
-  (face-spec-set 'term-color-black (face-default-spec 'term-color-black))
-  (face-spec-set 'term-color-red (face-default-spec 'term-color-red))
-  (face-spec-set 'term-color-green (face-default-spec 'term-color-green))
-  (face-spec-set 'term-color-yellow (face-default-spec 'term-color-yellow))
-  (face-spec-set 'term-color-blue (face-default-spec 'term-color-blue))
-  (face-spec-set 'term-color-magenta (face-default-spec 'term-color-magenta))
-  (face-spec-set 'term-color-cyan (face-default-spec 'term-color-cyan))
-  (face-spec-set 'term-color-white (face-default-spec 'term-color-white))
-  )
+;; (when (safe-require-or-eval 'cyberpunk-theme)
+;;   (load-theme 'cyberpunk t)
+;;   (set-face-attribute 'button
+;;                       nil
+;;                       :inherit 'highlight)
+;;   (set-face-foreground 'mode-line-inactive
+;;                        "white")
+
+;;   (face-spec-set 'term-color-black (face-default-spec 'term-color-black))
+;;   (face-spec-set 'term-color-red (face-default-spec 'term-color-red))
+;;   (face-spec-set 'term-color-green (face-default-spec 'term-color-green))
+;;   (face-spec-set 'term-color-yellow (face-default-spec 'term-color-yellow))
+;;   (face-spec-set 'term-color-blue (face-default-spec 'term-color-blue))
+;;   (face-spec-set 'term-color-magenta (face-default-spec 'term-color-magenta))
+;;   (face-spec-set 'term-color-cyan (face-default-spec 'term-color-cyan))
+;;   (face-spec-set 'term-color-white (face-default-spec 'term-color-white))
+;;   )
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; file handling
 
 (when (safe-require-or-eval 'editorconfig)

From 90908445f2e7d4e984f9c21505d46fb64e37766b Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Fri, 6 Oct 2017 14:42:00 +0900
Subject: [PATCH 5/5] Add tab_width

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index 557a750..8aec2d3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,6 +19,7 @@ indent_size = 2
 
 [{{M,m}akefile,*.mk}]
 indent_style = tab
+tab_width = 4
 
 [{shrc,profile,xinitrc,xprograms,*.sh}]
 indent_size = 4