Add a customize variable for lighter

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. Set `debug-on-error` to `t` to capture a backtrace.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**System**
+If you think this is important, please also tell me about which version and which port of emacs you are running.
+
+**Additional context**
+Add any other context about the problem here.

Cask

@@ -0,0 +1,4 @@
+(source gnu)
+(source melpa)
+
+(package-file "all-the-icons-dired.el")

README.org

@@ -1,6 +1,9 @@
 #+TITLE:	all-the-icons-dired
 #+AUTHOR:	jtbm37
 #+DATE:		2016-11-08
+** Note
+Since 2021-02-21, this is now the fork the =all-the-icons-dired= Melpa recipe points to. Changes can be seen [[https://github.com/jtbm37/all-the-icons-dired/compare/master...wyuenho:master][here]].
+
 [[file:logo.png]]
 
 This adds dired support to [[https://github.com/domtronn/all-the-icons.el][all-the-icons]].

all-the-icons-dired.el

@@ -1,12 +1,14 @@
 ;;; all-the-icons-dired.el --- Shows icons for each file in dired mode  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016  jtbm37
+;; Copyright (C) 2016-2020  jtbm37
+;; Copyright (C) 2021 Jimmy Yuen Ho Wong
 
 ;; Author: jtbm37
-;; Version: 1.0
+;; Maintainer: Jimmy Yuen Ho Wong <wyuenho@gmail.com>
+;; Version: 2.0
 ;; Keywords: files icons dired
-;; Package-Requires: ((emacs "24.4") (all-the-icons "2.2.0"))
-;; URL: https://github.com/jtbm37/all-the-icons-dired
+;; Package-Requires: ((emacs "26.1") (all-the-icons "2.2.0"))
+;; URL: https://github.com/wyuenho/all-the-icons-dired
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -32,100 +34,105 @@
 
 ;;; Code:
 
-(require 'cl-lib)
 (require 'dired)
 (require 'all-the-icons)
+(require 'subr-x)
+(require 'image)
+(require 'jit-lock)
+(require 'font-core)
+(require 'font-lock)
 
 (defface all-the-icons-dired-dir-face
   '((((background dark)) :foreground "white")
     (((background light)) :foreground "black"))
-  "Face for the directory icon"
+  "Face for the directory icon."
   :group 'all-the-icons-faces)
 
+(defcustom all-the-icons-dired-lighter " all-the-icons-dired-mode"
+  "Lighter of all-the-icons-dired-mode"
+  :group 'all-the-icons
+  :type 'string)
+
 (defcustom all-the-icons-dired-v-adjust 0.01
-  "The default vertical adjustment of the icon in the dired buffer."
+  "The default vertical adjustment of the icon in the Dired buffer."
   :group 'all-the-icons
   :type 'number)
 
+(defcustom all-the-icons-dired-monochrome t
+  "Whether to show the icons as the same color as the text on the same line."
+  :group 'all-the-icons
+  :type 'boolean)
+
 (defvar all-the-icons-dired-mode)
 
-(defun all-the-icons-dired--add-overlay (pos string)
-  "Add overlay to display STRING at POS."
-  (let ((ov (make-overlay (1- pos) pos)))
-    (overlay-put ov 'all-the-icons-dired-overlay t)
-    (overlay-put ov 'after-string string)))
-
-(defun all-the-icons-dired--overlays-in (beg end)
-  "Get all all-the-icons-dired overlays between BEG to END."
-  (cl-remove-if-not
-   (lambda (ov)
-     (overlay-get ov 'all-the-icons-dired-overlay))
-   (overlays-in beg end)))
-
-(defun all-the-icons-dired--overlays-at (pos)
-  "Get all-the-icons-dired overlays at POS."
-  (apply #'all-the-icons-dired--overlays-in `(,pos ,pos)))
-
-(defun all-the-icons-dired--remove-all-overlays ()
-  "Remove all `all-the-icons-dired' overlays."
-  (save-restriction
-    (widen)
-    (mapc #'delete-overlay
-          (all-the-icons-dired--overlays-in (point-min) (point-max)))))
-
-(defun all-the-icons-dired--refresh ()
-  "Display the icons of files in a dired buffer."
-  (all-the-icons-dired--remove-all-overlays)
-  (save-excursion
-    (goto-char (point-min))
-    (while (not (eobp))
-      (when (dired-move-to-filename nil)
-        (let ((file (dired-get-filename 'relative 'noerror)))
-          (when file
-            (let ((icon (if (file-directory-p file)
-                            (all-the-icons-icon-for-dir file
-                                                        :face 'all-the-icons-dired-dir-face
-                                                        :v-adjust all-the-icons-dired-v-adjust)
-                          (all-the-icons-icon-for-file file :v-adjust all-the-icons-dired-v-adjust))))
-              (if (member file '("." ".."))
-                  (all-the-icons-dired--add-overlay (point) "  \t")
-                (all-the-icons-dired--add-overlay (point) (concat icon "\t")))))))
-      (forward-line 1))))
-
-(defun all-the-icons-dired--refresh-advice (fn &rest args)
-  "Advice function for FN with ARGS."
-  (apply fn args)
-  (when all-the-icons-dired-mode
-    (all-the-icons-dired--refresh)))
+(defun all-the-icons-dired--icon (file)
+  "Return the icon for FILE."
+  (if (file-directory-p file)
+      (all-the-icons-icon-for-dir file
+                                  :face 'all-the-icons-dired-dir-face
+                                  :v-adjust all-the-icons-dired-v-adjust)
+    (apply 'all-the-icons-icon-for-file file
+           (append
+            `(:v-adjust ,all-the-icons-dired-v-adjust)
+            (when all-the-icons-dired-monochrome
+              `(:face ,(face-at-point)))))))
+
+(defun all-the-icons-dired--put-icon (pos)
+  "Propertize POS with icon."
+  (let* ((file (dired-get-filename 'relative 'noerror))
+         (icon (all-the-icons-dired--icon file))
+         (image (get-text-property 0 'display icon)))
+    (if (or (not (eq (car image) 'image)) (member file '("." "..")))
+        (put-text-property (1- pos) pos 'display
+                           (if (member file '("." ".."))
+                               "    "
+                             (concat " " icon " ")))
+      (setf (image-property image :margin) (cons (/ (window-text-width nil t) (window-text-width)) 0))
+      (put-text-property (1- pos) pos 'display image))))
+
+(defun all-the-icons-dired--fontify-region (start end &optional loudly)
+  "Add icons using text properties from START to END.
+
+START, END and the optional argument LOUDLY is passed to
+`font-lock-default-fontify-region'."
+  (let ((extended-region (font-lock-default-fontify-region start end loudly)))
+    (when (and (consp extended-region)
+               (eq (car extended-region) 'jit-lock-bounds))
+      (setq start (cadr extended-region))
+      (setq end (cddr extended-region)))
+    (with-silent-modifications
+      (save-excursion
+        (goto-char start)
+        (while (< (point) end)
+          (when-let ((pos (dired-move-to-filename)))
+            (all-the-icons-dired--put-icon pos))
+          (forward-line 1))))
+    extended-region))
 
 (defun all-the-icons-dired--setup ()
-  "Setup `all-the-icons-dired'."
-  (when (derived-mode-p 'dired-mode)
-    (setq-local tab-width 1)
-    (advice-add 'dired-readin :around #'all-the-icons-dired--refresh-advice)
-    (advice-add 'dired-revert :around #'all-the-icons-dired--refresh-advice)
-    (advice-add 'dired-internal-do-deletions :around #'all-the-icons-dired--refresh-advice)
-    (advice-add 'dired-insert-subdir :around #'all-the-icons-dired--refresh-advice)
-    (advice-add 'dired-do-kill-lines :around #'all-the-icons-dired--refresh-advice)
-    (with-eval-after-load 'dired-narrow
-      (advice-add 'dired-narrow--internal :around #'all-the-icons-dired--refresh-advice))
-    (all-the-icons-dired--refresh)))
+  "Set up `all-the-icons-dired'."
+  (add-function :override (local 'font-lock-fontify-region-function) #'all-the-icons-dired--fontify-region)
+  (setq-local font-lock-extra-managed-props (cons 'display font-lock-extra-managed-props))
+  (cond (jit-lock-mode
+         (jit-lock-refontify))
+        (font-lock-mode
+         (font-lock-fontify-region (point-min) (point-max)))))
 
 (defun all-the-icons-dired--teardown ()
-  "Functions used as advice when redisplaying buffer."
-  (advice-remove 'dired-readin #'all-the-icons-dired--refresh-advice)
-  (advice-remove 'dired-revert #'all-the-icons-dired--refresh-advice)
-  (advice-remove 'dired-internal-do-deletions #'all-the-icons-dired--refresh-advice)
-  (advice-remove 'dired-narrow--internal #'all-the-icons-dired--refresh-advice)
-  (advice-remove 'dired-insert-subdir #'all-the-icons-dired--refresh-advice)
-  (advice-remove 'dired-do-kill-lines #'all-the-icons-dired--refresh-advice)
-  (all-the-icons-dired--remove-all-overlays))
+  "Tear down `all-the-icons-dired'."
+  (font-lock-unfontify-buffer)
+  (remove-function (local 'font-lock-fontify-region-function) #'all-the-icons-dired--fontify-region)
+  (setq-local font-lock-extra-managed-props (remove 'display font-lock-extra-managed-props))
+  (cond (jit-lock-mode
+         (jit-lock-refontify))
+        (font-lock-mode
+         (font-lock-fontify-region (point-min) (point-max)))))
 
 ;;;###autoload
 (define-minor-mode all-the-icons-dired-mode
-  "Display all-the-icons icon for each files in a dired buffer."
-  :lighter " all-the-icons-dired-mode"
-  (when (and (derived-mode-p 'dired-mode) (display-graphic-p))
+  "Display all-the-icons icon for each file in a Dired buffer."
+  :lighter all-the-icons-dired-lighter
+  (when (derived-mode-p 'dired-mode)
     (if all-the-icons-dired-mode
         (all-the-icons-dired--setup)
       (all-the-icons-dired--teardown))))