diff-hl-dired-update-ignores: Specifically exclude .hg from iteration

[gnu-emacs-elpa] / diff-hl.el

diff --git a/diff-hl.el b/diff-hl.el
index 2488f4d1b77d260c2a3a990e9421013d4f09b4ef..1daab19130845f26d747eb670e255a4eb2b027ac 100644 (file)
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -144,6 +144,9 @@
     (define-fringe-bitmap 'diff-hl-bmp-bottom bottom h w 'bottom)\r
     (define-fringe-bitmap 'diff-hl-bmp-single single h w 'top)\r
     (let* ((w2 (* (/ w 2) 2))\r
+           ;; When fringes are disabled, it's easier to fix up the width,\r
+           ;; instead of doing nothing (#20).\r
+           (w2 (if (zerop w2) 2 w2))\r
            (delete-row (- (expt 2 (1- w2)) 2))\r
            (middle-pos (1- (/ w2 2)))\r
            (middle-bit (expt 2 middle-pos))\r
@@ -219,7 +222,8 @@
             (with-current-buffer buf-name\r
               (goto-char (point-min))\r
               (unless (eobp)\r
-                (diff-beginning-of-hunk t)\r
+                (ignore-errors\r
+                  (diff-beginning-of-hunk t))\r
                 (while (looking-at diff-hunk-header-re-unified)\r
                   (let ((line (string-to-number (match-string 3)))\r
                         (len (let ((m (match-string 4)))\r
@@ -448,6 +452,7 @@ in the source file, or the last line of the hunk above it."
         ;; doesn't care about changed VC state.\r
         ;; https://github.com/magit/magit/issues/603\r
         (add-hook 'magit-revert-buffer-hook 'diff-hl-update nil t)\r
+        (add-hook 'auto-revert-mode-hook 'diff-hl-update nil t)\r
         (add-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps nil t))\r
     (remove-hook 'after-save-hook 'diff-hl-update t)\r
     (remove-hook 'after-change-functions 'diff-hl-edit t)\r
@@ -455,6 +460,7 @@ in the source file, or the last line of the hunk above it."
     (remove-hook 'vc-checkin-hook 'diff-hl-update t)\r
     (remove-hook 'after-revert-hook 'diff-hl-update t)\r
     (remove-hook 'magit-revert-buffer-hook 'diff-hl-update t)\r
+    (remove-hook 'auto-revert-mode-hook 'diff-hl-update t)\r
     (remove-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps t)\r
     (diff-hl-remove-overlays)))\r
 \r