Merge branch 'master' of github.com:10sr/dotfiles

.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

emacs.el

@@ -645,16 +645,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")
-  )
+;; (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)
@@ -666,6 +675,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
@@ -1423,7 +1436,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")