* diff-hl-mode: Extract diff-hl-maybe-define-bitmaps.

* diff-hl-dired-mode: Use it.

#6

diff --git a/diff-hl-dired.el b/diff-hl-dired.el
index a3b766fbebc11357b0ae721890ebedc0a4d4f8f3..066ff6f1feeb22257b2854ecca065547a3740838 100644 (file)
--- a/diff-hl-dired.el
+++ b/diff-hl-dired.el
@@ -31,6 +31,7 @@
   :lighter ""
   (if diff-hl-dired-mode
       (progn
+        (diff-hl-maybe-define-bitmaps)
         (set (make-local-variable 'diff-hl-dired-process-buffer) nil)
         (add-hook 'dired-after-readin-hook 'diff-hl-dired-update nil t))
     (remove-hook 'dired-after-readin-hook 'diff-hl-dired-update t)

diff --git a/diff-hl.el b/diff-hl.el
index 4bfde1ae8bdfbea92e1089cd6290e1595d527670..f9d65fcf964dda5e52b7044328ee969e28db097e 100644 (file)
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -140,6 +140,12 @@
       (define-fringe-bitmap 'diff-hl-bmp-change (make-vector\r
                                                  w2 (* 3 middle-bit)) w2 w2))))\r
 \r
+(defun diff-hl-maybe-define-bitmaps ()\r
+  (when (window-system) ;; No fringes in the console.\r
+    (unless (fringe-bitmap-p 'diff-hl-bmp-empty)\r
+      (diff-hl-define-bitmaps)\r
+      (define-fringe-bitmap 'diff-hl-bmp-empty [0] 1 1 'center))))\r
+\r
 (defvar diff-hl-spec-cache (make-hash-table :test 'equal))\r
 \r
 (defun diff-hl-fringe-spec (type pos)\r
@@ -390,10 +396,7 @@ in the source file, or the last line of the hunk above it."
                         (,(kbd "C-x v ]") . diff-hl-next-hunk))\r
   (if diff-hl-mode\r
       (progn\r
-        (when (window-system) ;; No fringes in the console.\r
-          (unless (fringe-bitmap-p 'diff-hl-bmp-empty)\r
-            (diff-hl-define-bitmaps)\r
-            (define-fringe-bitmap 'diff-hl-bmp-empty [0] 1 1 'center)))\r
+        (diff-hl-maybe-define-bitmaps)\r
         (add-hook 'after-save-hook 'diff-hl-update nil t)\r
         (add-hook 'after-change-functions 'diff-hl-edit nil t)\r
         (if vc-mode\r