[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a454a24 42/42: Merge commit '7fa7f099c7008d521dbbb57a1546f
|
From: |
Dmitry Gutov |
|
Subject: |
[elpa] master a454a24 42/42: Merge commit '7fa7f099c7008d521dbbb57a1546f11535544536' from diff-hl |
|
Date: |
Wed, 09 Sep 2015 19:03:51 +0000 |
branch: master
commit a454a247a9c98b5a5c6eaee3957a9378e8aa483e
Merge: cde5d9a 7fa7f09
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Merge commit '7fa7f099c7008d521dbbb57a1546f11535544536' from diff-hl
---
packages/diff-hl/README.md | 14 +-
packages/diff-hl/diff-hl-dired.el | 11 +-
packages/diff-hl/diff-hl-flydiff.el | 182 ++++++
packages/diff-hl/diff-hl-margin.el | 18 +-
packages/diff-hl/diff-hl.el | 1068 ++++++++++++++++++-----------------
5 files changed, 751 insertions(+), 542 deletions(-)
diff --git a/packages/diff-hl/README.md b/packages/diff-hl/README.md
index 325f53e..ab8c9d8 100644
--- a/packages/diff-hl/README.md
+++ b/packages/diff-hl/README.md
@@ -15,6 +15,8 @@ The package also contains auxiliary modes:
* `diff-hl-margin-mode` changes the highlighting function to
use the margin instead of the fringe.
* `diff-hl-amend-mode` shifts the reference revision back by one.
+* `diff-hl-flydiff-mode` implements highlighting changes on the fly.
+ It requires Emacs 24.4 or newer.
Check out the Commentary section in each respective file for the usage
instructions.
@@ -46,10 +48,9 @@ Emacs 24+. On OS X, Emacs 24.3 or higher is recommended.
Notes
=====
-* Since it uses the corresponding VC diff command, it's only accurate when the
- buffer is in saved state. Highlighting changes "on the fly" might be better,
- maybe we can do something similar to `highlight-markup-buffers` with a hidden
- buffer containing the unmodified copy.
+* By default `diff-hl-mode` uses the corresponding VC diff command, so
+ it's only accurate when the buffer is in saved state. Check out
+ `diff-hl-flydiff-mode`, it aims to handle unsaved buffers as well.
* We conflict with other modes when they put indicators on the fringe,
such as [Flycheck](https://github.com/flycheck/flycheck). This is
@@ -63,6 +64,9 @@ Notes
* Frame-local and buffer-local values of `line-spacing` are not supported.
+* Fringe width up to 16 works best (because we can't define a bitmap
+ with width above that number).
+
* [emacs-git-gutter](https://github.com/syohex/emacs-git-gutter) shows
indicators in the margin by default, allows you to customize how the
indicators look more easily, and has a "stage hunk" command.
@@ -87,4 +91,4 @@ Magit
-----
If you have a recent enough version installed, it defines
-`magit-revert-buffer-hook`, which we use.
+`magit-revert-buffer-hook` (or `magit-not-reverted-hook`), which we use.
diff --git a/packages/diff-hl/diff-hl-dired.el
b/packages/diff-hl/diff-hl-dired.el
index 09cf851..663d293 100644
--- a/packages/diff-hl/diff-hl-dired.el
+++ b/packages/diff-hl/diff-hl-dired.el
@@ -1,6 +1,6 @@
;;; diff-hl-dired.el --- Highlight changed files in Dired -*- lexical-binding:
t -*-
-;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@@ -126,10 +126,12 @@
(append dirs-alist files-alist))))))
)))))
-(defun diff-hl-dired-status-files (backend dir files uf)
+(defun diff-hl-dired-status-files (backend dir files update-function)
+ "Using version control BACKEND, return list of (FILE STATE EXTRA) entries
+for DIR containing FILES. Call UPDATE-FUNCTION as entries are added."
(if (version< "25" emacs-version)
- (vc-call-backend backend 'dir-status-files dir files uf)
- (vc-call-backend backend 'dir-status-files dir files nil uf)))
+ (vc-call-backend backend 'dir-status-files dir files update-function)
+ (vc-call-backend backend 'dir-status-files dir files nil update-function)))
(when (version< emacs-version "24.4.51.5")
;; Work around http://debbugs.gnu.org/19386
@@ -161,6 +163,7 @@
(defalias 'diff-hl-dired-clear 'diff-hl-remove-overlays)
+;;;###autoload
(defun diff-hl-dired-mode-unless-remote ()
(unless (file-remote-p default-directory)
(diff-hl-dired-mode)))
diff --git a/packages/diff-hl/diff-hl-flydiff.el
b/packages/diff-hl/diff-hl-flydiff.el
new file mode 100644
index 0000000..53d31f7
--- /dev/null
+++ b/packages/diff-hl/diff-hl-flydiff.el
@@ -0,0 +1,182 @@
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; Author: Jonathan Hayase <address@hidden>
+;; URL: https://github.com/dgutov/diff-hl
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This mode enables diffing on-the-fly (i.e. without saving the buffer first)
+;; Toggle in all buffers with M-x diff-hl-flydiff-mode
+
+;;; Code:
+
+(require 'diff-hl)
+(require 'diff)
+(unless (require 'nadvice nil t)
+ (error "`diff-hl-flydiff-mode' requires Emacs 24.4 or newer"))
+
+(defgroup diff-hl-flydiff nil
+ "Highlight changes on the fly"
+ :group 'diff-hl)
+
+(defcustom diff-hl-flydiff-delay 0.3
+ "The idle delay in seconds before highlighting is updated."
+ :type 'number)
+
+(defvar diff-hl-flydiff-modified-tick 0)
+(defvar diff-hl-flydiff-timer)
+(make-variable-buffer-local 'diff-hl-flydiff-modified-tick)
+
+(defun diff-hl-flydiff/vc-git--symbolic-ref (file)
+ (or
+ (vc-file-getprop file 'vc-git-symbolic-ref)
+ (let* (process-file-side-effects
+ (str (vc-git--run-command-string nil "symbolic-ref" "HEAD")))
+ (vc-file-setprop file 'vc-git-symbolic-ref
+ (if str
+ (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str)
+ (match-string 2 str)
+ str))))))
+
+(defun diff-hl-flydiff/vc-git-working-revision (_file)
+ "Git-specific version of `vc-working-revision'."
+ (let (process-file-side-effects)
+ (vc-git--rev-parse "HEAD")))
+
+(defun diff-hl-flydiff/vc-git-mode-line-string (file)
+ "Return a string for `vc-mode-line' to put in the mode line for FILE."
+ (let* ((rev (vc-working-revision file))
+ (disp-rev (or (diff-hl-flydiff/vc-git--symbolic-ref file)
+ (substring rev 0 7)))
+ (def-ml (vc-default-mode-line-string 'Git file))
+ (help-echo (get-text-property 0 'help-echo def-ml))
+ (face (get-text-property 0 'face def-ml)))
+ (propertize (replace-regexp-in-string (concat rev "\\'") disp-rev def-ml t
t)
+ 'face face
+ 'help-echo (concat help-echo "\nCurrent revision: " rev))))
+
+;; Polyfill concrete revisions for vc-git-working-revision in Emacs 24.4, 24.5
+(when (version<= emacs-version "25.0")
+ (with-eval-after-load 'vc-git
+ (advice-add 'vc-git-working-revision :override
+ #'diff-hl-flydiff/vc-git-working-revision)
+ (advice-add 'vc-git-mode-line-string :override
+ #'diff-hl-flydiff/vc-git-mode-line-string)))
+
+(defun diff-hl-flydiff/working-revision (file)
+ "Like vc-working-revision, but always up-to-date"
+ (vc-file-setprop file 'vc-working-revision
+ (vc-call-backend (vc-backend file) 'working-revision file)))
+
+(defun diff-hl-flydiff-make-temp-file-name (file rev &optional manual)
+ "Return a backup file name for REV or the current version of FILE.
+If MANUAL is non-nil it means that a name for backups created by
+the user should be returned."
+ (let* ((auto-save-file-name-transforms
+ `((".*" ,temporary-file-directory t))))
+ (expand-file-name
+ (concat (make-auto-save-file-name)
+ ".~" (subst-char-in-string
+ ?/ ?_ rev)
+ (unless manual ".") "~")
+ temporary-file-directory)))
+
+(defun diff-hl-flydiff-create-revision (file revision)
+ "Read REVISION of FILE into a buffer and return the buffer."
+ (let ((automatic-backup (diff-hl-flydiff-make-temp-file-name file revision))
+ (filebuf (get-file-buffer file))
+ (filename (diff-hl-flydiff-make-temp-file-name file revision 'manual)))
+ (unless (file-exists-p filename)
+ (if (file-exists-p automatic-backup)
+ (rename-file automatic-backup filename nil)
+ (with-current-buffer filebuf
+ (let ((failed t)
+ (coding-system-for-read 'no-conversion)
+ (coding-system-for-write 'no-conversion))
+ (unwind-protect
+ (with-temp-file filename
+ (let ((outbuf (current-buffer)))
+ ;; Change buffer to get local value of
+ ;; vc-checkout-switches.
+ (with-current-buffer filebuf
+ (vc-call find-revision file revision outbuf))))
+ (setq failed nil)
+ (when (and failed (file-exists-p filename))
+ (delete-file filename)))))))
+ filename))
+
+(defun diff-hl-flydiff-buffer-with-head (file &optional backend)
+ "View the differences between BUFFER and its associated file.
+This requires the external program `diff' to be in your `exec-path'."
+ (interactive)
+ (vc-ensure-vc-buffer)
+ (with-current-buffer (get-buffer (current-buffer))
+ (let* ((temporary-file-directory
+ (if (file-directory-p "/dev/shm/")
+ "/dev/shm/"
+ temporary-file-directory))
+ (rev (diff-hl-flydiff-create-revision
+ file
+ (diff-hl-flydiff/working-revision file))))
+ (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)
+ (not (buffer-modified-p))))
+ (funcall old-fun)))
+
+(defun diff-hl-flydiff/modified-p (state)
+ (buffer-modified-p))
+
+(defun diff-hl-flydiff/update-modified-tick (&rest args)
+ (setq diff-hl-flydiff-modified-tick (buffer-modified-tick)))
+
+;;;###autoload
+(define-minor-mode diff-hl-flydiff-mode
+ "Highlight diffs on-the-fly"
+ :lighter ""
+ :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
+ #'diff-hl-flydiff/modified-p)
+ (advice-add 'diff-hl-changes-buffer :override
+ #'diff-hl-flydiff-buffer-with-head)
+ (advice-add 'diff-hl-change :after
+ #'diff-hl-flydiff/update-modified-tick)
+
+ (setq diff-hl-flydiff-timer
+ (run-with-idle-timer diff-hl-flydiff-delay t #'diff-hl-update
t)))
+
+ (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)
+ (advice-remove 'diff-hl-changes-buffer #'diff-hl-flydiff-buffer-with-head)
+ (advice-remove 'diff-hl-change #'diff-hl-flydiff/update-modified-tick)
+
+ (cancel-timer diff-hl-flydiff-timer)))
+
+(provide 'diff-hl-flydiff)
diff --git a/packages/diff-hl/diff-hl-margin.el
b/packages/diff-hl/diff-hl-margin.el
index 26fa7ad..32aa123 100644
--- a/packages/diff-hl/diff-hl-margin.el
+++ b/packages/diff-hl/diff-hl-margin.el
@@ -1,6 +1,6 @@
;;; diff-hl-margin.el --- Highlight buffer changes on margins -*-
lexical-binding: t -*-
-;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@@ -44,16 +44,6 @@
"Highlight buffer changes on margin"
:group 'diff-hl)
-(defcustom diff-hl-margin-side 'left
- "Which margin to use for indicators."
- :type '(choice (const left)
- (const right))
- :set (lambda (var value)
- (let ((on diff-hl-margin-mode))
- (when on (diff-hl-margin-mode -1))
- (set-default var value)
- (when on (diff-hl-margin-mode 1)))))
-
;;;###autoload
(define-minor-mode diff-hl-margin-mode
"Toggle displaying `diff-hl-mode' highlights on the margin."
@@ -82,7 +72,7 @@
"Toggle displaying `diff-hl-mode' highlights on the margin locally.
You probably shouldn't use this function directly."
:lighter ""
- (let ((width-var (intern (format "%s-margin-width" diff-hl-margin-side))))
+ (let ((width-var (intern (format "%s-margin-width" diff-hl-side))))
(if diff-hl-margin-minor-mode
(progn
(set (make-local-variable 'diff-hl-margin-old-highlight-function)
@@ -96,6 +86,8 @@ You probably shouldn't use this function directly."
(dolist (win (get-buffer-window-list))
(set-window-buffer win (current-buffer))))
+(define-obsolete-variable-alias 'diff-hl-margin-side 'diff-hl-side "1.7.1")
+
(defun diff-hl-margin-minor-mode-off ()
(diff-hl-margin-minor-mode -1))
@@ -114,7 +106,7 @@ You probably shouldn't use this function directly."
(intern (format "diff-hl-%s"
type)))))))))
(defun diff-hl-highlight-on-margin (ovl type _shape)
- (let ((spec (cdr (assoc (cons type diff-hl-margin-side)
+ (let ((spec (cdr (assoc (cons type diff-hl-side)
diff-hl-margin-spec-cache))))
(overlay-put ovl 'before-string spec)))
diff --git a/packages/diff-hl/diff-hl.el b/packages/diff-hl/diff-hl.el
index 22a877a..8790352 100644
--- a/packages/diff-hl/diff-hl.el
+++ b/packages/diff-hl/diff-hl.el
@@ -1,520 +1,548 @@
-;;; diff-hl.el --- Highlight uncommitted changes -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
-
-;; Author: Dmitry Gutov <address@hidden>
-;; URL: https://github.com/dgutov/diff-hl
-;; Keywords: vc, diff
-;; Version: 1.7.0
-;; Package-Requires: ((cl-lib "0.2"))
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; `diff-hl-mode' highlights uncommitted changes on the left side of
-;; the window (using the fringe, by default), allows you to jump
-;; between the hunks and revert them selectively.
-
-;; Provided commands:
-;;
-;; `diff-hl-diff-goto-hunk' C-x v =
-;; `diff-hl-revert-hunk' C-x v n
-;; `diff-hl-previous-hunk' C-x v [
-;; `diff-hl-next-hunk' C-x v ]
-;;
-;; The mode takes advantage of `smartrep' if it is installed.
-
-;; Add either of the following to your init file.
-;;
-;; To use it in all buffers:
-;;
-;; (global-diff-hl-mode)
-;;
-;; Only in `prog-mode' buffers, with `vc-dir' integration:
-;;
-;; (add-hook 'prog-mode-hook 'turn-on-diff-hl-mode)
-;; (add-hook 'vc-dir-mode-hook 'turn-on-diff-hl-mode)
-
-;;; Code:
-
-(require 'fringe)
-(require 'diff-mode)
-(require 'vc)
-(require 'vc-dir)
-(eval-when-compile
- (require 'cl-lib)
- (require 'vc-git)
- (require 'vc-hg)
- (require 'face-remap))
-
-(defgroup diff-hl nil
- "VC diff highlighting on the side of a window"
- :group 'vc)
-
-(defface diff-hl-insert
- '((default :inherit diff-added)
- (((class color)) :foreground "green4"))
- "Face used to highlight inserted lines."
- :group 'diff-hl)
-
-(defface diff-hl-delete
- '((default :inherit diff-removed)
- (((class color)) :foreground "red3"))
- "Face used to highlight deleted lines."
- :group 'diff-hl)
-
-(defface diff-hl-change
- '((default :foreground "blue3")
- (((class color) (min-colors 88) (background light))
- :background "#ddddff")
- (((class color) (min-colors 88) (background dark))
- :background "#333355"))
- "Face used to highlight changed lines."
- :group 'diff-hl)
-
-(defcustom diff-hl-command-prefix (kbd "C-x v")
- "The prefix for all `diff-hl' commands."
- :group 'diff-hl
- :type 'string)
-
-(defcustom diff-hl-draw-borders t
- "Non-nil to draw borders around fringe indicators."
- :group 'diff-hl
- :type 'boolean)
-
-(defcustom diff-hl-highlight-function 'diff-hl-highlight-on-fringe
- "Function to highlight the current line. Its arguments are
- overlay, change type and position within a hunk."
- :group 'diff-hl
- :type 'function)
-
-(defcustom diff-hl-fringe-bmp-function 'diff-hl-fringe-bmp-from-pos
- "Function to choose the fringe bitmap for a given change type
- and position within a hunk. Should accept two arguments."
- :group 'diff-hl
- :type '(choice (const diff-hl-fringe-bmp-from-pos)
- (const diff-hl-fringe-bmp-from-type)
- function))
-
-(defcustom diff-hl-fringe-face-function 'diff-hl-fringe-face-from-type
- "Function to choose the fringe face for a given change type
- and position within a hunk. Should accept two arguments."
- :group 'diff-hl
- :type 'function)
-
-(defvar diff-hl-reference-revision nil
- "Revision to diff against. nil means the most recent one.")
-
-(defun diff-hl-define-bitmaps ()
- (let* ((scale (if (and (boundp 'text-scale-mode-amount)
- (numberp text-scale-mode-amount))
- (expt text-scale-mode-step text-scale-mode-amount)
- 1))
- (spacing (or (and (display-graphic-p) (default-value 'line-spacing))
0))
- (h (+ (ceiling (* (frame-char-height) scale))
- (if (floatp spacing)
- (truncate (* (frame-char-height) spacing))
- spacing)))
- (w (frame-parameter nil 'left-fringe))
- (middle (make-vector h (expt 2 (1- w))))
- (ones (1- (expt 2 w)))
- (top (copy-sequence middle))
- (bottom (copy-sequence middle))
- (single (copy-sequence middle)))
- (aset top 0 ones)
- (aset bottom (1- h) ones)
- (aset single 0 ones)
- (aset single (1- h) ones)
- (define-fringe-bitmap 'diff-hl-bmp-top top h w 'top)
- (define-fringe-bitmap 'diff-hl-bmp-middle middle h w 'center)
- (define-fringe-bitmap 'diff-hl-bmp-bottom bottom h w 'bottom)
- (define-fringe-bitmap 'diff-hl-bmp-single single h w 'top)
- (define-fringe-bitmap 'diff-hl-bmp-i [3 3 0 3 3 3 3 3 3 3] nil 2 'center)
- (let* ((w2 (* (/ w 2) 2))
- ;; When fringes are disabled, it's easier to fix up the width,
- ;; instead of doing nothing (#20).
- (w2 (if (zerop w2) 2 w2))
- (delete-row (- (expt 2 (1- w2)) 2))
- (middle-pos (1- (/ w2 2)))
- (middle-bit (expt 2 middle-pos))
- (insert-bmp (make-vector w2 (* 3 middle-bit))))
- (define-fringe-bitmap 'diff-hl-bmp-delete (make-vector 2 delete-row) w2
w2)
- (aset insert-bmp 0 0)
- (aset insert-bmp middle-pos delete-row)
- (aset insert-bmp (1+ middle-pos) delete-row)
- (aset insert-bmp (1- w2) 0)
- (define-fringe-bitmap 'diff-hl-bmp-insert insert-bmp w2 w2)
- )))
-
-(defun diff-hl-maybe-define-bitmaps ()
- (when (window-system) ;; No fringes in the console.
- (unless (fringe-bitmap-p 'diff-hl-bmp-empty)
- (diff-hl-define-bitmaps)
- (define-fringe-bitmap 'diff-hl-bmp-empty [0] 1 1 'center))))
-
-(defvar diff-hl-spec-cache (make-hash-table :test 'equal))
-
-(defun diff-hl-fringe-spec (type pos)
- (let* ((key (list type pos diff-hl-fringe-bmp-function))
- (val (gethash key diff-hl-spec-cache)))
- (unless val
- (let* ((face-sym (funcall diff-hl-fringe-face-function type pos))
- (bmp-sym (funcall diff-hl-fringe-bmp-function type pos)))
- (setq val (propertize " " 'display `((left-fringe ,bmp-sym
,face-sym))))
- (puthash key val diff-hl-spec-cache)))
- val))
-
-(defun diff-hl-fringe-face-from-type (type _pos)
- (intern (format "diff-hl-%s" type)))
-
-(defun diff-hl-fringe-bmp-from-pos (_type pos)
- (intern (format "diff-hl-bmp-%s" pos)))
-
-(defun diff-hl-fringe-bmp-from-type (type _pos)
- (cl-case type
- (unknown 'question-mark)
- (change 'exclamation-mark)
- (ignored 'diff-hl-bmp-i)
- (t (intern (format "diff-hl-bmp-%s" type)))))
-
-(defvar vc-svn-diff-switches)
-
-(defmacro diff-hl-with-diff-switches (body)
- `(let ((vc-git-diff-switches nil)
- (vc-hg-diff-switches nil)
- (vc-svn-diff-switches nil)
- (vc-diff-switches '("-U0"))
- (vc-disable-async-diff t))
- ,body))
-
-(defun diff-hl-changes ()
- (let* ((file buffer-file-name)
- (backend (vc-backend file)))
- (when backend
- (let ((state (vc-state file backend)))
- (cond
- ((or (eq state 'edited)
- (and (eq state 'up-to-date)
- ;; VC state is stale in after-revert-hook.
- (or revert-buffer-in-progress-p
- ;; Diffing against an older revision.
- diff-hl-reference-revision)))
- (let* ((buf-name " *diff-hl* ")
- diff-auto-refine-mode
- res)
- (diff-hl-with-diff-switches
- (vc-call-backend backend 'diff (list file)
- diff-hl-reference-revision nil
- buf-name))
- (with-current-buffer buf-name
- (goto-char (point-min))
- (unless (eobp)
- (ignore-errors
- (diff-beginning-of-hunk t))
- (while (looking-at diff-hunk-header-re-unified)
- (let ((line (string-to-number (match-string 3)))
- (len (let ((m (match-string 4)))
- (if m (string-to-number m) 1)))
- (beg (point)))
- (diff-end-of-hunk)
- (let* ((inserts (diff-count-matches "^\\+" beg (point)))
- (deletes (diff-count-matches "^-" beg (point)))
- (type (cond ((zerop deletes) 'insert)
- ((zerop inserts) 'delete)
- (t 'change))))
- (when (eq type 'delete)
- (setq len 1)
- (cl-incf line))
- (push (list line len type) res))))))
- (nreverse res)))
- ((eq state 'added)
- `((1 ,(line-number-at-pos (point-max)) insert)))
- ((eq state 'removed)
- `((1 ,(line-number-at-pos (point-max)) delete))))))))
-
-(defun diff-hl-update ()
- (let ((changes (diff-hl-changes))
- (current-line 1))
- (diff-hl-remove-overlays)
- (save-excursion
- (goto-char (point-min))
- (dolist (c changes)
- (cl-destructuring-bind (line len type) c
- (forward-line (- line current-line))
- (setq current-line line)
- (let ((hunk-beg (point)))
- (while (cl-plusp len)
- (diff-hl-add-highlighting
- type
- (cond
- ((not diff-hl-draw-borders) 'empty)
- ((and (= len 1) (= line current-line)) 'single)
- ((= len 1) 'bottom)
- ((= line current-line) 'top)
- (t 'middle)))
- (forward-line 1)
- (cl-incf current-line)
- (cl-decf len))
- (let ((h (make-overlay hunk-beg (point)))
- (hook '(diff-hl-overlay-modified)))
- (overlay-put h 'diff-hl t)
- (overlay-put h 'diff-hl-hunk t)
- (overlay-put h 'modification-hooks hook)
- (overlay-put h 'insert-in-front-hooks hook)
- (overlay-put h 'insert-behind-hooks hook))))))))
-
-(defun diff-hl-add-highlighting (type shape)
- (let ((o (make-overlay (point) (point))))
- (overlay-put o 'diff-hl t)
- (funcall diff-hl-highlight-function o type shape)
- o))
-
-(defun diff-hl-highlight-on-fringe (ovl type shape)
- (overlay-put ovl 'before-string (diff-hl-fringe-spec type shape)))
-
-(defun diff-hl-remove-overlays ()
- (dolist (o (overlays-in (point-min) (point-max)))
- (when (overlay-get o 'diff-hl) (delete-overlay o))))
-
-(defun diff-hl-overlay-modified (ov after-p _beg _end &optional _length)
- "Delete the hunk overlay and all our line overlays inside it."
- (unless after-p
- (when (overlay-buffer ov)
- (save-restriction
- (narrow-to-region (overlay-start ov) (overlay-end ov))
- (diff-hl-remove-overlays))
- (delete-overlay ov))))
-
-(defvar diff-hl-timer nil)
-
-(defun diff-hl-edit (_beg _end _len)
- "DTRT when we've `undo'-ne the buffer into unmodified state."
- (when undo-in-progress
- (when diff-hl-timer
- (cancel-timer diff-hl-timer))
- (setq diff-hl-timer
- (run-with-idle-timer 0.01 nil #'diff-hl-after-undo
(current-buffer)))))
-
-(defun diff-hl-after-undo (buffer)
- (with-current-buffer buffer
- (unless (buffer-modified-p)
- (diff-hl-update))))
-
-(defun diff-hl-diff-goto-hunk ()
- "Run VC diff command and go to the line corresponding to the current."
- (interactive)
- (vc-buffer-sync)
- (let* ((line (line-number-at-pos))
- (buffer (current-buffer)))
- (vc-diff-internal t (vc-deduce-fileset) diff-hl-reference-revision nil t)
- (vc-exec-after `(if (< (line-number-at-pos (point-max)) 3)
- (with-current-buffer ,buffer (diff-hl-remove-overlays))
- (diff-hl-diff-skip-to ,line)
- (setq vc-sentinel-movepoint (point))))))
-
-(defun diff-hl-diff-skip-to (line)
- "In `diff-mode', skip to the hunk and line corresponding to LINE
-in the source file, or the last line of the hunk above it."
- (diff-hunk-next)
- (let (found)
- (while (and (looking-at diff-hunk-header-re-unified) (not found))
- (let ((hunk-line (string-to-number (match-string 3)))
- (len (let ((m (match-string 4)))
- (if m (string-to-number m) 1))))
- (if (> line (+ hunk-line len))
- (diff-hunk-next)
- (setq found t)
- (if (< line hunk-line)
- ;; Retreat to the previous hunk.
- (forward-line -1)
- (let ((to-go (1+ (- line hunk-line))))
- (while (cl-plusp to-go)
- (forward-line 1)
- (unless (looking-at "^-")
- (cl-decf to-go))))))))))
-
-(defun diff-hl-revert-hunk ()
- "Revert the diff hunk with changes at or above the point."
- (interactive)
- (vc-buffer-sync)
- (let ((diff-buffer (generate-new-buffer-name "*diff-hl*"))
- (buffer (current-buffer))
- (line (save-excursion
- (unless (diff-hl-hunk-overlay-at (point))
- (diff-hl-previous-hunk))
- (line-number-at-pos)))
- (fileset (vc-deduce-fileset)))
- (unwind-protect
- (progn
- (vc-diff-internal nil fileset diff-hl-reference-revision nil
- nil diff-buffer)
- (vc-exec-after
- `(let (beg-line end-line)
- (when (eobp)
- (with-current-buffer ,buffer (diff-hl-remove-overlays))
- (error "Buffer is up-to-date"))
- (diff-hl-diff-skip-to ,line)
- (save-excursion
- (while (looking-at "[-+]") (forward-line 1))
- (setq end-line (line-number-at-pos (point)))
- (unless (eobp) (diff-split-hunk)))
- (unless (looking-at "[-+]") (forward-line -1))
- (while (looking-at "[-+]") (forward-line -1))
- (setq beg-line (line-number-at-pos (point)))
- (unless (looking-at "@")
- (forward-line 1)
- (diff-split-hunk))
- (let ((wbh (window-body-height)))
- (if (>= wbh (- end-line beg-line))
- (recenter (/ (+ wbh (- beg-line end-line) 2) 2))
- (recenter 1)))
- (unless (yes-or-no-p (format "Revert current hunk in %s?"
- ,(cl-caadr fileset)))
- (error "Revert canceled"))
- (let ((diff-advance-after-apply-hunk nil))
- (diff-apply-hunk t))
- (with-current-buffer ,buffer
- (save-buffer))
- (message "Hunk reverted"))))
- (quit-windows-on diff-buffer))))
-
-(defun diff-hl-hunk-overlay-at (pos)
- (cl-loop for o in (overlays-in pos (1+ pos))
- when (overlay-get o 'diff-hl-hunk)
- return o))
-
-(defun diff-hl-next-hunk (&optional backward)
- "Go to the beginning of the next hunk in the current buffer."
- (interactive)
- (let ((pos (save-excursion
- (catch 'found
- (while (not (if backward (bobp) (eobp)))
- (goto-char (if backward
- (previous-overlay-change (point))
- (next-overlay-change (point))))
- (let ((o (diff-hl-hunk-overlay-at (point))))
- (when (and o (= (overlay-start o) (point)))
- (throw 'found (overlay-start o)))))))))
- (if pos
- (goto-char pos)
- (error "No further hunks found"))))
-
-(defun diff-hl-previous-hunk ()
- "Go to the beginning of the previous hunk in the current buffer."
- (interactive)
- (diff-hl-next-hunk t))
-
-(define-prefix-command 'diff-hl-command-map)
-
-(let ((map diff-hl-command-map))
- (define-key map "n" 'diff-hl-revert-hunk)
- (define-key map "[" 'diff-hl-previous-hunk)
- (define-key map "]" 'diff-hl-next-hunk)
- map)
-
-;;;###autoload
-(define-minor-mode diff-hl-mode
- "Toggle VC diff highlighting."
- :lighter "" :keymap `(([remap vc-diff] . diff-hl-diff-goto-hunk)
- (,diff-hl-command-prefix . diff-hl-command-map))
- (if diff-hl-mode
- (progn
- (diff-hl-maybe-define-bitmaps)
- (add-hook 'after-save-hook 'diff-hl-update nil t)
- (add-hook 'after-change-functions 'diff-hl-edit nil t)
- (add-hook (if vc-mode
- ;; Defer until the end of this hook, so that its
- ;; elements can modify the update behavior.
- 'diff-hl-mode-on-hook
- ;; If we're only opening the file now,
- ;; `vc-find-file-hook' likely hasn't run yet, so
- ;; let's wait until the state information is
- ;; saved, in order not to fetch it twice.
- 'find-file-hook)
- 'diff-hl-update t t)
- (add-hook 'vc-checkin-hook 'diff-hl-update nil t)
- (add-hook 'after-revert-hook 'diff-hl-update nil t)
- ;; Magit does call `auto-revert-handler', but it usually
- ;; doesn't do much, because `buffer-stale--default-function'
- ;; doesn't care about changed VC state.
- ;; https://github.com/magit/magit/issues/603
- (add-hook 'magit-revert-buffer-hook 'diff-hl-update nil t)
- (add-hook 'auto-revert-mode-hook 'diff-hl-update nil t)
- (add-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps nil t))
- (remove-hook 'after-save-hook 'diff-hl-update t)
- (remove-hook 'after-change-functions 'diff-hl-edit t)
- (remove-hook 'find-file-hook 'diff-hl-update t)
- (remove-hook 'vc-checkin-hook 'diff-hl-update t)
- (remove-hook 'after-revert-hook 'diff-hl-update t)
- (remove-hook 'magit-revert-buffer-hook 'diff-hl-update t)
- (remove-hook 'auto-revert-mode-hook 'diff-hl-update t)
- (remove-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps t)
- (diff-hl-remove-overlays)))
-
-(when (require 'smartrep nil t)
- (let (smart-keys)
- (cl-labels ((scan (map)
- (map-keymap
- (lambda (event binding)
- (if (consp binding)
- (scan binding)
- (when (characterp event)
- (push (cons (string event) binding) smart-keys))))
- map)))
- (scan diff-hl-command-map)
- (smartrep-define-key diff-hl-mode-map diff-hl-command-prefix
smart-keys))))
-
-(defun diff-hl-dir-update ()
- (dolist (pair (if (vc-dir-marked-files)
- (vc-dir-marked-only-files-and-states)
- (vc-dir-child-files-and-states)))
- (when (eq 'up-to-date (cdr pair))
- (let ((buffer (find-buffer-visiting (car pair))))
- (when buffer
- (with-current-buffer buffer
- (diff-hl-remove-overlays)))))))
-
-(define-minor-mode diff-hl-dir-mode
- "Toggle `diff-hl-mode' integration in a `vc-dir-mode' buffer."
- :lighter ""
- (if diff-hl-dir-mode
- (add-hook 'vc-checkin-hook 'diff-hl-dir-update t t)
- (remove-hook 'vc-checkin-hook 'diff-hl-dir-update t)))
-
-;;;###autoload
-(defun turn-on-diff-hl-mode ()
- "Turn on `diff-hl-mode' or `diff-hl-dir-mode' in a buffer if appropriate."
- (cond
- (buffer-file-name
- (diff-hl-mode 1))
- ((eq major-mode 'vc-dir-mode)
- (diff-hl-dir-mode 1))))
-
-;;;###autoload
-(define-globalized-minor-mode global-diff-hl-mode diff-hl-mode
- turn-on-diff-hl-mode :after-hook (diff-hl-global-mode-change))
-
-(defun diff-hl-global-mode-change ()
- (unless global-diff-hl-mode
- (dolist (buf (buffer-list))
- (with-current-buffer buf
- (when diff-hl-dir-mode
- (diff-hl-dir-mode -1))))))
-
-(provide 'diff-hl)
-
-;;; diff-hl.el ends here
+;;; diff-hl.el --- Highlight uncommitted changes -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
+
+;; Author: Dmitry Gutov <address@hidden>
+;; URL: https://github.com/dgutov/diff-hl
+;; Keywords: vc, diff
+;; Version: 1.8.0
+;; Package-Requires: ((cl-lib "0.2"))
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; `diff-hl-mode' highlights uncommitted changes on the side of the
+;; window (using the fringe, by default), allows you to jump between
+;; the hunks and revert them selectively.
+
+;; Provided commands:
+;;
+;; `diff-hl-diff-goto-hunk' C-x v =
+;; `diff-hl-revert-hunk' C-x v n
+;; `diff-hl-previous-hunk' C-x v [
+;; `diff-hl-next-hunk' C-x v ]
+;;
+;; The mode takes advantage of `smartrep' if it is installed.
+
+;; Add either of the following to your init file.
+;;
+;; To use it in all buffers:
+;;
+;; (global-diff-hl-mode)
+;;
+;; Only in `prog-mode' buffers, with `vc-dir' integration:
+;;
+;; (add-hook 'prog-mode-hook 'turn-on-diff-hl-mode)
+;; (add-hook 'vc-dir-mode-hook 'turn-on-diff-hl-mode)
+
+;;; Code:
+
+(require 'fringe)
+(require 'diff-mode)
+(require 'vc)
+(require 'vc-dir)
+(eval-when-compile
+ (require 'cl-lib)
+ (require 'vc-git)
+ (require 'vc-hg)
+ (require 'face-remap)
+ (declare-function smartrep-define-key 'smartrep))
+
+(defgroup diff-hl nil
+ "VC diff highlighting on the side of a window"
+ :group 'vc)
+
+(defface diff-hl-insert
+ '((default :inherit diff-added)
+ (((class color)) :foreground "green4"))
+ "Face used to highlight inserted lines."
+ :group 'diff-hl)
+
+(defface diff-hl-delete
+ '((default :inherit diff-removed)
+ (((class color)) :foreground "red3"))
+ "Face used to highlight deleted lines."
+ :group 'diff-hl)
+
+(defface diff-hl-change
+ '((default :foreground "blue3")
+ (((class color) (min-colors 88) (background light))
+ :background "#ddddff")
+ (((class color) (min-colors 88) (background dark))
+ :background "#333355"))
+ "Face used to highlight changed lines."
+ :group 'diff-hl)
+
+(defcustom diff-hl-command-prefix (kbd "C-x v")
+ "The prefix for all `diff-hl' commands."
+ :group 'diff-hl
+ :type 'string)
+
+(defcustom diff-hl-draw-borders t
+ "Non-nil to draw borders around fringe indicators."
+ :group 'diff-hl
+ :type 'boolean)
+
+(defcustom diff-hl-highlight-function 'diff-hl-highlight-on-fringe
+ "Function to highlight the current line. Its arguments are
+ overlay, change type and position within a hunk."
+ :group 'diff-hl
+ :type 'function)
+
+(defcustom diff-hl-fringe-bmp-function 'diff-hl-fringe-bmp-from-pos
+ "Function to choose the fringe bitmap for a given change type
+ and position within a hunk. Should accept two arguments."
+ :group 'diff-hl
+ :type '(choice (const diff-hl-fringe-bmp-from-pos)
+ (const diff-hl-fringe-bmp-from-type)
+ function))
+
+(defcustom diff-hl-fringe-face-function 'diff-hl-fringe-face-from-type
+ "Function to choose the fringe face for a given change type
+ and position within a hunk. Should accept two arguments."
+ :group 'diff-hl
+ :type 'function)
+
+(defcustom diff-hl-side 'left
+ "Which side to use for indicators."
+ :type '(choice (const left)
+ (const right))
+ :set (lambda (var value)
+ (let ((on (bound-and-true-p global-diff-hl-mode)))
+ (when on (global-diff-hl-mode -1))
+ (set-default var value)
+ (when on (global-diff-hl-mode 1)))))
+
+(defvar diff-hl-reference-revision nil
+ "Revision to diff against. nil means the most recent one.")
+
+(defun diff-hl-define-bitmaps ()
+ (let* ((scale (if (and (boundp 'text-scale-mode-amount)
+ (numberp text-scale-mode-amount))
+ (expt text-scale-mode-step text-scale-mode-amount)
+ 1))
+ (spacing (or (and (display-graphic-p) (default-value 'line-spacing))
0))
+ (h (+ (ceiling (* (frame-char-height) scale))
+ (if (floatp spacing)
+ (truncate (* (frame-char-height) spacing))
+ spacing)))
+ (w (min (frame-parameter nil (intern (format "%s-fringe"
diff-hl-side)))
+ 16))
+ (middle (make-vector h (expt 2 (1- w))))
+ (ones (1- (expt 2 w)))
+ (top (copy-sequence middle))
+ (bottom (copy-sequence middle))
+ (single (copy-sequence middle)))
+ (aset top 0 ones)
+ (aset bottom (1- h) ones)
+ (aset single 0 ones)
+ (aset single (1- h) ones)
+ (define-fringe-bitmap 'diff-hl-bmp-top top h w 'top)
+ (define-fringe-bitmap 'diff-hl-bmp-middle middle h w 'center)
+ (define-fringe-bitmap 'diff-hl-bmp-bottom bottom h w 'bottom)
+ (define-fringe-bitmap 'diff-hl-bmp-single single h w 'top)
+ (define-fringe-bitmap 'diff-hl-bmp-i [3 3 0 3 3 3 3 3 3 3] nil 2 'center)
+ (let* ((w2 (* (/ w 2) 2))
+ ;; When fringes are disabled, it's easier to fix up the width,
+ ;; instead of doing nothing (#20).
+ (w2 (if (zerop w2) 2 w2))
+ (delete-row (- (expt 2 (1- w2)) 2))
+ (middle-pos (1- (/ w2 2)))
+ (middle-bit (expt 2 middle-pos))
+ (insert-bmp (make-vector w2 (* 3 middle-bit))))
+ (define-fringe-bitmap 'diff-hl-bmp-delete (make-vector 2 delete-row) w2
w2)
+ (aset insert-bmp 0 0)
+ (aset insert-bmp middle-pos delete-row)
+ (aset insert-bmp (1+ middle-pos) delete-row)
+ (aset insert-bmp (1- w2) 0)
+ (define-fringe-bitmap 'diff-hl-bmp-insert insert-bmp w2 w2)
+ )))
+
+(defun diff-hl-maybe-define-bitmaps ()
+ (when (window-system) ;; No fringes in the console.
+ (unless (fringe-bitmap-p 'diff-hl-bmp-empty)
+ (diff-hl-define-bitmaps)
+ (define-fringe-bitmap 'diff-hl-bmp-empty [0] 1 1 'center))))
+
+(defvar diff-hl-spec-cache (make-hash-table :test 'equal))
+
+(defun diff-hl-fringe-spec (type pos side)
+ (let* ((key (list type pos side
+ diff-hl-fringe-face-function
+ diff-hl-fringe-bmp-function))
+ (val (gethash key diff-hl-spec-cache)))
+ (unless val
+ (let* ((face-sym (funcall diff-hl-fringe-face-function type pos))
+ (bmp-sym (funcall diff-hl-fringe-bmp-function type pos)))
+ (setq val (propertize " " 'display `((,(intern (format "%s-fringe"
side))
+ ,bmp-sym ,face-sym))))
+ (puthash key val diff-hl-spec-cache)))
+ val))
+
+(defun diff-hl-fringe-face-from-type (type _pos)
+ (intern (format "diff-hl-%s" type)))
+
+(defun diff-hl-fringe-bmp-from-pos (_type pos)
+ (intern (format "diff-hl-bmp-%s" pos)))
+
+(defun diff-hl-fringe-bmp-from-type (type _pos)
+ (cl-case type
+ (unknown 'question-mark)
+ (change 'exclamation-mark)
+ (ignored 'diff-hl-bmp-i)
+ (t (intern (format "diff-hl-bmp-%s" type)))))
+
+(defvar vc-svn-diff-switches)
+
+(defmacro diff-hl-with-diff-switches (body)
+ `(let ((vc-git-diff-switches nil)
+ (vc-hg-diff-switches nil)
+ (vc-svn-diff-switches nil)
+ (vc-diff-switches '("-U0"))
+ ,@(when (boundp 'vc-disable-async-diff)
+ '((vc-disable-async-diff t))))
+ ,body))
+
+(defun diff-hl-modified-p (state)
+ (or (eq state 'edited)
+ (and (eq state 'up-to-date)
+ ;; VC state is stale in after-revert-hook.
+ (or revert-buffer-in-progress-p
+ ;; Diffing against an older revision.
+ diff-hl-reference-revision))))
+
+(defun diff-hl-changes-buffer (file backend)
+ (let ((buf-name " *diff-hl* "))
+ (diff-hl-with-diff-switches
+ (vc-call-backend backend 'diff (list file)
+ diff-hl-reference-revision nil
+ buf-name))
+ buf-name))
+
+(defun diff-hl-changes ()
+ (let* ((file buffer-file-name)
+ (backend (vc-backend file)))
+ (when backend
+ (let ((state (vc-state file backend)))
+ (cond
+ ((diff-hl-modified-p state)
+ (let* (diff-auto-refine-mode res)
+ (with-current-buffer (diff-hl-changes-buffer file backend)
+ (goto-char (point-min))
+ (unless (eobp)
+ (ignore-errors
+ (diff-beginning-of-hunk t))
+ (while (looking-at diff-hunk-header-re-unified)
+ (let ((line (string-to-number (match-string 3)))
+ (len (let ((m (match-string 4)))
+ (if m (string-to-number m) 1)))
+ (beg (point)))
+ (diff-end-of-hunk)
+ (let* ((inserts (diff-count-matches "^\\+" beg (point)))
+ (deletes (diff-count-matches "^-" beg (point)))
+ (type (cond ((zerop deletes) 'insert)
+ ((zerop inserts) 'delete)
+ (t 'change))))
+ (when (eq type 'delete)
+ (setq len 1)
+ (cl-incf line))
+ (push (list line len type) res))))))
+ (nreverse res)))
+ ((eq state 'added)
+ `((1 ,(line-number-at-pos (point-max)) insert)))
+ ((eq state 'removed)
+ `((1 ,(line-number-at-pos (point-max)) delete))))))))
+
+(defun diff-hl-update ()
+ (let ((changes (diff-hl-changes))
+ (current-line 1))
+ (diff-hl-remove-overlays)
+ (save-excursion
+ (save-restriction
+ (widen)
+ (goto-char (point-min))
+ (dolist (c changes)
+ (cl-destructuring-bind (line len type) c
+ (forward-line (- line current-line))
+ (setq current-line line)
+ (let ((hunk-beg (point)))
+ (while (cl-plusp len)
+ (diff-hl-add-highlighting
+ type
+ (cond
+ ((not diff-hl-draw-borders) 'empty)
+ ((and (= len 1) (= line current-line)) 'single)
+ ((= len 1) 'bottom)
+ ((= line current-line) 'top)
+ (t 'middle)))
+ (forward-line 1)
+ (cl-incf current-line)
+ (cl-decf len))
+ (let ((h (make-overlay hunk-beg (point)))
+ (hook '(diff-hl-overlay-modified)))
+ (overlay-put h 'diff-hl t)
+ (overlay-put h 'diff-hl-hunk t)
+ (overlay-put h 'modification-hooks hook)
+ (overlay-put h 'insert-in-front-hooks hook)
+ (overlay-put h 'insert-behind-hooks hook)))))))))
+
+(defun diff-hl-add-highlighting (type shape)
+ (let ((o (make-overlay (point) (point))))
+ (overlay-put o 'diff-hl t)
+ (funcall diff-hl-highlight-function o type shape)
+ o))
+
+(defun diff-hl-highlight-on-fringe (ovl type shape)
+ (overlay-put ovl 'before-string (diff-hl-fringe-spec type shape
+ diff-hl-side)))
+
+(defun diff-hl-remove-overlays (&optional beg end)
+ (save-restriction
+ (widen)
+ (dolist (o (overlays-in (or beg (point-min)) (or end (point-max))))
+ (when (overlay-get o 'diff-hl) (delete-overlay o)))))
+
+(defun diff-hl-overlay-modified (ov after-p _beg _end &optional _length)
+ "Delete the hunk overlay and all our line overlays inside it."
+ (unless after-p
+ (when (overlay-buffer ov)
+ (diff-hl-remove-overlays (overlay-start ov) (overlay-end ov))
+ (delete-overlay ov))))
+
+(defvar diff-hl-timer nil)
+
+(defun diff-hl-edit (_beg _end _len)
+ "DTRT when we've `undo'-ne the buffer into unmodified state."
+ (when undo-in-progress
+ (when diff-hl-timer
+ (cancel-timer diff-hl-timer))
+ (setq diff-hl-timer
+ (run-with-idle-timer 0.01 nil #'diff-hl-after-undo
(current-buffer)))))
+
+(defun diff-hl-after-undo (buffer)
+ (with-current-buffer buffer
+ (unless (buffer-modified-p)
+ (diff-hl-update))))
+
+(defun diff-hl-diff-goto-hunk ()
+ "Run VC diff command and go to the line corresponding to the current."
+ (interactive)
+ (vc-buffer-sync)
+ (let* ((line (line-number-at-pos))
+ (buffer (current-buffer)))
+ (vc-diff-internal t (vc-deduce-fileset) diff-hl-reference-revision nil t)
+ (vc-exec-after `(if (< (line-number-at-pos (point-max)) 3)
+ (with-current-buffer ,buffer (diff-hl-remove-overlays))
+ (diff-hl-diff-skip-to ,line)
+ (setq vc-sentinel-movepoint (point))))))
+
+(defun diff-hl-diff-skip-to (line)
+ "In `diff-mode', skip to the hunk and line corresponding to LINE
+in the source file, or the last line of the hunk above it."
+ (diff-hunk-next)
+ (let (found)
+ (while (and (looking-at diff-hunk-header-re-unified) (not found))
+ (let ((hunk-line (string-to-number (match-string 3)))
+ (len (let ((m (match-string 4)))
+ (if m (string-to-number m) 1))))
+ (if (> line (+ hunk-line len))
+ (diff-hunk-next)
+ (setq found t)
+ (if (< line hunk-line)
+ ;; Retreat to the previous hunk.
+ (forward-line -1)
+ (let ((to-go (1+ (- line hunk-line))))
+ (while (cl-plusp to-go)
+ (forward-line 1)
+ (unless (looking-at "^-")
+ (cl-decf to-go))))))))))
+
+(defun diff-hl-revert-hunk ()
+ "Revert the diff hunk with changes at or above the point."
+ (interactive)
+ (vc-buffer-sync)
+ (let ((diff-buffer (generate-new-buffer-name "*diff-hl*"))
+ (buffer (current-buffer))
+ (line (save-excursion
+ (unless (diff-hl-hunk-overlay-at (point))
+ (diff-hl-previous-hunk))
+ (line-number-at-pos)))
+ (fileset (vc-deduce-fileset)))
+ (unwind-protect
+ (progn
+ (vc-diff-internal nil fileset diff-hl-reference-revision nil
+ nil diff-buffer)
+ (vc-exec-after
+ `(let (beg-line end-line)
+ (when (eobp)
+ (with-current-buffer ,buffer (diff-hl-remove-overlays))
+ (error "Buffer is up-to-date"))
+ (diff-hl-diff-skip-to ,line)
+ (save-excursion
+ (while (looking-at "[-+]") (forward-line 1))
+ (setq end-line (line-number-at-pos (point)))
+ (unless (eobp) (diff-split-hunk)))
+ (unless (looking-at "[-+]") (forward-line -1))
+ (while (looking-at "[-+]") (forward-line -1))
+ (setq beg-line (line-number-at-pos (point)))
+ (unless (looking-at "@")
+ (forward-line 1)
+ (diff-split-hunk))
+ (let ((wbh (window-body-height)))
+ (if (>= wbh (- end-line beg-line))
+ (recenter (/ (+ wbh (- beg-line end-line) 2) 2))
+ (recenter 1)))
+ (unless (yes-or-no-p (format "Revert current hunk in %s?"
+ ,(cl-caadr fileset)))
+ (error "Revert canceled"))
+ (let ((diff-advance-after-apply-hunk nil))
+ (diff-apply-hunk t))
+ (with-current-buffer ,buffer
+ (save-buffer))
+ (message "Hunk reverted"))))
+ (quit-windows-on diff-buffer))))
+
+(defun diff-hl-hunk-overlay-at (pos)
+ (cl-loop for o in (overlays-in pos (1+ pos))
+ when (overlay-get o 'diff-hl-hunk)
+ return o))
+
+(defun diff-hl-next-hunk (&optional backward)
+ "Go to the beginning of the next hunk in the current buffer."
+ (interactive)
+ (let ((pos (save-excursion
+ (catch 'found
+ (while (not (if backward (bobp) (eobp)))
+ (goto-char (if backward
+ (previous-overlay-change (point))
+ (next-overlay-change (point))))
+ (let ((o (diff-hl-hunk-overlay-at (point))))
+ (when (and o (= (overlay-start o) (point)))
+ (throw 'found (overlay-start o)))))))))
+ (if pos
+ (goto-char pos)
+ (error "No further hunks found"))))
+
+(defun diff-hl-previous-hunk ()
+ "Go to the beginning of the previous hunk in the current buffer."
+ (interactive)
+ (diff-hl-next-hunk t))
+
+(defvar diff-hl-command-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map "n" 'diff-hl-revert-hunk)
+ (define-key map "[" 'diff-hl-previous-hunk)
+ (define-key map "]" 'diff-hl-next-hunk)
+ map))
+(fset 'diff-hl-command-map diff-hl-command-map)
+
+;;;###autoload
+(define-minor-mode diff-hl-mode
+ "Toggle VC diff highlighting."
+ :lighter "" :keymap `(([remap vc-diff] . diff-hl-diff-goto-hunk)
+ (,diff-hl-command-prefix . diff-hl-command-map))
+ (if diff-hl-mode
+ (progn
+ (diff-hl-maybe-define-bitmaps)
+ (add-hook 'after-save-hook 'diff-hl-update nil t)
+ (add-hook 'after-change-functions 'diff-hl-edit nil t)
+ (add-hook (if vc-mode
+ ;; Defer until the end of this hook, so that its
+ ;; elements can modify the update behavior.
+ 'diff-hl-mode-on-hook
+ ;; If we're only opening the file now,
+ ;; `vc-find-file-hook' likely hasn't run yet, so
+ ;; let's wait until the state information is
+ ;; saved, in order not to fetch it twice.
+ 'find-file-hook)
+ 'diff-hl-update t t)
+ (add-hook 'vc-checkin-hook 'diff-hl-update nil t)
+ (add-hook 'after-revert-hook 'diff-hl-update nil t)
+ ;; Magit does call `auto-revert-handler', but it usually
+ ;; doesn't do much, because `buffer-stale--default-function'
+ ;; doesn't care about changed VC state.
+ ;; https://github.com/magit/magit/issues/603
+ (add-hook 'magit-revert-buffer-hook 'diff-hl-update nil t)
+ ;; Magit 2+ doesn't do the above and calls this instead,
+ ;; but only when it doesn't call `revert-buffer':
+ (add-hook 'magit-not-reverted-hook 'diff-hl-update nil t)
+ (add-hook 'auto-revert-mode-hook 'diff-hl-update nil t)
+ (add-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps nil t))
+ (remove-hook 'after-save-hook 'diff-hl-update t)
+ (remove-hook 'after-change-functions 'diff-hl-edit t)
+ (remove-hook 'find-file-hook 'diff-hl-update t)
+ (remove-hook 'vc-checkin-hook 'diff-hl-update t)
+ (remove-hook 'after-revert-hook 'diff-hl-update t)
+ (remove-hook 'magit-revert-buffer-hook 'diff-hl-update t)
+ (remove-hook 'magit-not-reverted-hook 'diff-hl-update t)
+ (remove-hook 'auto-revert-mode-hook 'diff-hl-update t)
+ (remove-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps t)
+ (diff-hl-remove-overlays)))
+
+(when (require 'smartrep nil t)
+ (let (smart-keys)
+ (cl-labels ((scan (map)
+ (map-keymap
+ (lambda (event binding)
+ (if (consp binding)
+ (scan binding)
+ (when (characterp event)
+ (push (cons (string event) binding) smart-keys))))
+ map)))
+ (scan diff-hl-command-map)
+ (smartrep-define-key diff-hl-mode-map diff-hl-command-prefix
smart-keys))))
+
+(defun diff-hl-dir-update ()
+ (dolist (pair (if (vc-dir-marked-files)
+ (vc-dir-marked-only-files-and-states)
+ (vc-dir-child-files-and-states)))
+ (when (eq 'up-to-date (cdr pair))
+ (let ((buffer (find-buffer-visiting (car pair))))
+ (when buffer
+ (with-current-buffer buffer
+ (diff-hl-remove-overlays)))))))
+
+(define-minor-mode diff-hl-dir-mode
+ "Toggle `diff-hl-mode' integration in a `vc-dir-mode' buffer."
+ :lighter ""
+ (if diff-hl-dir-mode
+ (add-hook 'vc-checkin-hook 'diff-hl-dir-update t t)
+ (remove-hook 'vc-checkin-hook 'diff-hl-dir-update t)))
+
+;;;###autoload
+(defun turn-on-diff-hl-mode ()
+ "Turn on `diff-hl-mode' or `diff-hl-dir-mode' in a buffer if appropriate."
+ (cond
+ (buffer-file-name
+ (diff-hl-mode 1))
+ ((eq major-mode 'vc-dir-mode)
+ (diff-hl-dir-mode 1))))
+
+;;;###autoload
+(define-globalized-minor-mode global-diff-hl-mode diff-hl-mode
+ turn-on-diff-hl-mode :after-hook (diff-hl-global-mode-change))
+
+(defun diff-hl-global-mode-change ()
+ (unless global-diff-hl-mode
+ (dolist (buf (buffer-list))
+ (with-current-buffer buf
+ (when diff-hl-dir-mode
+ (diff-hl-dir-mode -1))))))
+
+(provide 'diff-hl)
+
+;;; diff-hl.el ends here
- [elpa] master 2d40373 34/42: Update diff-hl-flydiff/vc-git-mode-line-string as per Emacs master, (continued)
- [elpa] master 2d40373 34/42: Update diff-hl-flydiff/vc-git-mode-line-string as per Emacs master, Dmitry Gutov, 2015/09/09
- [elpa] master a16b225 38/42: One fewer version check, Dmitry Gutov, 2015/09/09
- [elpa] master f300548 33/42: Merge pull request #50 from PythonNut/master, Dmitry Gutov, 2015/09/09
- [elpa] master 7428f4a 37/42: Reduce warnings during byte-compilation; don't error b-c in <24.4, Dmitry Gutov, 2015/09/09
- [elpa] master 418dbc7 32/42: Update docs to reflect new diff-hl-flydiff-mode, Dmitry Gutov, 2015/09/09
- [elpa] master 1558064 35/42: Reword the recent README changes, Dmitry Gutov, 2015/09/09
- [elpa] master 8d313db 36/42: Use --strip-trailing-cr, Dmitry Gutov, 2015/09/09
- [elpa] master 5068da4 39/42: Reindent, Dmitry Gutov, 2015/09/09
- [elpa] master 7fa7f09 41/42: Bump the version, Dmitry Gutov, 2015/09/09
- [elpa] master e576ee2 40/42: Make diff-hl-flydiff-delay customizable, Dmitry Gutov, 2015/09/09
- [elpa] master a454a24 42/42: Merge commit '7fa7f099c7008d521dbbb57a1546f11535544536' from diff-hl,
Dmitry Gutov <=