-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016 Free Software Foundation, Inc.
;; Author: Jonathan Hayase <PythonNut@gmail.com>
;; URL: https://github.com/dgutov/diff-hl
(interactive)
(vc-ensure-vc-buffer)
(setq diff-hl-flydiff-modified-tick (buffer-modified-tick))
- (with-current-buffer (get-buffer (current-buffer))
+ (save-current-buffer
(let* ((temporary-file-directory
(if (file-directory-p "/dev/shm/")
"/dev/shm/"
(diff-no-select rev (current-buffer) "-U 0 --strip-trailing-cr" 'noasync
(get-buffer-create " *diff-hl-diff*")))))
-(defun diff-hl-flydiff/update (old-fun &optional auto)
- (unless (and auto
- (or
- (= diff-hl-flydiff-modified-tick (buffer-modified-tick))
- (file-remote-p default-directory)))
- (funcall old-fun)))
+(defun diff-hl-flydiff-update ()
+ (unless (or
+ (not diff-hl-mode)
+ (= diff-hl-flydiff-modified-tick (buffer-modified-tick))
+ (file-remote-p default-directory))
+ (diff-hl-update)))
(defun diff-hl-flydiff/modified-p (state)
(buffer-modified-p))
:global t
(if diff-hl-flydiff-mode
(progn
- (advice-add 'diff-hl-update :around #'diff-hl-flydiff/update)
(advice-add 'diff-hl-overlay-modified :override #'ignore)
(advice-add 'diff-hl-modified-p :before-until
(advice-add 'diff-hl-changes-buffer :override
#'diff-hl-flydiff-buffer-with-head)
(setq diff-hl-flydiff-timer
- (run-with-idle-timer diff-hl-flydiff-delay t #'diff-hl-update t)))
+ (run-with-idle-timer diff-hl-flydiff-delay t #'diff-hl-flydiff-update)))
- (advice-remove 'diff-hl-update #'diff-hl-flydiff/update)
(advice-remove 'diff-hl-overlay-modified #'ignore)
(advice-remove 'diff-hl-modified-p #'diff-hl-flydiff/modified-p)